tla-ts 0.0.10-dev.c92e6a4ea → 0.0.10-dev.d166e0ae9

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 (235) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +36 -36
  4. package/dist/deciders.js +54 -54
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +13 -3
  7. package/dist/index.d.ts +13 -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 +68 -68
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +42 -42
  16. package/dist/run.js +44 -44
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +45 -43
  20. package/dist/transfer.js +45 -43
  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 +11 -1
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +9 -6
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +356 -173
  30. package/src/cli/tlc-output.ts +1 -0
  31. package/src/cli/tlc.ts +4 -3
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +34 -13
  34. package/src/coverage.ts +3 -0
  35. package/src/dependencies.ts +61 -13
  36. package/src/dfid.ts +22 -10
  37. package/src/environment.ts +71 -35
  38. package/src/errors.ts +7 -0
  39. package/src/evaluate.ts +149 -54
  40. package/src/exit-codes.ts +29 -15
  41. package/src/instances.ts +16 -6
  42. package/src/java-hash.ts +14 -0
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +186 -97
  45. package/src/liveness-checker.ts +131 -83
  46. package/src/liveness.ts +52 -11
  47. package/src/obligations/index.ts +1 -1
  48. package/src/obligations/normalize.ts +1 -4
  49. package/src/obligations/printer.ts +5 -5
  50. package/src/obligations/source.ts +2 -0
  51. package/src/parser.ts +115 -145
  52. package/src/prover/isabelle/isar/attrib.ts +4 -4
  53. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  54. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  55. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  56. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  57. package/src/prover/isabelle/pure/term.ts +3 -3
  58. package/src/prover/prep/md5.ts +26 -29
  59. package/src/prover/smt/rewrite.ts +2 -7
  60. package/src/prover/smt/simplify.ts +1 -1
  61. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  62. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  63. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  64. package/src/prover/smt/solver/ast-lt.ts +1 -1
  65. package/src/prover/smt/solver/ast.ts +63 -14
  66. package/src/prover/smt/solver/auf-solver.ts +23 -12
  67. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  68. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  69. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  70. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  71. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  72. package/src/prover/smt/solver/card2bv.ts +35 -18
  73. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  74. package/src/prover/smt/solver/context.ts +67 -13
  75. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  76. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  77. package/src/prover/smt/solver/dependent-expr-state.ts +26 -15
  78. package/src/prover/smt/solver/diff-neq.ts +1 -2
  79. package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
  80. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  81. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  82. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  83. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  84. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  87. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  88. package/src/prover/smt/solver/euf/mam.ts +1 -5
  89. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  90. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  91. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  92. package/src/prover/smt/solver/factor.ts +36 -14
  93. package/src/prover/smt/solver/fd-solver.ts +148 -39
  94. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  95. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  96. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  97. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  98. package/src/prover/smt/solver/goal.ts +6 -3
  99. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  100. package/src/prover/smt/solver/hashtable.ts +4 -0
  101. package/src/prover/smt/solver/internalizer.ts +1 -1
  102. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  103. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  104. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  105. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  106. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  107. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  108. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  109. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  110. package/src/prover/smt/solver/maxcore.ts +2 -1
  111. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  112. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  113. package/src/prover/smt/solver/model-checker.ts +1 -1
  114. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  115. package/src/prover/smt/solver/model-generator.ts +85 -43
  116. package/src/prover/smt/solver/mpf.ts +2 -4
  117. package/src/prover/smt/solver/mus.ts +2 -3
  118. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  119. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  120. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  121. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  122. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  123. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  124. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  125. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  126. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  127. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  128. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  129. package/src/prover/smt/solver/nlqsat.ts +1 -1
  130. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  131. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  132. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  133. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  134. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  135. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  136. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  137. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  138. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  139. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  140. package/src/prover/smt/solver/nnf.ts +6 -2
  141. package/src/prover/smt/solver/opt-context.ts +21 -7
  142. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  143. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  144. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  145. package/src/prover/smt/solver/opt-solver.ts +10 -6
  146. package/src/prover/smt/solver/optsmt.ts +1 -1
  147. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  148. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  149. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  150. package/src/prover/smt/solver/probes.ts +88 -23
  151. package/src/prover/smt/solver/proto-model.ts +8 -8
  152. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  153. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  154. package/src/prover/smt/solver/qe-lite.ts +2 -2
  155. package/src/prover/smt/solver/qe.ts +3 -2
  156. package/src/prover/smt/solver/qsat.ts +23 -8
  157. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  158. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  159. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  160. package/src/prover/smt/solver/rewriter.ts +31 -25
  161. package/src/prover/smt/solver/rlimit.ts +4 -0
  162. package/src/prover/smt/solver/sat/config.ts +1 -1
  163. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  164. package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -28
  165. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  166. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  167. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  168. package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
  169. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  170. package/src/prover/smt/solver/sat/solver.ts +25 -47
  171. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  172. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  173. package/src/prover/smt/solver/seq-derive.ts +2 -2
  174. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  175. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  176. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  177. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  178. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  179. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  180. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  181. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  182. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  183. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  184. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  185. package/src/prover/smt/solver/smt-setup.ts +96 -10
  186. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  187. package/src/prover/smt/solver/smtlib-script.ts +674 -195
  188. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  189. package/src/prover/smt/solver/solver.ts +18 -3
  190. package/src/prover/smt/solver/tactic.ts +332 -189
  191. package/src/prover/smt/solver/theory-bv.ts +13 -3
  192. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  193. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  194. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  195. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  196. package/src/prover/smt/solver/theory-lra.ts +1 -1
  197. package/src/prover/smt/solver/theory-pb.ts +24 -7
  198. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  199. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  200. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  201. package/src/prover/tlapm/cache.ts +8 -8
  202. package/src/prover/zenon/index-table.ts +5 -2
  203. package/src/prover/zenon/isar-case.ts +1 -1
  204. package/src/prover/zenon/isar.ts +2 -2
  205. package/src/prover/zenon/phrase.ts +1 -1
  206. package/src/resolve.ts +1071 -251
  207. package/src/runtime.ts +5 -1
  208. package/src/sany/builtins.ts +10 -10
  209. package/src/sany/generation.ts +2 -13
  210. package/src/sany/generator-definitions.ts +3 -1
  211. package/src/sany/generator-expressions.ts +38 -30
  212. package/src/sany/generator-proofs.ts +6 -3
  213. package/src/sany/generator.ts +2 -1
  214. package/src/sany/lexer.ts +3 -3
  215. package/src/sany/modules.ts +4 -2
  216. package/src/sany/nodes.ts +1 -1
  217. package/src/sany/selectors.ts +11 -6
  218. package/src/sany/xml.ts +2 -3
  219. package/src/search.ts +197 -117
  220. package/src/simulate.ts +165 -102
  221. package/src/spec-description.ts +8 -6
  222. package/src/standard-modules.ts +56 -22
  223. package/src/subexpressions.ts +518 -123
  224. package/src/successors.ts +10 -3
  225. package/src/symmetry.ts +2 -1
  226. package/src/tlc/jar-data.ts +10 -0
  227. package/src/tlc/messages.ts +3 -3
  228. package/src/tlc/random.ts +2 -1
  229. package/src/tlc/replay.ts +27 -14
  230. package/src/tlc/tlc-operators.ts +10 -8
  231. package/src/tlc/tlcext-operators.ts +26 -10
  232. package/src/tlc/trace-spec.ts +9 -22
  233. package/src/typed-tier.ts +44 -27
  234. package/src/typescript/types.ts +2 -2
  235. package/src/values.ts +135 -78
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,7 +21,7 @@ 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";
27
26
  import { getSanyParseError } from "./sany/parse-error";
