tla-ts 0.0.10-dev.09e53c2a6 → 0.0.10-dev.1ebc153bd

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 (214) 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 +2 -1
  7. package/dist/index.d.ts +2 -1
  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 +43 -43
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +33 -35
  16. package/dist/run.js +44 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +43 -43
  20. package/dist/transfer.js +38 -38
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +1 -0
  25. package/src/bags.ts +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +152 -64
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlc-arguments.ts +2 -2
  30. package/src/cli/tlc-output.ts +1 -2
  31. package/src/cli/tlc.ts +13 -8
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +9 -5
  34. package/src/dependencies.ts +49 -9
  35. package/src/dfid.ts +9 -2
  36. package/src/environment.ts +57 -33
  37. package/src/errors.ts +7 -0
  38. package/src/evaluate.ts +92 -32
  39. package/src/exit-codes.ts +4 -2
  40. package/src/instances.ts +5 -5
  41. package/src/java-overrides.ts +2 -2
  42. package/src/levels.ts +138 -90
  43. package/src/liveness-checker.ts +43 -4
  44. package/src/liveness.ts +1 -1
  45. package/src/obligations/index.ts +1 -1
  46. package/src/obligations/normalize.ts +1 -4
  47. package/src/obligations/printer.ts +5 -5
  48. package/src/parallel-worker.ts +8 -2
  49. package/src/parallel.ts +5 -0
  50. package/src/parser.ts +106 -144
  51. package/src/prover/isabelle/isar/attrib.ts +4 -4
  52. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  53. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  54. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  55. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  56. package/src/prover/isabelle/pure/term.ts +3 -3
  57. package/src/prover/prep/md5.ts +26 -29
  58. package/src/prover/smt/rewrite.ts +2 -7
  59. package/src/prover/smt/simplify.ts +1 -1
  60. package/src/prover/smt/solver/asserted-formulas.ts +66 -1
  61. package/src/prover/smt/solver/ast-lt.ts +1 -1
  62. package/src/prover/smt/solver/ast.ts +58 -11
  63. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  64. package/src/prover/smt/solver/bound-simplifier.ts +2 -3
  65. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  66. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  67. package/src/prover/smt/solver/card2bv.ts +3 -5
  68. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -3
  69. package/src/prover/smt/solver/context.ts +24 -3
  70. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  71. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  72. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  73. package/src/prover/smt/solver/diff-neq.ts +1 -2
  74. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  75. package/src/prover/smt/solver/elim-uncnstr.ts +4 -7
  76. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  77. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  78. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  79. package/src/prover/smt/solver/euf/egraph.ts +4 -10
  80. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  81. package/src/prover/smt/solver/euf/mam.ts +1 -5
  82. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  83. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  84. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  85. package/src/prover/smt/solver/factor.ts +36 -14
  86. package/src/prover/smt/solver/fd-solver.ts +2 -0
  87. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  88. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  89. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  90. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  91. package/src/prover/smt/solver/goal.ts +6 -3
  92. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  93. package/src/prover/smt/solver/hashtable.ts +4 -0
  94. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  95. package/src/prover/smt/solver/lp/containers.ts +7 -1
  96. package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
  97. package/src/prover/smt/solver/lp/lp-settings.ts +1 -1
  98. package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
  99. package/src/prover/smt/solver/lp/nex.ts +2 -1
  100. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  102. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  103. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  104. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  105. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  106. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  107. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  108. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  109. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  110. package/src/prover/smt/solver/model-generator.ts +3 -1
  111. package/src/prover/smt/solver/mpf.ts +2 -4
  112. package/src/prover/smt/solver/mus.ts +2 -3
  113. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  114. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  115. package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
  116. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  117. package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
  118. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  119. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  120. package/src/prover/smt/solver/nlqsat.ts +1 -1
  121. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  122. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  123. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  124. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  125. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  126. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  127. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  128. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  129. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  130. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  131. package/src/prover/smt/solver/nnf.ts +6 -2
  132. package/src/prover/smt/solver/opt-context.ts +9 -3
  133. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  134. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  135. package/src/prover/smt/solver/opt-solver.ts +6 -3
  136. package/src/prover/smt/solver/optsmt.ts +1 -1
  137. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  138. package/src/prover/smt/solver/poly-rewriter.ts +74 -18
  139. package/src/prover/smt/solver/probes.ts +88 -23
  140. package/src/prover/smt/solver/proto-model.ts +4 -6
  141. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  142. package/src/prover/smt/solver/qe-lite.ts +2 -2
  143. package/src/prover/smt/solver/qe.ts +3 -2
  144. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  145. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  146. package/src/prover/smt/solver/rlimit.ts +4 -0
  147. package/src/prover/smt/solver/sat/config.ts +1 -1
  148. package/src/prover/smt/solver/sat/inc-sat-solver.ts +26 -1
  149. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  150. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  151. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -3
  152. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  153. package/src/prover/smt/solver/sat/solver.ts +25 -47
  154. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  155. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  156. package/src/prover/smt/solver/seq-derive.ts +4 -7
  157. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  158. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  159. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  160. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  161. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  162. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  163. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  164. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  165. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  166. package/src/prover/smt/solver/smt-kernel.ts +9 -3
  167. package/src/prover/smt/solver/smt-setup.ts +68 -6
  168. package/src/prover/smt/solver/smtlib-parser.ts +558 -220
  169. package/src/prover/smt/solver/smtlib-script.ts +495 -153
  170. package/src/prover/smt/solver/solve-eqs.ts +13 -21
  171. package/src/prover/smt/solver/tactic.ts +219 -130
  172. package/src/prover/smt/solver/theory-bv.ts +2 -2
  173. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
  174. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -0
  175. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -4
  176. package/src/prover/smt/solver/theory-lra.ts +0 -1
  177. package/src/prover/smt/solver/theory-pb.ts +24 -7
  178. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  179. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  180. package/src/prover/tlapm/cache.ts +8 -8
  181. package/src/prover/zenon/equality-rules.ts +24 -0
  182. package/src/prover/zenon/expr.ts +21 -0
  183. package/src/prover/zenon/index-table.ts +7 -2
  184. package/src/prover/zenon/isar-case.ts +1 -1
  185. package/src/prover/zenon/isar.ts +2 -2
  186. package/src/prover/zenon/phrase.ts +1 -1
  187. package/src/prover/zenon/rules.ts +2 -1
  188. package/src/resolve.ts +624 -187
  189. package/src/runtime.ts +3 -1
  190. package/src/sany/builtins.ts +10 -10
  191. package/src/sany/generation.ts +2 -13
  192. package/src/sany/generator-definitions.ts +3 -1
  193. package/src/sany/generator-expressions.ts +36 -30
  194. package/src/sany/generator-proofs.ts +5 -3
  195. package/src/sany/generator.ts +2 -1
  196. package/src/sany/lexer.ts +3 -3
  197. package/src/sany/modules.ts +4 -2
  198. package/src/sany/nodes.ts +1 -1
  199. package/src/sany/selectors.ts +11 -6
  200. package/src/sany/xml.ts +2 -3
  201. package/src/search.ts +51 -22
  202. package/src/spec-description.ts +2 -2
  203. package/src/subexpressions.ts +265 -94
  204. package/src/successors.ts +1 -0
  205. package/src/symmetry.ts +1 -1
  206. package/src/tlc/jar-data.ts +10 -0
  207. package/src/tlc/messages.ts +3 -3
  208. package/src/tlc/order.ts +14 -3
  209. package/src/tlc/tlc-operators.ts +3 -1
  210. package/src/tlc/tlcext-operators.ts +18 -5
  211. package/src/tlc/trace-spec.ts +5 -5
  212. package/src/typed-tier.ts +29 -23
  213. package/src/typescript/types.ts +2 -2
  214. package/src/values.ts +46 -27
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
 
