tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa

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 (226) 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 +3 -2
  7. package/dist/index.d.ts +3 -2
  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 +60 -60
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +42 -44
  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 +39 -39
  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 +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +1 -1
  28. package/src/check-trace.ts +90 -51
  29. package/src/check.ts +367 -178
  30. package/src/cli/runtime-invariants.ts +20 -56
  31. package/src/cli/tlc-arguments.ts +2 -2
  32. package/src/cli/tlc-output.ts +1 -2
  33. package/src/cli/tlc.ts +16 -10
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +26 -9
  36. package/src/dependencies.ts +49 -9
  37. package/src/dfid.ts +22 -10
  38. package/src/environment.ts +58 -33
  39. package/src/errors.ts +7 -0
  40. package/src/evaluate.ts +117 -41
  41. package/src/exit-codes.ts +4 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-hash.ts +14 -0
  44. package/src/java-overrides.ts +2 -2
  45. package/src/levels.ts +138 -90
  46. package/src/liveness-checker.ts +81 -33
  47. package/src/liveness.ts +49 -11
  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/parallel-worker.ts +8 -2
  52. package/src/parallel.ts +5 -0
  53. package/src/parser.ts +112 -145
  54. package/src/prover/isabelle/isar/attrib.ts +4 -4
  55. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  56. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  57. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  58. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  59. package/src/prover/isabelle/pure/term.ts +3 -3
  60. package/src/prover/prep/md5.ts +26 -29
  61. package/src/prover/smt/rewrite.ts +2 -7
  62. package/src/prover/smt/simplify.ts +1 -1
  63. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  64. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  65. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  66. package/src/prover/smt/solver/ast-lt.ts +1 -1
  67. package/src/prover/smt/solver/ast.ts +63 -14
  68. package/src/prover/smt/solver/auf-solver.ts +23 -12
  69. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  70. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  71. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  72. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  73. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  74. package/src/prover/smt/solver/card2bv.ts +32 -18
  75. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  76. package/src/prover/smt/solver/context.ts +47 -9
  77. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  78. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  79. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  80. package/src/prover/smt/solver/diff-neq.ts +1 -2
  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 +4 -11
  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/expr2polynomial.ts +204 -79
  93. package/src/prover/smt/solver/factor.ts +36 -14
  94. package/src/prover/smt/solver/fd-solver.ts +2 -0
  95. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  96. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  97. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  98. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  99. package/src/prover/smt/solver/goal.ts +6 -3
  100. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  101. package/src/prover/smt/solver/hashtable.ts +4 -0
  102. package/src/prover/smt/solver/internalizer.ts +1 -1
  103. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  104. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  105. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  106. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  107. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  108. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  109. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  110. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  111. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  112. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  113. package/src/prover/smt/solver/model-generator.ts +85 -43
  114. package/src/prover/smt/solver/mpf.ts +2 -4
  115. package/src/prover/smt/solver/mus.ts +2 -3
  116. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  117. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  118. package/src/prover/smt/solver/muz/dl-rule.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 +1 -1
  121. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  122. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  123. package/src/prover/smt/solver/nlqsat.ts +1 -1
  124. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  125. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  126. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  127. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  128. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  129. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  130. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  131. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  132. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  133. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  134. package/src/prover/smt/solver/nnf.ts +6 -2
  135. package/src/prover/smt/solver/opt-context.ts +20 -7
  136. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  137. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  138. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  139. package/src/prover/smt/solver/opt-solver.ts +9 -5
  140. package/src/prover/smt/solver/optsmt.ts +1 -1
  141. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  143. package/src/prover/smt/solver/probes.ts +88 -23
  144. package/src/prover/smt/solver/proto-model.ts +8 -8
  145. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  146. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  147. package/src/prover/smt/solver/qe-lite.ts +2 -2
  148. package/src/prover/smt/solver/qe.ts +3 -2
  149. package/src/prover/smt/solver/qsat.ts +16 -6
  150. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  151. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  152. package/src/prover/smt/solver/rewriter.ts +31 -25
  153. package/src/prover/smt/solver/rlimit.ts +4 -0
  154. package/src/prover/smt/solver/sat/config.ts +1 -1
  155. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  156. package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
  157. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  158. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  159. package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
  160. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  161. package/src/prover/smt/solver/sat/solver.ts +25 -47
  162. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  163. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  164. package/src/prover/smt/solver/seq-derive.ts +2 -2
  165. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  166. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  167. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  168. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  169. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  170. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  171. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  172. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  173. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  174. package/src/prover/smt/solver/smt-kernel.ts +39 -5
  175. package/src/prover/smt/solver/smt-setup.ts +96 -10
  176. package/src/prover/smt/solver/smtlib-parser.ts +584 -223
  177. package/src/prover/smt/solver/smtlib-script.ts +509 -154
  178. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  179. package/src/prover/smt/solver/solver.ts +18 -3
  180. package/src/prover/smt/solver/tactic.ts +284 -168
  181. package/src/prover/smt/solver/theory-bv.ts +13 -3
  182. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  183. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  184. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  185. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  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/tseitin-cnf.ts +1 -0
  191. package/src/prover/tlapm/cache.ts +8 -8
  192. package/src/prover/zenon/index-table.ts +5 -2
  193. package/src/prover/zenon/isar-case.ts +1 -1
  194. package/src/prover/zenon/isar.ts +2 -2
  195. package/src/prover/zenon/phrase.ts +1 -1
  196. package/src/resolve.ts +959 -243
  197. package/src/runtime.ts +7 -1
  198. package/src/sany/builtins.ts +10 -10
  199. package/src/sany/generation.ts +2 -13
  200. package/src/sany/generator-definitions.ts +3 -1
  201. package/src/sany/generator-expressions.ts +36 -30
  202. package/src/sany/generator-proofs.ts +5 -3
  203. package/src/sany/generator.ts +2 -1
  204. package/src/sany/lexer.ts +3 -3
  205. package/src/sany/modules.ts +4 -2
  206. package/src/sany/nodes.ts +1 -1
  207. package/src/sany/selectors.ts +11 -6
  208. package/src/sany/xml.ts +2 -3
  209. package/src/search.ts +166 -101
  210. package/src/simulate.ts +110 -50
  211. package/src/spec-description.ts +5 -6
  212. package/src/standard-modules.ts +15 -6
  213. package/src/subexpressions.ts +398 -108
  214. package/src/successors.ts +4 -2
  215. package/src/symmetry.ts +1 -1
  216. package/src/tlc/jar-data.ts +10 -0
  217. package/src/tlc/messages.ts +3 -3
  218. package/src/tlc/order.ts +14 -3
  219. package/src/tlc/random.ts +2 -1
  220. package/src/tlc/replay.ts +3 -2
  221. package/src/tlc/tlc-operators.ts +10 -8
  222. package/src/tlc/tlcext-operators.ts +44 -15
  223. package/src/tlc/trace-spec.ts +9 -22
  224. package/src/typed-tier.ts +32 -25
  225. package/src/typescript/types.ts +2 -2
  226. package/src/values.ts +135 -78
