tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (229) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +33 -33
  4. package/dist/deciders.js +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +17 -3
  7. package/dist/index.d.ts +17 -3
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +55 -55
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -42
  16. package/dist/run.js +42 -44
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +96 -91
  20. package/dist/transfer.js +95 -90
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +31 -3
  25. package/src/bags.ts +12 -10
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +146 -93
  29. package/src/check.ts +418 -246
  30. package/src/cli/tlc-output.ts +17 -2
  31. package/src/cli/tlc.ts +5 -4
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +23 -10
  34. package/src/coverage.ts +255 -18
  35. package/src/dependencies.ts +68 -15
  36. package/src/dfid.ts +93 -35
  37. package/src/environment.ts +106 -39
  38. package/src/errors.ts +7 -0
  39. package/src/evaluate.ts +415 -132
  40. package/src/exit-codes.ts +28 -15
  41. package/src/instances.ts +135 -11
  42. package/src/java-hash.ts +14 -0
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +674 -236
  45. package/src/lexer.ts +12 -2
  46. package/src/liveness-checker.ts +161 -60
  47. package/src/liveness.ts +55 -10
  48. package/src/obligations/index.ts +1 -1
  49. package/src/obligations/normalize.ts +1 -4
  50. package/src/obligations/printer.ts +5 -5
  51. package/src/obligations/source.ts +2 -0
  52. package/src/parser.ts +110 -111
  53. package/src/prover/isabelle/isar/attrib.ts +4 -4
  54. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  55. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  56. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  57. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  58. package/src/prover/isabelle/pure/term.ts +3 -3
  59. package/src/prover/prep/md5.ts +26 -29
  60. package/src/prover/smt/rewrite.ts +2 -7
  61. package/src/prover/smt/simplify.ts +1 -1
  62. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  63. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  64. package/src/prover/smt/solver/asserted-formulas.ts +164 -58
  65. package/src/prover/smt/solver/ast-lt.ts +1 -1
  66. package/src/prover/smt/solver/ast.ts +65 -13
  67. package/src/prover/smt/solver/auf-solver.ts +23 -12
  68. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  69. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  70. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  71. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  72. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  73. package/src/prover/smt/solver/card2bv.ts +35 -18
  74. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  75. package/src/prover/smt/solver/context.ts +65 -14
  76. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  77. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  78. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  79. package/src/prover/smt/solver/diff-neq.ts +1 -2
  80. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  81. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  82. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  83. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  84. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  87. package/src/prover/smt/solver/euf/egraph.ts +3 -9
  88. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  89. package/src/prover/smt/solver/euf/mam.ts +1 -5
  90. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  91. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  92. package/src/prover/smt/solver/fd-solver.ts +608 -141
  93. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  94. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  95. package/src/prover/smt/solver/goal.ts +4 -3
  96. package/src/prover/smt/solver/hashtable.ts +4 -0
  97. package/src/prover/smt/solver/internalizer.ts +1 -1
  98. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  99. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  100. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  101. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  102. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  103. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  104. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  105. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  106. package/src/prover/smt/solver/maxcore.ts +2 -1
  107. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  108. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  109. package/src/prover/smt/solver/model-checker.ts +1 -1
  110. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  111. package/src/prover/smt/solver/model-generator.ts +85 -43
  112. package/src/prover/smt/solver/mpf.ts +2 -4
  113. package/src/prover/smt/solver/mus.ts +2 -3
  114. package/src/prover/smt/solver/muz/dl-context.ts +14 -42
  115. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  116. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  117. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  118. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  119. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  120. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  121. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  122. package/src/prover/smt/solver/muz/spacer-context.ts +1 -4
  123. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  124. package/src/prover/smt/solver/nlqsat.ts +1 -1
  125. package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
  126. package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
  127. package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
  128. package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
  129. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  130. package/src/prover/smt/solver/nnf.ts +6 -2
  131. package/src/prover/smt/solver/opt-context.ts +16 -7
  132. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  133. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  134. package/src/prover/smt/solver/opt-solver.ts +4 -3
  135. package/src/prover/smt/solver/optsmt.ts +1 -1
  136. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  137. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  138. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  139. package/src/prover/smt/solver/probes.ts +88 -23
  140. package/src/prover/smt/solver/proto-model.ts +8 -8
  141. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  142. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  143. package/src/prover/smt/solver/qe-lite.ts +2 -2
  144. package/src/prover/smt/solver/qe.ts +3 -2
  145. package/src/prover/smt/solver/qsat.ts +23 -8
  146. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  147. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  148. package/src/prover/smt/solver/rewriter.ts +31 -25
  149. package/src/prover/smt/solver/rlimit.ts +7 -3
  150. package/src/prover/smt/solver/sat/config.ts +1 -1
  151. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  152. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  153. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  154. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  155. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  156. package/src/prover/smt/solver/sat/sat-tactic.ts +15 -6
  157. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  158. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  159. package/src/prover/smt/solver/sat/solver.ts +27 -47
  160. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  161. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  162. package/src/prover/smt/solver/seq-derive.ts +1 -1
  163. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  164. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  165. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  166. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  167. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  168. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  169. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  170. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  171. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  172. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  173. package/src/prover/smt/solver/smt-kernel.ts +40 -6
  174. package/src/prover/smt/solver/smt-setup.ts +106 -13
  175. package/src/prover/smt/solver/smtlib-parser.ts +579 -214
  176. package/src/prover/smt/solver/smtlib-script.ts +600 -170
  177. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  178. package/src/prover/smt/solver/solver.ts +18 -3
  179. package/src/prover/smt/solver/tactic.ts +342 -196
  180. package/src/prover/smt/solver/theory-bv.ts +13 -3
  181. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  182. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  183. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  184. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  185. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  186. package/src/prover/smt/solver/theory-lra.ts +1 -1
  187. package/src/prover/smt/solver/theory-pb.ts +24 -7
  188. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  189. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  190. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  191. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  192. package/src/prover/tlapm/cache.ts +8 -8
  193. package/src/prover/zenon/index-table.ts +5 -2
  194. package/src/prover/zenon/isar-case.ts +1 -1
  195. package/src/prover/zenon/isar.ts +2 -2
  196. package/src/prover/zenon/phrase.ts +1 -1
  197. package/src/resolve.ts +1226 -246
  198. package/src/runtime.ts +19 -2
  199. package/src/sany/builtins.ts +10 -10
  200. package/src/sany/generation.ts +4 -2
  201. package/src/sany/generator-def-entries.ts +123 -36
  202. package/src/sany/generator-definitions.ts +4 -2
  203. package/src/sany/generator-expressions.ts +51 -20
  204. package/src/sany/generator-proofs.ts +17 -11
  205. package/src/sany/generator.ts +11 -5
  206. package/src/sany/lexer.ts +15 -7
  207. package/src/sany/modules.ts +4 -2
  208. package/src/sany/nodes.ts +1 -1
  209. package/src/sany/selectors.ts +11 -6
  210. package/src/sany/xml.ts +2 -3
  211. package/src/search.ts +283 -126
  212. package/src/simulate.ts +247 -185
  213. package/src/spec-description.ts +15 -7
  214. package/src/standard-definitions.ts +1 -0
  215. package/src/standard-modules.ts +56 -22
  216. package/src/subexpressions.ts +563 -139
  217. package/src/successors.ts +50 -20
  218. package/src/symmetry.ts +2 -1
  219. package/src/tlc/jar-data.ts +1 -3
  220. package/src/tlc/messages.ts +3 -3
  221. package/src/tlc/random.ts +2 -1
  222. package/src/tlc/replay.ts +147 -46
  223. package/src/tlc/tlc-operators.ts +10 -8
  224. package/src/tlc/tlcext-operators.ts +26 -10
  225. package/src/tlc/trace-spec.ts +9 -22
  226. package/src/trace-liveness.ts +529 -0
  227. package/src/typed-tier.ts +52 -31
  228. package/src/typescript/types.ts +2 -2
  229. package/src/values.ts +150 -79