28
27
 
@@ -252,6 +251,7 @@ const OPERATOR_ARGUMENTS = new Set([
252
251
 
253
252
  const SELECTOR_SYMBOLS = new Set(["<<", ">>", ":", "@", "("]);
254
253
 
254
+ // Deviation from SANY: TLAplusParser#OpOrExpr's lookahead omits PROPOSITION, LEMMA and COROLLARY, so SANY parses an operator argument before them as an expression.
255
255
  const UNIT_KEYWORDS = new Set([
256
256
  "ASSUME",
257
257
  "ASSUMPTION",
@@ -478,6 +478,8 @@ const getOperatorApplication = (
478
478
  }
479
479
  };
480
480
 
481
+ export const parenthesizedRanges = new WeakMap<Expression, SourceRange>();
482
+
481
483
  export const extractModule = (source: string, name: string) => {
482
484
  const header = new RegExp(`^-{4,}\\s*MODULE\\s+${name}\\s*-{3,}$`);
483
485
  const lines = source.replace(/\r?\n$/, "").split(/\r?\n/);
@@ -501,8 +503,6 @@ const parse = (
501
503
  let lastOperator: Precedence | undefined;
502
504
  let precedingOperator: Precedence | undefined;
503
505
  const recursiveScopes: Set<string>[] = [];
504
- const factNames = new Set<string>();
505
- const proofScopes: Set<string>[] = [];
506
506
  const openModules: Module[] = [];
507
507
  // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
508
508
  let attemptFrame: number | undefined;
@@ -653,6 +653,7 @@ const parse = (
653
653
  return result;
654
654
  };
655
655
 
656
+ // 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
657
  const isFieldName = (token: Token) =>
657
658
  (token.kind === "Identifier" ||
658
659
  token.kind === "Keyword" ||
@@ -1201,6 +1202,55 @@ const parse = (
1201
1202
  return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
1202
1203
  };
1203
1204
 
1205
+ const parseSelections = (
1206
+ name: string,
1207
+ args: Expression[],
1208
+ argumentsRange: SourceRange | undefined,
1209
+ start: number,
1210
+ location: SourceLocation,
1211
+ ): Expression => {
1212
+ const selectors: Selector[] = [{ kind: "Name", name, args }];
1213
+ const selectorRanges = [getRange(start, start)];
1214
+ const argumentRanges = [argumentsRange];
1215
+ while (isSelectorAhead()) {
1216
+ advance();
1217
+ const selectorStart = cursor;
1218
+ lastArgumentsRange = undefined;
1219
+ const selector = parseSelector();
1220
+ selectorRanges.push(
1221
+ selector.kind === "Bound"
1222
+ ? getRange(selectorStart)
1223
+ : getRange(selectorStart, selectorStart),
1224
+ );
1225
+ selectors.push(selector);
1226
+ argumentRanges.push(lastArgumentsRange);
1227
+ }
1228
+ const names = selectors.flatMap((selector) =>
1229
+ selector.kind === "Name" ? [selector.name] : [],
1230
+ );
1231
+ const operator = names.join("!");
1232
+ const qualifiedArgs = selectors.flatMap((selector) =>
1233
+ "args" in selector ? selector.args : [],
1234
+ );
1235
+ const argumentCounts = selectors.map((selector) =>
1236
+ "args" in selector ? selector.args.length : 0,
1237
+ );
1238
+ return names.length < selectors.length
1239
+ ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1240
+ : qualifiedArgs.length === 0
1241
+ ? { kind: "Identifier", name: operator, selectorRanges, location }
1242
+ : {
1243
+ kind: "Apply",
1244
+ operator,
1245
+ args: qualifiedArgs,
1246
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1247
+ argumentsRange: argumentRanges.at(-1) ?? getRange(start),
1248
+ selectorRanges,
1249
+ argumentRanges,
1250
+ location,
1251
+ };
1252
+ };
1253
+
1204
1254
  const parsePrimary = (preceding?: Precedence): Expression => {
1205
1255
  const start = cursor;
1206
1256
  const token = advance();
@@ -1252,61 +1302,51 @@ const parse = (
1252
1302
  if (name === "@" && !hasArguments && !isSelectorAhead())
1253
1303
  return { kind: "ExceptAt", location };
1254
1304
  const args = hasArguments ? parseArguments() : [];
1255
- const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
1256
1305
  if (!isSelectorAhead()) {
1257
1306
  return hasArguments
1258
1307
  ? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
1259
1308
  : { kind: "Identifier", name, location };
1260
1309
  }
1261
- const selectors: Selector[] = [{ kind: "Name", name, args }];
1262
- const selectorRanges = [getRange(start, start)];
1263
- while (isSelectorAhead()) {
1264
- advance();
1265
- selectorRanges.push(getRange(cursor, cursor));
1266
- lastArgumentsRange = undefined;
1267
- selectors.push(parseSelector());
1268
- argumentRanges.push(lastArgumentsRange);
1269
- }
1270
- const names = selectors.flatMap((selector) =>
1271
- selector.kind === "Name" ? [selector.name] : [],
1272
- );
1273
- const operator = names.join("!");
1274
- const qualifiedArgs = selectors.flatMap((selector) =>
1275
- "args" in selector ? selector.args : [],
1276
- );
1277
- const argumentCounts = selectors.map((selector) =>
1278
- "args" in selector ? selector.args.length : 0,
1310
+ return parseSelections(
1311
+ name,
1312
+ args,
1313
+ hasArguments ? lastArgumentsRange : undefined,
1314
+ start,
1315
+ location,
1279
1316
  );
1280
- const argumentsRange = argumentRanges.at(-1) ?? getRange(start);
1281
- return names.length < selectors.length
1282
- ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1283
- : qualifiedArgs.length === 0
1284
- ? { kind: "Identifier", name: operator, selectorRanges, location }
1285
- : {
1286
- kind: "Apply",
1287
- operator,
1288
- args: qualifiedArgs,
1289
- ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1290
- argumentsRange,
1291
- selectorRanges,
1292
- argumentRanges,
1293
- location,
1294
- };
1295
1317
  }
1296
- if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
1318
+ const isOperatorNamed =
1319
+ token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
1320
+ if (isOperatorNamed && isAt("(")) {
1297
1321
  const args = parseArguments();
1322
+ if (!isTlapm && isSelectorAhead()) {
1323
+ return parseSelections(token.text, args, lastArgumentsRange, start, location);
1324
+ }
1298
1325
  // Deviation from TLC: SANY's built-in \X has no definition for TLC to evaluate, a TLC bug.
1299
- return mode === "tlc" && token.text === "\\X" && args.length === 2
1300
- ? { kind: "Product", factors: args, location }
1301
- : { kind: "Apply", operator: token.text, spelling: token.spelling, args, location };
1326
+ if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
1327
+ return { kind: "Product", factors: args, location };
1328
+ }
1329
+ return token.text === "'" && args.length === 1
1330
+ ? { kind: "Prime", expression: args[0], location }
1331
+ : {
1332
+ kind: "Apply",
1333
+ operator: token.text,
1334
+ spelling: token.spelling,
1335
+ args,
1336
+ argumentsRange: lastArgumentsRange,
1337
+ location,
1338
+ };
1302
1339
  }
1303
- if (token.kind === "Operator" && isOperatorName(token.text) && !isTlapm) {
1304
- return { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1340
+ if (isOperatorNamed && !isTlapm) {
1341
+ return isSelectorAhead()
1342
+ ? parseSelections(token.text, [], undefined, start, location)
1343
+ : { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1305
1344
  }
1306
1345
  switch (token.text) {
1307
1346
  case "(": {
1308
1347
  const expression = withBracketLayout(() => parseExpression());
1309
1348
  expect(")");
1349
+ parenthesizedRanges.set(expression, getRange(start));
1310
1350
  return expression;
1311
1351
  }
1312
1352
  case "[":
@@ -1334,11 +1374,12 @@ const parse = (
1334
1374
  case "LET": {
1335
1375
  const definitions: Definition[] = [];
1336
1376
  const instances: Instance[] = [];
1377
+ const recursive: Declaration[] = [];
1337
1378
  recursiveScopes.push(new Set());
1338
1379
  while (!accept("IN")) {
1339
1380
  if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1340
1381
  if (accept("RECURSIVE")) {
1341
- declareRecursive();
1382
+ recursive.push(...declareRecursive());
1342
1383
  continue;
1343
1384
  }
1344
1385
  const unit = parseDefinition(!isTlapm && accept("LOCAL"));
@@ -1346,10 +1387,14 @@ const parse = (
1346
1387
  else definitions.push(unit);
1347
1388
  }
1348
1389
  recursiveScopes.pop();
1349
- const body = parseExpression();
1350
- return instances.length === 0
1351
- ? { kind: "Let", definitions, body, location }
1352
- : { kind: "Let", definitions, instances, body, location };
1390
+ return {
1391
+ kind: "Let",
1392
+ definitions,
1393
+ ...(instances.length > 0 && { instances }),
1394
+ ...(recursive.length > 0 && { recursive }),
1395
+ body: parseExpression(),
1396
+ location,
1397
+ };
1353
1398
  }
1354
1399
  case "CHOOSE": {
1355
1400
  const pattern = parsePattern();
@@ -1915,7 +1960,11 @@ const parse = (
1915
1960
 
1916
1961
  const parseDeclarationUnit = (): Declaration => {
1917
1962
  const location = getLocation(peek());
1918
- if (isAt("_") && peek(1).kind === "Operator") {
1963
+ const isOperatorDeclaration =
1964
+ isAt("_") &&
1965
+ peek(1).kind === "Operator" &&
1966
+ (INFIX_OPERATORS.has(peek(1).text) || DEFINABLE_POSTFIX_OPERATORS.has(peek(1).text));
1967
+ if (isOperatorDeclaration) {
1919
1968
  advance();
1920
1969
  const name = advance().text;
1921
1970
  return { name, arity: accept("_") ? 2 : 1, location };
@@ -2028,23 +2077,6 @@ const parse = (
2028
2077
  return isFirst ? level > outer : proofLevels[top] === level;
2029
2078
  };
2030
2079
 
2031
- const isDeclared = (name: string) =>
2032
- !factNames.has(name) &&
2033
- openModules.some(
2034
- (module) =>
2035
- module.constants.some((constant) => constant.name === name) ||
2036
- module.variables.some((variable) => variable.name === name) ||
2037
- module.definitions.some((definition) => definition.name === name),
2038
- );
2039
-
2040
- const isHideFact = (fact: Fact) => {
2041
- if (fact.kind === "ModuleFact" || fact.kind === "Subexpression") return true;
2042
- if (fact.kind === "Apply") return fact.operator.includes("!");
2043
- if (fact.kind !== "Identifier") return false;
2044
- if (fact.name.startsWith("<") || fact.name.includes("!")) return true;
2045
- return !BUILTIN_CONSTANTS.has(fact.name) && !isDeclared(fact.name);
2046
- };
2047
-
2048
2080
  const isFactAhead = () => {
2049
2081
  const token = peek();
2050
2082
  if (token.kind === "Step") return isStepReference(token);
@@ -2081,23 +2113,6 @@ const parse = (
2081
2113
  );
2082
2114
  };
2083
2115
 
2084
- const declareProofSymbol = (name: string) => proofScopes[proofScopes.length - 1]?.add(name);
2085
-
2086
- const withProofScope = <Result>(parse: () => Result) => {
2087
- proofScopes.push(new Set());
2088
- const result = parse();
2089
- proofScopes.pop();
2090
- return result;
2091
- };
2092
-
2093
- const isDeclaredSymbol = (name: string) =>
2094
- proofScopes.some((scope) => scope.has(name)) ||
2095
- openModules.some(
2096
- (module) =>
2097
- module.constants.some((constant) => constant.name === name) ||
2098
- module.variables.some((variable) => variable.name === name),
2099
- );
2100
-
2101
2116
  const parseDefinable = (): Fact => {
2102
2117
  const start = cursor;
2103
2118
  const token = peek();
@@ -2119,18 +2134,7 @@ const parse = (
2119
2134
  );
2120
2135
  };
2121
2136
 
2122
- const parseDefs = () => {
2123
- if (isTlapm) return parseSeparated(parseDefinable);
2124
- const defs = parseSeparated(parseFact);
2125
- const invalid =
2126
- mode === "tlc"
2127
- ? defs.find((def) => def.kind === "Identifier" && isDeclaredSymbol(def.name))
2128
- : undefined;
2129
- if (invalid) {
2130
- throw createError("DEF clause entry should describe a defined operator", invalid.location);
2131
- }
2132
- return defs;
2133
- };
2137
+ const parseDefs = () => parseSeparated(isTlapm ? parseDefinable : parseFact);
2134
2138
 
2135
2139
  // tlapm's usebody reads facts while an expression starts after the comma.
2136
2140
  const parseTlapmFacts = (): Fact[] => {
@@ -2162,25 +2166,16 @@ const parse = (
2162
2166
  const keyword = advance();
2163
2167
  const isOnly = keyword.text === "USE" && accept("ONLY");
2164
2168
  const keywordRange = getRange(start);
2165
- const use: UseOrHide = {
2166
- kind: keyword.text === "USE" ? "Use" : "Hide",
2167
- isOnly,
2168
- ...parseFacts(),
2169
- keyword: keywordRange,
2170
- location: getLocation(keyword),
2171
- };
2172
- const invalid =
2173
- use.kind === "Hide" && mode === "tlc" ? use.facts.filter((fact) => !isHideFact(fact)) : [];
2174
- if (invalid.length > 0) {
2175
- throw createSanyError(
2176
- invalid.map((fact) => ({
2177
- location: formatRange(fact.location.range ?? getRange(start)),
2178
- message:
2179
- "The only expression allowed as a fact in a HIDE is \nthe name of a theorem, assumption, or step.",
2180
- })),
2181
- );
2182
- }
2183
- return withRange(use, start);
2169
+ return withRange(
2170
+ {
2171
+ kind: keyword.text === "USE" ? "Use" : "Hide",
2172
+ isOnly,
2173
+ ...parseFacts(),
2174
+ keyword: keywordRange,
2175
+ location: getLocation(keyword),
2176
+ },
2177
+ start,
2178
+ );
2184
2179
  };
2185
2180
 
2186
2181
  const parseNewSymbol = (): NewSymbol => {
@@ -2196,7 +2191,6 @@ const parse = (
2196
2191
  if (level !== undefined) advance();
2197
2192
  if (level === "Variable") {
2198
2193
  const named = expectName();
2199
- declareProofSymbol(named.name);
2200
2194
  return withRange(
2201
2195
  {
2202
2196
  kind: "NewSymbol",
@@ -2211,7 +2205,6 @@ const parse = (
2211
2205
  );
2212
2206
  }
2213
2207
  const declaration = parseDeclaration();
2214
- declareProofSymbol(declaration.name);
2215
2208
  const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
2216
2209
  if (isBounded && declaration.arity > 0) {
2217
2210
  throw createError("declared symbol with arguments before \\in");
@@ -2236,7 +2229,7 @@ const parse = (
2236
2229
  advance();
2237
2230
  advance();
2238
2231
  }
2239
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2232
+ if (isAt("ASSUME")) return parseAssumeProve();
2240
2233
  if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2241
2234
  return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2242
2235
  if (!isTlapm) return parseExpression();
@@ -2285,15 +2278,6 @@ const parse = (
2285
2278
  return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
2286
2279
  };
2287
2280
 
2288
- const declareProofSymbols = (names: string[], bounds: Bound[]) => {
2289
- names.forEach(declareProofSymbol);
2290
- bounds.forEach((bound) =>
2291
- (bound.pattern.kind === "Name" ? [bound.pattern.name] : bound.pattern.names).forEach(
2292
- declareProofSymbol,
2293
- ),
2294
- );
2295
- };
2296
-
2297
2281
  const parseStepBody = (): StepBody => {
2298
2282
  const token = peek();
2299
2283
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
@@ -2314,7 +2298,6 @@ const parse = (
2314
2298
  const isBounded = isBoundAhead();
2315
2299
  const names = getNames(isBounded ? [] : parseSeparated(expectName));
2316
2300
  const bounds = isBounded ? parseBounds() : [];
2317
- declareProofSymbols(names.names, bounds);
2318
2301
  return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
2319
2302
  }
2320
2303
  if (accept("WITNESS")) {
@@ -2324,7 +2307,6 @@ const parse = (
2324
2307
  const isNames = isNameListAhead(":");
2325
2308
  const names = getNames(isNames ? parseSeparated(expectName) : []);
2326
2309
  const bounds = isNames ? [] : parseBounds();
2327
- declareProofSymbols(names.names, bounds);
2328
2310
  expect(":");
2329
2311
  return {
2330
2312
  kind: "Pick",
@@ -2361,8 +2343,6 @@ const parse = (
2361
2343
  const start = cursor;
2362
2344
  const step = parseStepStart(isAt("QED", 1));
2363
2345
  const statementStart = cursor;
2364
- const scope = new Set<string>();
2365
- proofScopes.push(scope);
2366
2346
  const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
2367
2347
  const head = getRange(start);
2368
2348
  const statement = getRange(statementStart);
@@ -2371,8 +2351,6 @@ const parse = (
2371
2351
  throw createError("Proof of a step that does not take a proof");
2372
2352
  }
2373
2353
  const proof = hasProof ? parseProof() : undefined;
2374
- proofScopes.pop();
2375
- if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
2376
2354
  return withRange({ ...step, body, head, statement, proof }, start);
2377
2355
  };
2378
2356
 
@@ -2404,7 +2382,7 @@ const parse = (
2404
2382
  const parseProof = (): Proof => {
2405
2383
  const start = cursor;
2406
2384
  proofLevels.push(-1);
2407
- const proof = withProofScope(parseProofBody);
2385
+ const proof = parseProofBody();
2408
2386
  proofLevels.pop();
2409
2387
  return withRange(proof, start);
2410
2388
  };
@@ -2588,7 +2566,6 @@ const parse = (
2588
2566
  const parseFactName = () => {
2589
2567
  if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
2590
2568
  const name = expectIdentifier();
2591
- factNames.add(name);
2592
2569
  advance();
2593
2570
  return name;
2594
2571
  };
@@ -2606,16 +2583,9 @@ const parse = (
2606
2583
  const start = cursor;
2607
2584
  const keyword = advance();
2608
2585
  const name = parseFactName();
2609
- const parsed = withProofScope(() => {
2610
- const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2611
- if (isTlapm) return { statement, proof: parseTlapmProof() };
2612
- return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
2613
- });
2614
- const statement = parsed.statement;
2615
- const theorem = withRange(
2616
- { name, statement, proof: parsed.proof, location: getLocation(keyword) },
2617
- start,
2618
- );
2586
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2587
+ const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
2588
+ const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
2619
2589
  module.theorems.push(theorem);
2620
2590
  module.units.push({ kind: "Theorem", theorem });
2621
2591
  if (name === undefined || statement.kind === "AssumeProve") return;
@@ -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
  ],