@@ -501,8 +500,6 @@ const parse = (
501
500
  let lastOperator: Precedence | undefined;
502
501
  let precedingOperator: Precedence | undefined;
503
502
  const recursiveScopes: Set<string>[] = [];
504
- const factNames = new Set<string>();
505
- const proofScopes: Set<string>[] = [];
506
503
  const openModules: Module[] = [];
507
504
  // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
508
505
  let attemptFrame: number | undefined;
@@ -653,6 +650,7 @@ const parse = (
653
650
  return result;
654
651
  };
655
652
 
653
+ // 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
654
  const isFieldName = (token: Token) =>
657
655
  (token.kind === "Identifier" ||
658
656
  token.kind === "Keyword" ||
@@ -1201,6 +1199,55 @@ const parse = (
1201
1199
  return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
1202
1200
  };
1203
1201
 
1202
+ const parseSelections = (
1203
+ name: string,
1204
+ args: Expression[],
1205
+ argumentsRange: SourceRange | undefined,
1206
+ start: number,
1207
+ location: SourceLocation,
1208
+ ): Expression => {
1209
+ const selectors: Selector[] = [{ kind: "Name", name, args }];
1210
+ const selectorRanges = [getRange(start, start)];
1211
+ const argumentRanges = [argumentsRange];
1212
+ while (isSelectorAhead()) {
1213
+ advance();
1214
+ const selectorStart = cursor;
1215
+ lastArgumentsRange = undefined;
1216
+ const selector = parseSelector();
1217
+ selectorRanges.push(
1218
+ selector.kind === "Bound"
1219
+ ? getRange(selectorStart)
1220
+ : getRange(selectorStart, selectorStart),
1221
+ );
1222
+ selectors.push(selector);
1223
+ argumentRanges.push(lastArgumentsRange);
1224
+ }
1225
+ const names = selectors.flatMap((selector) =>
1226
+ selector.kind === "Name" ? [selector.name] : [],
1227
+ );
1228
+ const operator = names.join("!");
1229
+ const qualifiedArgs = selectors.flatMap((selector) =>
1230
+ "args" in selector ? selector.args : [],
1231
+ );
1232
+ const argumentCounts = selectors.map((selector) =>
1233
+ "args" in selector ? selector.args.length : 0,
1234
+ );
1235
+ return names.length < selectors.length
1236
+ ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1237
+ : qualifiedArgs.length === 0
1238
+ ? { kind: "Identifier", name: operator, selectorRanges, location }
1239
+ : {
1240
+ kind: "Apply",
1241
+ operator,
1242
+ args: qualifiedArgs,
1243
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1244
+ argumentsRange: argumentRanges.at(-1) ?? getRange(start),
1245
+ selectorRanges,
1246
+ argumentRanges,
1247
+ location,
1248
+ };
1249
+ };
1250
+
1204
1251
  const parsePrimary = (preceding?: Precedence): Expression => {
1205
1252
  const start = cursor;
1206
1253
  const token = advance();
@@ -1252,56 +1299,45 @@ const parse = (
1252
1299
  if (name === "@" && !hasArguments && !isSelectorAhead())
1253
1300
  return { kind: "ExceptAt", location };
1254
1301
  const args = hasArguments ? parseArguments() : [];
1255
- const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
1256
1302
  if (!isSelectorAhead()) {
1257
1303
  return hasArguments
1258
1304
  ? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
1259
1305
  : { kind: "Identifier", name, location };
1260
1306
  }
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,
1307
+ return parseSelections(
1308
+ name,
1309
+ args,
1310
+ hasArguments ? lastArgumentsRange : undefined,
1311
+ start,
1312
+ location,
1279
1313
  );
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
1314
  }
1296
- if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
1315
+ const isOperatorNamed =
1316
+ token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
1317
+ if (isOperatorNamed && isAt("(")) {
1297
1318
  const args = parseArguments();
1319
+ if (!isTlapm && isSelectorAhead()) {
1320
+ return parseSelections(token.text, args, lastArgumentsRange, start, location);
1321
+ }
1298
1322
  // 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 };
1323
+ if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
1324
+ return { kind: "Product", factors: args, location };
1325
+ }
1326
+ return token.text === "'" && args.length === 1
1327
+ ? { kind: "Prime", expression: args[0], location }
1328
+ : {
1329
+ kind: "Apply",
1330
+ operator: token.text,
1331
+ spelling: token.spelling,
1332
+ args,
1333
+ argumentsRange: lastArgumentsRange,
1334
+ location,
1335
+ };
1302
1336
  }
1303
- if (token.kind === "Operator" && isOperatorName(token.text) && !isTlapm) {
1304
- return { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1337
+ if (isOperatorNamed && !isTlapm) {
1338
+ return isSelectorAhead()
1339
+ ? parseSelections(token.text, [], undefined, start, location)
1340
+ : { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1305
1341
  }
1306
1342
  switch (token.text) {
1307
1343
  case "(": {
@@ -1334,11 +1370,12 @@ const parse = (
1334
1370
  case "LET": {
1335
1371
  const definitions: Definition[] = [];
1336
1372
  const instances: Instance[] = [];
1373
+ const recursive: Declaration[] = [];
1337
1374
  recursiveScopes.push(new Set());
1338
1375
  while (!accept("IN")) {
1339
1376
  if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1340
1377
  if (accept("RECURSIVE")) {
1341
- declareRecursive();
1378
+ recursive.push(...declareRecursive());
1342
1379
  continue;
1343
1380
  }
1344
1381
  const unit = parseDefinition(!isTlapm && accept("LOCAL"));
@@ -1346,10 +1383,14 @@ const parse = (
1346
1383
  else definitions.push(unit);
1347
1384
  }
1348
1385
  recursiveScopes.pop();
1349
- const body = parseExpression();
1350
- return instances.length === 0
1351
- ? { kind: "Let", definitions, body, location }
1352
- : { kind: "Let", definitions, instances, body, location };
1386
+ return {
1387
+ kind: "Let",
1388
+ definitions,
1389
+ ...(instances.length > 0 && { instances }),
1390
+ ...(recursive.length > 0 && { recursive }),
1391
+ body: parseExpression(),
1392
+ location,
1393
+ };
1353
1394
  }
1354
1395
  case "CHOOSE": {
1355
1396
  const pattern = parsePattern();
@@ -2028,23 +2069,6 @@ const parse = (
2028
2069
  return isFirst ? level > outer : proofLevels[top] === level;
2029
2070
  };
2030
2071
 
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
2072
  const isFactAhead = () => {
2049
2073
  const token = peek();
2050
2074
  if (token.kind === "Step") return isStepReference(token);
@@ -2081,23 +2105,6 @@ const parse = (
2081
2105
  );
2082
2106
  };
2083
2107
 
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
2108
  const parseDefinable = (): Fact => {
2102
2109
  const start = cursor;
2103
2110
  const token = peek();
@@ -2119,18 +2126,7 @@ const parse = (
2119
2126
  );
2120
2127
  };
2121
2128
 
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
- };
2129
+ const parseDefs = () => parseSeparated(isTlapm ? parseDefinable : parseFact);
2134
2130
 
2135
2131
  // tlapm's usebody reads facts while an expression starts after the comma.
2136
2132
  const parseTlapmFacts = (): Fact[] => {
@@ -2162,25 +2158,16 @@ const parse = (
2162
2158
  const keyword = advance();
2163
2159
  const isOnly = keyword.text === "USE" && accept("ONLY");
2164
2160
  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);
2161
+ return withRange(
2162
+ {
2163
+ kind: keyword.text === "USE" ? "Use" : "Hide",
2164
+ isOnly,
2165
+ ...parseFacts(),
2166
+ keyword: keywordRange,
2167
+ location: getLocation(keyword),
2168
+ },
2169
+ start,
2170
+ );
2184
2171
  };
2185
2172
 
2186
2173
  const parseNewSymbol = (): NewSymbol => {
@@ -2196,7 +2183,6 @@ const parse = (
2196
2183
  if (level !== undefined) advance();
2197
2184
  if (level === "Variable") {
2198
2185
  const named = expectName();
2199
- declareProofSymbol(named.name);
2200
2186
  return withRange(
2201
2187
  {
2202
2188
  kind: "NewSymbol",
@@ -2211,7 +2197,6 @@ const parse = (
2211
2197
  );
2212
2198
  }
2213
2199
  const declaration = parseDeclaration();
2214
- declareProofSymbol(declaration.name);
2215
2200
  const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
2216
2201
  if (isBounded && declaration.arity > 0) {
2217
2202
  throw createError("declared symbol with arguments before \\in");
@@ -2236,7 +2221,7 @@ const parse = (
2236
2221
  advance();
2237
2222
  advance();
2238
2223
  }
2239
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2224
+ if (isAt("ASSUME")) return parseAssumeProve();
2240
2225
  if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2241
2226
  return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2242
2227
  if (!isTlapm) return parseExpression();
@@ -2285,15 +2270,6 @@ const parse = (
2285
2270
  return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
2286
2271
  };
2287
2272
 
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
2273
  const parseStepBody = (): StepBody => {
2298
2274
  const token = peek();
2299
2275
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
@@ -2314,7 +2290,6 @@ const parse = (
2314
2290
  const isBounded = isBoundAhead();
2315
2291
  const names = getNames(isBounded ? [] : parseSeparated(expectName));
2316
2292
  const bounds = isBounded ? parseBounds() : [];
2317
- declareProofSymbols(names.names, bounds);
2318
2293
  return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
2319
2294
  }
2320
2295
  if (accept("WITNESS")) {
@@ -2324,7 +2299,6 @@ const parse = (
2324
2299
  const isNames = isNameListAhead(":");
2325
2300
  const names = getNames(isNames ? parseSeparated(expectName) : []);
2326
2301
  const bounds = isNames ? [] : parseBounds();
2327
- declareProofSymbols(names.names, bounds);
2328
2302
  expect(":");
2329
2303
  return {
2330
2304
  kind: "Pick",
@@ -2361,8 +2335,6 @@ const parse = (
2361
2335
  const start = cursor;
2362
2336
  const step = parseStepStart(isAt("QED", 1));
2363
2337
  const statementStart = cursor;
2364
- const scope = new Set<string>();
2365
- proofScopes.push(scope);
2366
2338
  const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
2367
2339
  const head = getRange(start);
2368
2340
  const statement = getRange(statementStart);
@@ -2371,8 +2343,6 @@ const parse = (
2371
2343
  throw createError("Proof of a step that does not take a proof");
2372
2344
  }
2373
2345
  const proof = hasProof ? parseProof() : undefined;
2374
- proofScopes.pop();
2375
- if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
2376
2346
  return withRange({ ...step, body, head, statement, proof }, start);
2377
2347
  };
2378
2348
 
@@ -2404,7 +2374,7 @@ const parse = (
2404
2374
  const parseProof = (): Proof => {
2405
2375
  const start = cursor;
2406
2376
  proofLevels.push(-1);
2407
- const proof = withProofScope(parseProofBody);
2377
+ const proof = parseProofBody();
2408
2378
  proofLevels.pop();
2409
2379
  return withRange(proof, start);
2410
2380
  };
@@ -2588,7 +2558,6 @@ const parse = (
2588
2558
  const parseFactName = () => {
2589
2559
  if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
2590
2560
  const name = expectIdentifier();
2591
- factNames.add(name);
2592
2561
  advance();
2593
2562
  return name;
2594
2563
  };
@@ -2606,16 +2575,9 @@ const parse = (
2606
2575
  const start = cursor;
2607
2576
  const keyword = advance();
2608
2577
  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
- );
2578
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2579
+ const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
2580
+ const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
2619
2581
  module.theorems.push(theorem);
2620
2582
  module.units.push({ kind: "Theorem", theorem });
2621
2583
  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
  ],