package/src/parser.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type {
2
2
  AssumeProve,
3
3
  Assumption,
4
- Bound,
5
4
  BoundPattern,
6
5
  CaseArm,
7
6
  Declaration,
@@ -22,9 +21,11 @@ import type {
22
21
  StepBody,
23
22
  UseOrHide,
24
23
  } from "./ast";
25
- import { createSanyError, formatRange, TlaSyntaxError } from "./errors";
24
+ import { TlaSyntaxError } from "./errors";
26
25
  import { getNumeralValue, readAtAsIdentifier, tokenize, type Token } from "./lexer";
26
+ import { getDefEntryErrors, type DefEntryError } from "./sany/generator-def-entries";
27
27
  import { getSanyParseError } from "./sany/parse-error";
28
+ import { createSourceFile } from "./sany/source";
28
29
 
29
30
  interface Precedence {
30
31
  low: number;
@@ -252,6 +253,7 @@ const OPERATOR_ARGUMENTS = new Set([
252
253
 
253
254
  const SELECTOR_SYMBOLS = new Set(["<<", ">>", ":", "@", "("]);
254
255
 
256
+ // Deviation from SANY: TLAplusParser#OpOrExpr's lookahead omits PROPOSITION, LEMMA and COROLLARY, so SANY parses an operator argument before them as an expression.
255
257
  const UNIT_KEYWORDS = new Set([
256
258
  "ASSUME",
257
259
  "ASSUMPTION",
@@ -478,6 +480,26 @@ const getOperatorApplication = (
478
480
  }
479
481
  };
480
482
 
483
+ export const parenthesizedRanges = new WeakMap<Expression, SourceRange>();
484
+
485
+ export const defEntryErrors = new WeakMap<Expression, DefEntryError[]>();
486
+
487
+ export const getDefEntryBinder = (expression: Expression): Expression | undefined => {
488
+ if (parenthesizedRanges.has(expression)) return undefined;
489
+ const binder =
490
+ expression.kind === "UnboundedQuantifier"
491
+ ? { name: expression.names[0], range: expression.nameRanges?.[0] }
492
+ : expression.kind === "Choose" && expression.pattern.kind === "Name"
493
+ ? { name: expression.pattern.name, range: expression.pattern.ranges?.[0] }
494
+ : expression.kind === "SetFilter" && expression.bound.pattern.kind === "Name"
495
+ ? { name: expression.bound.pattern.name, range: expression.bound.pattern.ranges?.[0] }
496
+ : undefined;
497
+ const range = binder?.range;
498
+ return binder && range
499
+ ? { kind: "Identifier", name: binder.name, location: { ...range.start, range } }
500
+ : undefined;
501
+ };
502
+
481
503
  export const extractModule = (source: string, name: string) => {
482
504
  const header = new RegExp(`^-{4,}\\s*MODULE\\s+${name}\\s*-{3,}$`);
483
505
  const lines = source.replace(/\r?\n$/, "").split(/\r?\n/);
@@ -501,8 +523,6 @@ const parse = (
501
523
  let lastOperator: Precedence | undefined;
502
524
  let precedingOperator: Precedence | undefined;
503
525
  const recursiveScopes: Set<string>[] = [];
504
- const factNames = new Set<string>();
505
- const proofScopes: Set<string>[] = [];
506
526
  const openModules: Module[] = [];
507
527
  // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
508
528
  let attemptFrame: number | undefined;
@@ -653,6 +673,7 @@ const parse = (
653
673
  return result;
654
674
  };
655
675
 
676
+ // Deviation from SANY: TLAplusParser#belchDEF reads a field named THEOREM, AXIOM, DOMAIN or a like keyword as that keyword, so SANY rejects the definition after it.
656
677
  const isFieldName = (token: Token) =>
657
678
  (token.kind === "Identifier" ||
658
679
  token.kind === "Keyword" ||
@@ -1031,22 +1052,45 @@ const parse = (
1031
1052
  }
1032
1053
  if (accept("EXCEPT")) {
1033
1054
  const updates = parseSeparated(() => {
1055
+ const heirStarts = [cursor];
1034
1056
  expect("!");
1035
- const path: ExceptPathStep[] = [];
1057
+ const components: (string | Expression[])[] = [];
1036
1058
  while (isAt(".") || isAt("[")) {
1059
+ heirStarts.push(cursor);
1037
1060
  if (accept(".")) {
1038
1061
  if (!isFieldName(peek()))
1039
1062
  throw createUnexpected(`Expected a field name but found ${describeToken(peek())}`);
1040
1063
  if (!isTlapm && isAt("@")) throw createUnexpected("@ used in !.@");
1041
- path.push({ kind: "Field", name: advance().text });
1064
+ components.push(advance().text);
1042
1065
  continue;
1043
1066
  }
1044
1067
  expect("[");
1045
- path.push({ kind: "Index", args: parseSeparated(() => parseExpression()) });
1068
+ components.push(parseSeparated(() => parseExpression()));
1046
1069
  expect("]");
1047
1070
  }
1071
+ heirStarts.push(cursor, cursor + 1);
1048
1072
  expect("=");
1049
- return { path, value: parseExpression() };
1073
+ const value = parseExpression();
1074
+ heirStarts.push(cursor);
1075
+ const getHeirRange = (index: number) =>
1076
+ getRange(heirStarts[index], heirStarts[index + 1] - 1);
1077
+ return {
1078
+ path: components.map((component, index): ExceptPathStep =>
1079
+ typeof component === "string"
1080
+ ? { kind: "Field", name: component }
1081
+ : {
1082
+ kind: "Index",
1083
+ args: component,
1084
+ // SANY's Generator locates the $Tuple of component i at heir 2i + 1 of its ExceptSpec, not i + 1.
1085
+ // Deviation from SANY: past the last heir, that throws ArrayIndexOutOfBoundsException; tla-ts locates it at the component.
1086
+ tupleRange: getHeirRange(
1087
+ 2 * index + 1 < heirStarts.length - 1 ? 2 * index + 1 : index + 1,
1088
+ ),
1089
+ },
1090
+ ),
1091
+ value,
1092
+ range: getRange(heirStarts[0]),
1093
+ };
1050
1094
  });
1051
1095
  expect("]");
1052
1096
  return { kind: "Except", function: expression, updates, location };
@@ -1213,9 +1257,15 @@ const parse = (
1213
1257
  const argumentRanges = [argumentsRange];
1214
1258
  while (isSelectorAhead()) {
1215
1259
  advance();
1216
- selectorRanges.push(getRange(cursor, cursor));
1260
+ const selectorStart = cursor;
1217
1261
  lastArgumentsRange = undefined;
1218
- selectors.push(parseSelector());
1262
+ const selector = parseSelector();
1263
+ selectorRanges.push(
1264
+ selector.kind === "Bound"
1265
+ ? getRange(selectorStart)
1266
+ : getRange(selectorStart, selectorStart),
1267
+ );
1268
+ selectors.push(selector);
1219
1269
  argumentRanges.push(lastArgumentsRange);
1220
1270
  }
1221
1271
  const names = selectors.flatMap((selector) =>
@@ -1339,6 +1389,7 @@ const parse = (
1339
1389
  case "(": {
1340
1390
  const expression = withBracketLayout(() => parseExpression());
1341
1391
  expect(")");
1392
+ parenthesizedRanges.set(expression, getRange(start));
1342
1393
  return expression;
1343
1394
  }
1344
1395
  case "[":
@@ -1366,11 +1417,13 @@ const parse = (
1366
1417
  case "LET": {
1367
1418
  const definitions: Definition[] = [];
1368
1419
  const instances: Instance[] = [];
1420
+ const recursive: Declaration[] = [];
1369
1421
  recursiveScopes.push(new Set());
1370
1422
  while (!accept("IN")) {
1371
1423
  if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1372
1424
  if (accept("RECURSIVE")) {
1373
- declareRecursive();
1425
+ recursive.push(...declareRecursive());
1426
+ openModules[openModules.length - 1].hasRecursiveLet = true;
1374
1427
  continue;
1375
1428
  }
1376
1429
  const unit = parseDefinition(!isTlapm && accept("LOCAL"));
@@ -1378,10 +1431,14 @@ const parse = (
1378
1431
  else definitions.push(unit);
1379
1432
  }
1380
1433
  recursiveScopes.pop();
1381
- const body = parseExpression();
1382
- return instances.length === 0
1383
- ? { kind: "Let", definitions, body, location }
1384
- : { kind: "Let", definitions, instances, body, location };
1434
+ return {
1435
+ kind: "Let",
1436
+ definitions,
1437
+ ...(instances.length > 0 && { instances }),
1438
+ ...(recursive.length > 0 && { recursive }),
1439
+ body: parseExpression(),
1440
+ location,
1441
+ };
1385
1442
  }
1386
1443
  case "CHOOSE": {
1387
1444
  const pattern = parsePattern();
@@ -1947,7 +2004,11 @@ const parse = (
1947
2004
 
1948
2005
  const parseDeclarationUnit = (): Declaration => {
1949
2006
  const location = getLocation(peek());
1950
- if (isAt("_") && peek(1).kind === "Operator") {
2007
+ const isOperatorDeclaration =
2008
+ isAt("_") &&
2009
+ peek(1).kind === "Operator" &&
2010
+ (INFIX_OPERATORS.has(peek(1).text) || DEFINABLE_POSTFIX_OPERATORS.has(peek(1).text));
2011
+ if (isOperatorDeclaration) {
1951
2012
  advance();
1952
2013
  const name = advance().text;
1953
2014
  return { name, arity: accept("_") ? 2 : 1, location };
@@ -2060,23 +2121,6 @@ const parse = (
2060
2121
  return isFirst ? level > outer : proofLevels[top] === level;
2061
2122
  };
2062
2123
 
2063
- const isDeclared = (name: string) =>
2064
- !factNames.has(name) &&
2065
- openModules.some(
2066
- (module) =>
2067
- module.constants.some((constant) => constant.name === name) ||
2068
- module.variables.some((variable) => variable.name === name) ||
2069
- module.definitions.some((definition) => definition.name === name),
2070
- );
2071
-
2072
- const isHideFact = (fact: Fact) => {
2073
- if (fact.kind === "ModuleFact" || fact.kind === "Subexpression") return true;
2074
- if (fact.kind === "Apply") return fact.operator.includes("!");
2075
- if (fact.kind !== "Identifier") return false;
2076
- if (fact.name.startsWith("<") || fact.name.includes("!")) return true;
2077
- return !BUILTIN_CONSTANTS.has(fact.name) && !isDeclared(fact.name);
2078
- };
2079
-
2080
2124
  const isFactAhead = () => {
2081
2125
  const token = peek();
2082
2126
  if (token.kind === "Step") return isStepReference(token);
@@ -2113,23 +2157,6 @@ const parse = (
2113
2157
  );
2114
2158
  };
2115
2159
 
2116
- const declareProofSymbol = (name: string) => proofScopes[proofScopes.length - 1]?.add(name);
2117
-
2118
- const withProofScope = <Result>(parse: () => Result) => {
2119
- proofScopes.push(new Set());
2120
- const result = parse();
2121
- proofScopes.pop();
2122
- return result;
2123
- };
2124
-
2125
- const isDeclaredSymbol = (name: string) =>
2126
- proofScopes.some((scope) => scope.has(name)) ||
2127
- openModules.some(
2128
- (module) =>
2129
- module.constants.some((constant) => constant.name === name) ||
2130
- module.variables.some((variable) => variable.name === name),
2131
- );
2132
-
2133
2160
  const parseDefinable = (): Fact => {
2134
2161
  const start = cursor;
2135
2162
  const token = peek();
@@ -2151,18 +2178,23 @@ const parse = (
2151
2178
  );
2152
2179
  };
2153
2180
 
2154
- const parseDefs = () => {
2155
- if (isTlapm) return parseSeparated(parseDefinable);
2156
- const defs = parseSeparated(parseFact);
2157
- const invalid =
2158
- mode === "tlc"
2159
- ? defs.find((def) => def.kind === "Identifier" && isDeclaredSymbol(def.name))
2160
- : undefined;
2161
- if (invalid) {
2162
- throw createError("DEF clause entry should describe a defined operator", invalid.location);
2163
- }
2164
- return defs;
2165
- };
2181
+ const parseDefs = () =>
2182
+ parseSeparated(() => {
2183
+ if (isTlapm) return parseDefinable();
2184
+ const fact = parseFact();
2185
+ const isName =
2186
+ (fact.kind === "Identifier" ||
2187
+ fact.kind === "Subexpression" ||
2188
+ fact.kind === "OperatorReference") &&
2189
+ !parenthesizedRanges.has(fact);
2190
+ if (fact.kind !== "ModuleFact" && !isName) {
2191
+ defEntryErrors.set(
2192
+ fact,
2193
+ getDefEntryErrors(createSourceFile(openModules[0].name, source), fact),
2194
+ );
2195
+ }
2196
+ return fact;
2197
+ });
2166
2198
 
2167
2199
  // tlapm's usebody reads facts while an expression starts after the comma.
2168
2200
  const parseTlapmFacts = (): Fact[] => {
@@ -2194,25 +2226,16 @@ const parse = (
2194
2226
  const keyword = advance();
2195
2227
  const isOnly = keyword.text === "USE" && accept("ONLY");
2196
2228
  const keywordRange = getRange(start);
2197
- const use: UseOrHide = {
2198
- kind: keyword.text === "USE" ? "Use" : "Hide",
2199
- isOnly,
2200
- ...parseFacts(),
2201
- keyword: keywordRange,
2202
- location: getLocation(keyword),
2203
- };
2204
- const invalid =
2205
- use.kind === "Hide" && mode === "tlc" ? use.facts.filter((fact) => !isHideFact(fact)) : [];
2206
- if (invalid.length > 0) {
2207
- throw createSanyError(
2208
- invalid.map((fact) => ({
2209
- location: formatRange(fact.location.range ?? getRange(start)),
2210
- message:
2211
- "The only expression allowed as a fact in a HIDE is \nthe name of a theorem, assumption, or step.",
2212
- })),
2213
- );
2214
- }
2215
- return withRange(use, start);
2229
+ return withRange(
2230
+ {
2231
+ kind: keyword.text === "USE" ? "Use" : "Hide",
2232
+ isOnly,
2233
+ ...parseFacts(),
2234
+ keyword: keywordRange,
2235
+ location: getLocation(keyword),
2236
+ },
2237
+ start,
2238
+ );
2216
2239
  };
2217
2240
 
2218
2241
  const parseNewSymbol = (): NewSymbol => {
@@ -2228,7 +2251,6 @@ const parse = (
2228
2251
  if (level !== undefined) advance();
2229
2252
  if (level === "Variable") {
2230
2253
  const named = expectName();
2231
- declareProofSymbol(named.name);
2232
2254
  return withRange(
2233
2255
  {
2234
2256
  kind: "NewSymbol",
@@ -2243,7 +2265,6 @@ const parse = (
2243
2265
  );
2244
2266
  }
2245
2267
  const declaration = parseDeclaration();
2246
- declareProofSymbol(declaration.name);
2247
2268
  const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
2248
2269
  if (isBounded && declaration.arity > 0) {
2249
2270
  throw createError("declared symbol with arguments before \\in");
@@ -2268,7 +2289,7 @@ const parse = (
2268
2289
  advance();
2269
2290
  advance();
2270
2291
  }
2271
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2292
+ if (isAt("ASSUME")) return parseAssumeProve();
2272
2293
  if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2273
2294
  return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2274
2295
  if (!isTlapm) return parseExpression();
@@ -2317,15 +2338,6 @@ const parse = (
2317
2338
  return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
2318
2339
  };
2319
2340
 
2320
- const declareProofSymbols = (names: string[], bounds: Bound[]) => {
2321
- names.forEach(declareProofSymbol);
2322
- bounds.forEach((bound) =>
2323
- (bound.pattern.kind === "Name" ? [bound.pattern.name] : bound.pattern.names).forEach(
2324
- declareProofSymbol,
2325
- ),
2326
- );
2327
- };
2328
-
2329
2341
  const parseStepBody = (): StepBody => {
2330
2342
  const token = peek();
2331
2343
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
@@ -2346,7 +2358,6 @@ const parse = (
2346
2358
  const isBounded = isBoundAhead();
2347
2359
  const names = getNames(isBounded ? [] : parseSeparated(expectName));
2348
2360
  const bounds = isBounded ? parseBounds() : [];
2349
- declareProofSymbols(names.names, bounds);
2350
2361
  return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
2351
2362
  }
2352
2363
  if (accept("WITNESS")) {
@@ -2356,7 +2367,6 @@ const parse = (
2356
2367
  const isNames = isNameListAhead(":");
2357
2368
  const names = getNames(isNames ? parseSeparated(expectName) : []);
2358
2369
  const bounds = isNames ? [] : parseBounds();
2359
- declareProofSymbols(names.names, bounds);
2360
2370
  expect(":");
2361
2371
  return {
2362
2372
  kind: "Pick",
@@ -2393,8 +2403,6 @@ const parse = (
2393
2403
  const start = cursor;
2394
2404
  const step = parseStepStart(isAt("QED", 1));
2395
2405
  const statementStart = cursor;
2396
- const scope = new Set<string>();
2397
- proofScopes.push(scope);
2398
2406
  const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
2399
2407
  const head = getRange(start);
2400
2408
  const statement = getRange(statementStart);
@@ -2403,8 +2411,6 @@ const parse = (
2403
2411
  throw createError("Proof of a step that does not take a proof");
2404
2412
  }
2405
2413
  const proof = hasProof ? parseProof() : undefined;
2406
- proofScopes.pop();
2407
- if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
2408
2414
  return withRange({ ...step, body, head, statement, proof }, start);
2409
2415
  };
2410
2416
 
@@ -2436,7 +2442,7 @@ const parse = (
2436
2442
  const parseProof = (): Proof => {
2437
2443
  const start = cursor;
2438
2444
  proofLevels.push(-1);
2439
- const proof = withProofScope(parseProofBody);
2445
+ const proof = parseProofBody();
2440
2446
  proofLevels.pop();
2441
2447
  return withRange(proof, start);
2442
2448
  };
@@ -2620,7 +2626,6 @@ const parse = (
2620
2626
  const parseFactName = () => {
2621
2627
  if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
2622
2628
  const name = expectIdentifier();
2623
- factNames.add(name);
2624
2629
  advance();
2625
2630
  return name;
2626
2631
  };
@@ -2638,16 +2643,9 @@ const parse = (
2638
2643
  const start = cursor;
2639
2644
  const keyword = advance();
2640
2645
  const name = parseFactName();
2641
- const parsed = withProofScope(() => {
2642
- const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2643
- if (isTlapm) return { statement, proof: parseTlapmProof() };
2644
- return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
2645
- });
2646
- const statement = parsed.statement;
2647
- const theorem = withRange(
2648
- { name, statement, proof: parsed.proof, location: getLocation(keyword) },
2649
- start,
2650
- );
2646
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2647
+ const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
2648
+ const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
2651
2649
  module.theorems.push(theorem);
2652
2650
  module.units.push({ kind: "Theorem", theorem });
2653
2651
  if (name === undefined || statement.kind === "AssumeProve") return;
@@ -2688,6 +2686,7 @@ const parse = (
2688
2686
  theorems: [],
2689
2687
  uses: [],
2690
2688
  units: [],
2689
+ hasRecursiveLet: false,
2691
2690
  };
2692
2691
  openModules.push(module);
2693
2692
  recursiveScopes.push(new Set());
@@ -226,12 +226,12 @@ export const applyAttributes = (
226
226
  thms: readonly Thm[],
227
227
  ): [IsarContext, Thm[]] =>
228
228
  thms.reduce<[IsarContext, Thm[]]>(
229
- ([current, results], thm) => {
229
+ (accumulated, thm) => {
230
230
  const [declared, result] = attributes.reduce<[IsarContext, Thm]>(
231
- ([inner, changed], attribute) => applyAttribute(inner, attribute, changed),
232
- [current, thm],
231
+ (state, attribute) => applyAttribute(state[0], attribute, state[1]),
232
+ [accumulated[0], thm],
233
233
  );
234
- return [declared, [...results, result]];
234
+ return [declared, [...accumulated[1], result]];
235
235
  },
236
236
  [context, []],
237
237
  );
@@ -75,7 +75,7 @@ export const getCases = (rule: CasesRule): [CaseInfo, number] => {
75
75
  const names = lookupTag(rule.tags, "case_names");
76
76
  const cases =
77
77
  names === undefined
78
- ? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (_, index) => ({
78
+ ? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (_value, index) => ({
79
79
  name: String(index + 1),
80
80
  concls: [] as string[],
81
81
  }))
@@ -138,11 +138,13 @@ const extractCase = (
138
138
  return {
139
139
  fixes,
140
140
  assumes: [{ name: "", props: stripAssumsHyp(prop).flatMap(destConjunctions).map(absFixes) }],
141
- binds: [[CASE_CONCL, concl] as [string, Term], ...destBinops(concls, concl)].map((bind) => ({
142
- name: bind[0],
143
- index: 0,
144
- term: absFixes(bind[1]),
145
- })),
141
+ binds: [[CASE_CONCL, concl] satisfies [string, Term], ...destBinops(concls, concl)].map(
142
+ (bind) => ({
143
+ name: bind[0],
144
+ index: 0,
145
+ term: absFixes(bind[1]),
146
+ }),
147
+ ),
146
148
  cases: [],
147
149
  };
148
150
  };
@@ -91,7 +91,7 @@ const pruneParamsTac = (simp: SimpContext): Tactic => {
91
91
  const empty = { ...simp, simpset: emptySimpset };
92
92
  const context = { ...empty, simpset: addSimps(empty, [trivForallEquality]) };
93
93
  return primitive((state) =>
94
- Array.from({ length: nprems(state) }, (_, offset) => offset + 1).reduce(
94
+ Array.from({ length: nprems(state) }, (_value, offset) => offset + 1).reduce(
95
95
  (current, index) =>
96
96
  gconvRule(
97
97
  (term) =>
@@ -245,9 +245,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
245
245
  chosen.kind === "Bound"
246
246
  ? substBounds(
247
247
  [
248
- ...Array.from({ length: chosen.index }, (_, position) => mkBound(position + 1)),
248
+ ...Array.from({ length: chosen.index }, (_value, position) => mkBound(position + 1)),
249
249
  mkBound(0),
250
- ...Array.from({ length: params.length - chosen.index - 1 }, (_, position) =>
250
+ ...Array.from({ length: params.length - chosen.index - 1 }, (_value, position) =>
251
251
  mkBound(chosen.index + 2 + position),
252
252
  ),
253
253
  ],
@@ -83,9 +83,9 @@ const rhsOf = (thm: Thm) => destEquals(thm.prop)[1];
83
83
 
84
84
  const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
85
85
  const typed = instantiateTypes(env.tyenv, rule);
86
- const insts: Instantiation[] = tableEntries(env.tenv).map(([key, binding]) => ({
87
- variable: mkVar(key.name, key.index, substType(env.tyenv, binding.type)),
88
- term: binding.term,
86
+ const insts: Instantiation[] = tableEntries(env.tenv).map((entry) => ({
87
+ variable: mkVar(entry[0].name, entry[0].index, substType(env.tyenv, entry[1].type)),
88
+ term: entry[1].term,
89
89
  }));
90
90
  return instantiate(insts, typed);
91
91
  };
@@ -636,10 +636,10 @@ const mapAbsVars = (rename: (name: string) => string, term: Term): Term => {
636
636
 
637
637
  export const renameAbs = (pattern: Term, object: Term, term: Term): Term | undefined => {
638
638
  const renaming = new Map<string, string>();
639
- matchBvs(pattern, object, []).forEach(([from, to]) => {
640
- if (!renaming.has(from)) renaming.set(from, to);
639
+ matchBvs(pattern, object, []).forEach((pair) => {
640
+ if (!renaming.has(pair[0])) renaming.set(pair[0], pair[1]);
641
641
  });
642
- if ([...renaming].every(([from, to]) => from === to)) return undefined;
642
+ if ([...renaming].every((pair) => pair[0] === pair[1])) return undefined;
643
643
  const renamed = mapAbsVars((name) => renaming.get(name) ?? name, term);
644
644
  return renamed === term ? undefined : renamed;
645
645
  };
@@ -20,35 +20,32 @@ export const getMd5 = (text: string): string => {
20
20
  const words = Array.from({ length: 16 }, (_value, index) =>
21
21
  view.getUint32(offset + index * 4, true),
22
22
  );
23
- const mixedState = Array.from({ length: 64 }).reduce<number[]>(
24
- ([innerA, innerB, innerC, innerD], _value, index) => {
25
- const round = Math.floor(index / 16);
26
- const mixed =
27
- round === 0
28
- ? (innerB & innerC) | (~innerB & innerD)
29
- : round === 1
30
- ? (innerD & innerB) | (~innerD & innerC)
31
- : round === 2
32
- ? innerB ^ innerC ^ innerD
33
- : innerC ^ (innerB | ~innerD);
34
- const word =
35
- round === 0
36
- ? index
37
- : round === 1
38
- ? (5 * index + 1) % 16
39
- : round === 2
40
- ? (3 * index + 5) % 16
41
- : (7 * index) % 16;
42
- const sum = (innerA + mixed + CONSTANTS[index] + words[word]) | 0;
43
- return [
44
- innerD,
45
- (innerB + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
46
- innerB,
47
- innerC,
48
- ];
49
- },
50
- state,
51
- );
23
+ const mixedState = Array.from({ length: 64 }).reduce<number[]>((state, _value, index) => {
24
+ const round = Math.floor(index / 16);
25
+ const mixed =
26
+ round === 0
27
+ ? (state[1] & state[2]) | (~state[1] & state[3])
28
+ : round === 1
29
+ ? (state[3] & state[1]) | (~state[3] & state[2])
30
+ : round === 2
31
+ ? state[1] ^ state[2] ^ state[3]
32
+ : state[2] ^ (state[1] | ~state[3]);
33
+ const word =
34
+ round === 0
35
+ ? index
36
+ : round === 1
37
+ ? (5 * index + 1) % 16
38
+ : round === 2
39
+ ? (3 * index + 5) % 16
40
+ : (7 * index) % 16;
41
+ const sum = (state[0] + mixed + CONSTANTS[index] + words[word]) | 0;
42
+ return [
43
+ state[3],
44
+ (state[1] + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
45
+ state[1],
46
+ state[2],
47
+ ];
48
+ }, state);
52
49
  state.splice(0, 4, ...state.map((word, index) => (word + mixedState[index]) | 0));
53
50
  }
54
51
  return state
@@ -296,7 +296,7 @@ const invert = (mode: Mode): Mode => ({
296
296
  : "Neither",
297
297
  });
298
298
 
299
- export const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
299
+ const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
300
300
  toIdv(encode(encoder, expression, env, clearPolarity(mode)));
301
301
 
302
302
  export const encodeBool = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
@@ -917,12 +917,7 @@ const encodeSequent = (
917
917
  );
918
918
  };
919
919
 
920
- export const encode = (
921
- encoder: Encoder,
922
- expression: Expr,
923
- env: Env | undefined,
924
- mode: Mode,
925
- ): Term => {
920
+ const encode = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode): Term => {
926
921
  switch (expression.kind) {
927
922
  case "Ix":
928
923
  return encodeReference(encoder, getBinding(env, expression.index), [], env, mode);
@@ -307,7 +307,7 @@ const getMembership = (polarity: Polarity, element: Expr, set: Expr): Expr | und
307
307
  items: [
308
308
  builtin("Eq", [
309
309
  left,
310
- { kind: "Tuple", elements: factors.map((_, index) => component(index)) },
310
+ { kind: "Tuple", elements: factors.map((_value, index) => component(index)) },
311
311
  ]),
312
312
  ...factors.map((factor, index) => mem(component(index), factor)),
313
313
  ],