package/src/liveness.ts CHANGED
@@ -16,6 +16,7 @@ import {
16
16
  forEachBoundElement,
17
17
  getBoundElements,
18
18
  getDefinition,
19
+ getReevaluatedDefinitions,
19
20
  getStartupValue,
20
21
  lookupScope,
21
22
  resolveApplyOperator,
@@ -323,12 +324,17 @@ export const expandTemporal = (
323
324
  return [{ expression, scope, name: expansion.name, path: expansion.path }];
324
325
  };
325
326
 
326
- const bindLetDefinitions = (
327
+ // TLC takes a formula apart through a LET without binding its definitions, so it evaluates an impure one again at each reference.
328
+ export const bindLetDefinitions = (
327
329
  expression: Expression & { kind: "Let" },
328
330
  scope: Scope | undefined,
329
331
  environment: Environment,
330
332
  ) => {
331
- const bound = bindDefinitions(expression.definitions, getConstantContext(environment, scope));
333
+ const bound = bindDefinitions(
334
+ expression.definitions,
335
+ getConstantContext(environment, scope),
336
+ getReevaluatedDefinitions(expression.definitions, environment),
337
+ );
332
338
  for (let current = bound; current && current !== scope; current = current.parent) {
333
339
  if (current.binding.kind === "Thunk") definitionThunks.add(current.binding);
334
340
  }
@@ -488,6 +494,45 @@ export const toLiveExpression = (
488
494
  return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
489
495
  };
490
496
 
497
+ // SANY parses `a /\ b /\ c` as `(a /\ b) /\ c`, so TLC takes a prefix below the temporal level as one formula.
498
+ const convertJunction = (
499
+ expression: Expression & { kind: "And" | "Or" },
500
+ scope: Scope | undefined,
501
+ ) => {
502
+ const operands = expression.operands;
503
+ const range = expression.location.range;
504
+ const prefixEnds = expression.prefixEnds;
505
+ if (expression.isBulleted || !range || !prefixEnds) {
506
+ return toWhole(
507
+ expression,
508
+ scope,
509
+ createJunction(
510
+ expression.kind,
511
+ operands.map((operand) => convert(operand, scope)),
512
+ ),
513
+ );
514
+ }
515
+ return operands.slice(1).reduce(
516
+ (prefix, operand, index) => {
517
+ const node =
518
+ index === operands.length - 2
519
+ ? expression
520
+ : {
521
+ ...expression,
522
+ operands: operands.slice(0, index + 2),
523
+ prefixEnds: prefixEnds.slice(0, index + 1),
524
+ location: { ...expression.location, range: { ...range, end: prefixEnds[index] } },
525
+ };
526
+ return toWhole(
527
+ node,
528
+ scope,
529
+ createJunction(expression.kind, [prefix, convert(operand, scope)]),
530
+ );
531
+ },
532
+ convert(operands[0], scope),
533
+ );
534
+ };
535
+
491
536
  // These forms are translated part by part at every level; any other form below the temporal level is an atom.
492
537
  const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
493
538
  const level = getLevel(expression, scope, environment);
@@ -512,14 +557,7 @@ export const toLiveExpression = (
512
557
  }
513
558
  case "And":
514
559
  case "Or":
515
- return toWhole(
516
- expression,
517
- scope,
518
- createJunction(
519
- expression.kind,
520
- expression.operands.map((operand) => convert(operand, scope)),
521
- ),
522
- );
560
+ return convertJunction(expression, scope);
523
561
  case "Forall":
524
562
  case "Exists":
525
563
  return convertQuantifier(expression, scope);
@@ -636,7 +674,7 @@ export const getInterpretedAtoms = (environment: Environment): LiveAtoms<Value[]
636
674
  },
637
675
  });
638
676
 
639
- export const evaluateLive = <State>(
677
+ const evaluateLive = <State>(
640
678
  expression: LiveExpression,
641
679
  state: State,
642
680
  next: State | undefined,
@@ -179,7 +179,7 @@ const loadMule = (
179
179
 
180
180
  const schedule = (modules: Map<string, Mule>) => {
181
181
  const dependencies = new Map(
182
- [...modules].map(([name, module]) => [name, getDependencies(module).dependencies]),
182
+ [...modules].map((entry) => [entry[0], getDependencies(entry[1]).dependencies]),
183
183
  );
184
184
  const seen = new Set<string>();
185
185
  const order: Mule[] = [];
@@ -351,10 +351,7 @@ const instantiate = (
351
351
  substitutes.set(name, at({ kind: "Opaque", name }, { location }));
352
352
  }
353
353
  const anonymized = new Map(
354
- [...substitutes].map(([name, expression]) => [
355
- name,
356
- pipeline.anonymizer.expr(instanceScope, expression),
357
- ]),
354
+ [...substitutes].map((entry) => [entry[0], pipeline.anonymizer.expr(instanceScope, entry[1])]),
358
355
  );
359
356
  const body = substituteUnits(
360
357
  shift((instanceScope?.size ?? 0) - (module.depth ?? 0)),
@@ -430,26 +430,26 @@ const createPrinter = (hyps: Hyp[] = [], options: PrinterOptions = {}) => {
430
430
  );
431
431
  case "Choose": {
432
432
  const domainDoc = expression.domain && printExpr(expression.domain);
433
- return withNames(context, [expression.name], ([name]) =>
433
+ return withNames(context, [expression.name], (names) =>
434
434
  createBig(
435
435
  domainDoc
436
436
  ? format(
437
437
  "@[<b2>CHOOSE @[<b2>%s \\in@ %a@] :@ %a@]",
438
- name,
438
+ names[0],
439
439
  domainDoc,
440
440
  printExpr(expression.body),
441
441
  )
442
- : format("@[<b2>CHOOSE %s :@ %a@]", name, printExpr(expression.body)),
442
+ : format("@[<b2>CHOOSE %s :@ %a@]", names[0], printExpr(expression.body)),
443
443
  ),
444
444
  );
445
445
  }
446
446
  case "SetSt": {
447
447
  const domainDoc = printExpr(expression.domain);
448
- return withNames(context, [expression.name], ([name]) =>
448
+ return withNames(context, [expression.name], (names) =>
449
449
  createAtom(
450
450
  format(
451
451
  "@[<b3>{@[<b2>%s \\in@ %a@] :@ %a}@]",
452
- name,
452
+ names[0],
453
453
  domainDoc,
454
454
  printExpr(expression.body),
455
455
  ),
@@ -41,8 +41,14 @@ const runWorker = (start: StartMessage, parent: Port) => {
41
41
  );
42
42
  const specification = created.specification;
43
43
  const environment = specification.environment;
44
- const search = createSearch(start.config, environment, specification.variableLocations, () =>
45
- created.order.getDeclarationOrder("variable"),
44
+ const search = createSearch(
45
+ start.config,
46
+ environment,
47
+ specification.variableLocations,
48
+ () => created.order.getDeclarationOrder("variable"),
49
+ undefined,
50
+ [],
51
+ specification.runtimeInvariants,
46
52
  );
47
53
  const nextAction = search?.spec.next;
48
54
  if (!search || nextAction === undefined)
package/src/parallel.ts CHANGED
@@ -8,6 +8,7 @@ import {
8
8
  } from "./check";
9
9
  import { parseConfig, type ModelConfig } from "./config";
10
10
  import { TlaEvaluationError } from "./errors";
11
+ import type { RuntimeInvariant } from "./environment";
11
12
  import { isImpure } from "./evaluate";
12
13
  import {
13
14
  createSharedFingerprints,
@@ -43,6 +44,7 @@ export interface StartMessage extends Pick<
43
44
  > {
44
45
  type: "start";
45
46
  config: ModelConfig;
47
+ runtimeInvariants: RuntimeInvariant[];
46
48
  modules: [string, string | undefined][];
47
49
  classes: [string, Uint8Array | undefined][];
48
50
  index: number;
@@ -146,6 +148,8 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
146
148
  specification.variableLocations,
147
149
  () => created.order.getDeclarationOrder("variable"),
148
150
  report,
151
+ [],
152
+ specification.runtimeInvariants,
149
153
  );
150
154
  if (findAssumptionViolation(specification.assumptions, environment)) return fallBack();
151
155
  if (
@@ -273,6 +277,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
273
277
  type: "start",
274
278
  source: options.source,
275
279
  config,
280
+ runtimeInvariants: specification.runtimeInvariants,
276
281
  modules: [...modules],
277
282
  classes: [...classes],
278
283
  index,
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",
@@ -501,8 +501,6 @@ const parse = (
501
501
  let lastOperator: Precedence | undefined;
502
502
  let precedingOperator: Precedence | undefined;
503
503
  const recursiveScopes: Set<string>[] = [];
504
- const factNames = new Set<string>();
505
- const proofScopes: Set<string>[] = [];
506
504
  const openModules: Module[] = [];
507
505
  // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
508
506
  let attemptFrame: number | undefined;
@@ -653,6 +651,7 @@ const parse = (
653
651
  return result;
654
652
  };
655
653
 
654
+ // 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
655
  const isFieldName = (token: Token) =>
657
656
  (token.kind === "Identifier" ||
658
657
  token.kind === "Keyword" ||
@@ -1201,6 +1200,55 @@ const parse = (
1201
1200
  return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
1202
1201
  };
1203
1202
 
1203
+ const parseSelections = (
1204
+ name: string,
1205
+ args: Expression[],
1206
+ argumentsRange: SourceRange | undefined,
1207
+ start: number,
1208
+ location: SourceLocation,
1209
+ ): Expression => {
1210
+ const selectors: Selector[] = [{ kind: "Name", name, args }];
1211
+ const selectorRanges = [getRange(start, start)];
1212
+ const argumentRanges = [argumentsRange];
1213
+ while (isSelectorAhead()) {
1214
+ advance();
1215
+ const selectorStart = cursor;
1216
+ lastArgumentsRange = undefined;
1217
+ const selector = parseSelector();
1218
+ selectorRanges.push(
1219
+ selector.kind === "Bound"
1220
+ ? getRange(selectorStart)
1221
+ : getRange(selectorStart, selectorStart),
1222
+ );
1223
+ selectors.push(selector);
1224
+ argumentRanges.push(lastArgumentsRange);
1225
+ }
1226
+ const names = selectors.flatMap((selector) =>
1227
+ selector.kind === "Name" ? [selector.name] : [],
1228
+ );
1229
+ const operator = names.join("!");
1230
+ const qualifiedArgs = selectors.flatMap((selector) =>
1231
+ "args" in selector ? selector.args : [],
1232
+ );
1233
+ const argumentCounts = selectors.map((selector) =>
1234
+ "args" in selector ? selector.args.length : 0,
1235
+ );
1236
+ return names.length < selectors.length
1237
+ ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1238
+ : qualifiedArgs.length === 0
1239
+ ? { kind: "Identifier", name: operator, selectorRanges, location }
1240
+ : {
1241
+ kind: "Apply",
1242
+ operator,
1243
+ args: qualifiedArgs,
1244
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1245
+ argumentsRange: argumentRanges.at(-1) ?? getRange(start),
1246
+ selectorRanges,
1247
+ argumentRanges,
1248
+ location,
1249
+ };
1250
+ };
1251
+
1204
1252
  const parsePrimary = (preceding?: Precedence): Expression => {
1205
1253
  const start = cursor;
1206
1254
  const token = advance();
@@ -1252,56 +1300,45 @@ const parse = (
1252
1300
  if (name === "@" && !hasArguments && !isSelectorAhead())
1253
1301
  return { kind: "ExceptAt", location };
1254
1302
  const args = hasArguments ? parseArguments() : [];
1255
- const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
1256
1303
  if (!isSelectorAhead()) {
1257
1304
  return hasArguments
1258
1305
  ? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
1259
1306
  : { kind: "Identifier", name, location };
1260
1307
  }
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,
1308
+ return parseSelections(
1309
+ name,
1310
+ args,
1311
+ hasArguments ? lastArgumentsRange : undefined,
1312
+ start,
1313
+ location,
1279
1314
  );
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
1315
  }
1296
- if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
1316
+ const isOperatorNamed =
1317
+ token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
1318
+ if (isOperatorNamed && isAt("(")) {
1297
1319
  const args = parseArguments();
1320
+ if (!isTlapm && isSelectorAhead()) {
1321
+ return parseSelections(token.text, args, lastArgumentsRange, start, location);
1322
+ }
1298
1323
  // 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 };
1324
+ if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
1325
+ return { kind: "Product", factors: args, location };
1326
+ }
1327
+ return token.text === "'" && args.length === 1
1328
+ ? { kind: "Prime", expression: args[0], location }
1329
+ : {
1330
+ kind: "Apply",
1331
+ operator: token.text,
1332
+ spelling: token.spelling,
1333
+ args,
1334
+ argumentsRange: lastArgumentsRange,
1335
+ location,
1336
+ };
1302
1337
  }
1303
- if (token.kind === "Operator" && isOperatorName(token.text) && !isTlapm) {
1304
- return { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1338
+ if (isOperatorNamed && !isTlapm) {
1339
+ return isSelectorAhead()
1340
+ ? parseSelections(token.text, [], undefined, start, location)
1341
+ : { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1305
1342
  }
1306
1343
  switch (token.text) {
1307
1344
  case "(": {
@@ -1334,11 +1371,12 @@ const parse = (
1334
1371
  case "LET": {
1335
1372
  const definitions: Definition[] = [];
1336
1373
  const instances: Instance[] = [];
1374
+ const recursive: Declaration[] = [];
1337
1375
  recursiveScopes.push(new Set());
1338
1376
  while (!accept("IN")) {
1339
1377
  if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1340
1378
  if (accept("RECURSIVE")) {
1341
- declareRecursive();
1379
+ recursive.push(...declareRecursive());
1342
1380
  continue;
1343
1381
  }
1344
1382
  const unit = parseDefinition(!isTlapm && accept("LOCAL"));
@@ -1346,10 +1384,14 @@ const parse = (
1346
1384
  else definitions.push(unit);
1347
1385
  }
1348
1386
  recursiveScopes.pop();
1349
- const body = parseExpression();
1350
- return instances.length === 0
1351
- ? { kind: "Let", definitions, body, location }
1352
- : { kind: "Let", definitions, instances, body, location };
1387
+ return {
1388
+ kind: "Let",
1389
+ definitions,
1390
+ ...(instances.length > 0 && { instances }),
1391
+ ...(recursive.length > 0 && { recursive }),
1392
+ body: parseExpression(),
1393
+ location,
1394
+ };
1353
1395
  }
1354
1396
  case "CHOOSE": {
1355
1397
  const pattern = parsePattern();
@@ -1915,7 +1957,11 @@ const parse = (
1915
1957
 
1916
1958
  const parseDeclarationUnit = (): Declaration => {
1917
1959
  const location = getLocation(peek());
1918
- if (isAt("_") && peek(1).kind === "Operator") {
1960
+ const isOperatorDeclaration =
1961
+ isAt("_") &&
1962
+ peek(1).kind === "Operator" &&
1963
+ (INFIX_OPERATORS.has(peek(1).text) || DEFINABLE_POSTFIX_OPERATORS.has(peek(1).text));
1964
+ if (isOperatorDeclaration) {
1919
1965
  advance();
1920
1966
  const name = advance().text;
1921
1967
  return { name, arity: accept("_") ? 2 : 1, location };
@@ -2028,23 +2074,6 @@ const parse = (
2028
2074
  return isFirst ? level > outer : proofLevels[top] === level;
2029
2075
  };
2030
2076
 
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
2077
  const isFactAhead = () => {
2049
2078
  const token = peek();
2050
2079
  if (token.kind === "Step") return isStepReference(token);
@@ -2081,23 +2110,6 @@ const parse = (
2081
2110
  );
2082
2111
  };
2083
2112
 
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
2113
  const parseDefinable = (): Fact => {
2102
2114
  const start = cursor;
2103
2115
  const token = peek();
@@ -2119,18 +2131,7 @@ const parse = (
2119
2131
  );
2120
2132
  };
2121
2133
 
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
- };
2134
+ const parseDefs = () => parseSeparated(isTlapm ? parseDefinable : parseFact);
2134
2135
 
2135
2136
  // tlapm's usebody reads facts while an expression starts after the comma.
2136
2137
  const parseTlapmFacts = (): Fact[] => {
@@ -2162,25 +2163,16 @@ const parse = (
2162
2163
  const keyword = advance();
2163
2164
  const isOnly = keyword.text === "USE" && accept("ONLY");
2164
2165
  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);
2166
+ return withRange(
2167
+ {
2168
+ kind: keyword.text === "USE" ? "Use" : "Hide",
2169
+ isOnly,
2170
+ ...parseFacts(),
2171
+ keyword: keywordRange,
2172
+ location: getLocation(keyword),
2173
+ },
2174
+ start,
2175
+ );
2184
2176
  };
2185
2177
 
2186
2178
  const parseNewSymbol = (): NewSymbol => {
@@ -2196,7 +2188,6 @@ const parse = (
2196
2188
  if (level !== undefined) advance();
2197
2189
  if (level === "Variable") {
2198
2190
  const named = expectName();
2199
- declareProofSymbol(named.name);
2200
2191
  return withRange(
2201
2192
  {
2202
2193
  kind: "NewSymbol",
@@ -2211,7 +2202,6 @@ const parse = (
2211
2202
  );
2212
2203
  }
2213
2204
  const declaration = parseDeclaration();
2214
- declareProofSymbol(declaration.name);
2215
2205
  const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
2216
2206
  if (isBounded && declaration.arity > 0) {
2217
2207
  throw createError("declared symbol with arguments before \\in");
@@ -2236,7 +2226,7 @@ const parse = (
2236
2226
  advance();
2237
2227
  advance();
2238
2228
  }
2239
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2229
+ if (isAt("ASSUME")) return parseAssumeProve();
2240
2230
  if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2241
2231
  return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2242
2232
  if (!isTlapm) return parseExpression();
@@ -2285,15 +2275,6 @@ const parse = (
2285
2275
  return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
2286
2276
  };
2287
2277
 
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
2278
  const parseStepBody = (): StepBody => {
2298
2279
  const token = peek();
2299
2280
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
@@ -2314,7 +2295,6 @@ const parse = (
2314
2295
  const isBounded = isBoundAhead();
2315
2296
  const names = getNames(isBounded ? [] : parseSeparated(expectName));
2316
2297
  const bounds = isBounded ? parseBounds() : [];
2317
- declareProofSymbols(names.names, bounds);
2318
2298
  return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
2319
2299
  }
2320
2300
  if (accept("WITNESS")) {
@@ -2324,7 +2304,6 @@ const parse = (
2324
2304
  const isNames = isNameListAhead(":");
2325
2305
  const names = getNames(isNames ? parseSeparated(expectName) : []);
2326
2306
  const bounds = isNames ? [] : parseBounds();
2327
- declareProofSymbols(names.names, bounds);
2328
2307
  expect(":");
2329
2308
  return {
2330
2309
  kind: "Pick",
@@ -2361,8 +2340,6 @@ const parse = (
2361
2340
  const start = cursor;
2362
2341
  const step = parseStepStart(isAt("QED", 1));
2363
2342
  const statementStart = cursor;
2364
- const scope = new Set<string>();
2365
- proofScopes.push(scope);
2366
2343
  const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
2367
2344
  const head = getRange(start);
2368
2345
  const statement = getRange(statementStart);
@@ -2371,8 +2348,6 @@ const parse = (
2371
2348
  throw createError("Proof of a step that does not take a proof");
2372
2349
  }
2373
2350
  const proof = hasProof ? parseProof() : undefined;
2374
- proofScopes.pop();
2375
- if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
2376
2351
  return withRange({ ...step, body, head, statement, proof }, start);
2377
2352
  };
2378
2353
 
@@ -2404,7 +2379,7 @@ const parse = (
2404
2379
  const parseProof = (): Proof => {
2405
2380
  const start = cursor;
2406
2381
  proofLevels.push(-1);
2407
- const proof = withProofScope(parseProofBody);
2382
+ const proof = parseProofBody();
2408
2383
  proofLevels.pop();
2409
2384
  return withRange(proof, start);
2410
2385
  };
@@ -2588,7 +2563,6 @@ const parse = (
2588
2563
  const parseFactName = () => {
2589
2564
  if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
2590
2565
  const name = expectIdentifier();
2591
- factNames.add(name);
2592
2566
  advance();
2593
2567
  return name;
2594
2568
  };
@@ -2606,16 +2580,9 @@ const parse = (
2606
2580
  const start = cursor;
2607
2581
  const keyword = advance();
2608
2582
  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
- );
2583
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2584
+ const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
2585
+ const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
2619
2586
  module.theorems.push(theorem);
2620
2587
  module.units.push({ kind: "Theorem", theorem });
2621
2588
  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
  );