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/runtime.ts CHANGED
@@ -14,6 +14,7 @@ export interface CheckerRuntime {
14
14
  getCurrentState: () => Value[] | undefined;
15
15
  getFingerprint: (state: Value[]) => bigint;
16
16
  getRandom: () => JavaRandom;
17
+ reseedRandom: () => void;
17
18
  getSimulationValue:
18
19
  | ((key: string, state: (Value | undefined)[] | undefined) => Value | undefined)
19
20
  | undefined;
@@ -26,6 +27,7 @@ export interface CheckerRuntime {
26
27
  version: TlcVersion;
27
28
  seed: bigint;
28
29
  isSeen: (state: Value[]) => boolean;
30
+ markExplored: ((state: Value[]) => void) | undefined;
29
31
  getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
30
32
  toRecord: (state: Value[]) => Record<string, Value>;
31
33
  generatedStates: number;
@@ -55,6 +57,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
55
57
  counterExample: undefined,
56
58
  deferred: undefined,
57
59
  isSeen: () => false,
60
+ markExplored: undefined,
58
61
  getSuccessorAction: () => undefined,
59
62
  toRecord: () => ({}),
60
63
  setLivenessSource: () => {},
@@ -70,6 +73,9 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
70
73
  }
71
74
  return workerRandom;
72
75
  },
76
+ reseedRandom: () => {
77
+ seededState = undefined;
78
+ },
73
79
  evaluateAtStartup: (evaluate) => {
74
80
  const wasStartup = isStartup;
75
81
  isStartup = true;
@@ -108,7 +114,7 @@ export const NAMED_REGISTER_PREFIX = "s:";
108
114
  const POSSIBLE_REGISTER = "s:_possible";
109
115
 
110
116
  export const getPossibleCounts = (runtime: CheckerRuntime) =>
111
- createFunction([...runtime.possibleCounts].map(([name, count]): [Value, Value] => [name, count]));
117
+ createFunction([...runtime.possibleCounts].map((entry): [Value, Value] => [entry[0], entry[1]]));
112
118
 
113
119
  export const getNamedRegisters = (runtime: CheckerRuntime): Map<string, Value> =>
114
120
  runtime.possibleCounts.size === 0
@@ -98,28 +98,28 @@ export const createLevelFields = (id: number): LevelFields => ({
98
98
 
99
99
  // SANY's order: OpDefNode's constructor numbers each builtin, then its phony parameters.
100
100
  export const createBuiltins = (getId: () => number) =>
101
- BUILTIN_OPERATORS.map(([name, arity, level, maxLevels, weights]): OpDefNode => {
101
+ BUILTIN_OPERATORS.map((operator): OpDefNode => {
102
102
  const id = getId();
103
103
  const params =
104
- arity < 0
104
+ operator[1] < 0
105
105
  ? undefined
106
- : Array.from({ length: arity }, (_value, index): FormalParamNode => ({
106
+ : Array.from({ length: operator[1] }, (_value, index): FormalParamNode => ({
107
107
  ...createLevelFields(getId()),
108
108
  kind: "FormalParam",
109
109
  name: `Formal_${index}`,
110
110
  arity: 0,
111
111
  location: undefined,
112
112
  }));
113
- const isLevelSet = maxLevels !== undefined && weights !== undefined;
114
- const isLeibnizArg = weights?.map((weight) => weight > 0);
113
+ const isLevelSet = operator[3] !== undefined && operator[4] !== undefined;
114
+ const isLeibnizArg = operator[4]?.map((weight) => weight > 0);
115
115
  return {
116
116
  ...createLevelFields(id),
117
117
  levelChecked: isLevelSet ? 99 : 0,
118
- level,
118
+ level: operator[2],
119
119
  kind: "OpDef",
120
120
  defKind: "BuiltIn",
121
- name,
122
- arity,
121
+ name: operator[0],
122
+ arity: operator[1],
123
123
  params,
124
124
  body: undefined,
125
125
  isLocal: false,
@@ -132,11 +132,11 @@ export const createBuiltins = (getId: () => number) =>
132
132
  inRecursiveSection: false,
133
133
  recursiveSection: -1,
134
134
  letInLevel: 0,
135
- weights: arity < 0 ? (weights ?? []).slice(0, 1) : (weights ?? []),
135
+ weights: operator[1] < 0 ? (operator[4] ?? []).slice(0, 1) : (operator[4] ?? []),
136
136
  isLeibnizArg: isLevelSet ? isLeibnizArg : undefined,
137
137
  isLeibniz: isLeibnizArg?.every(Boolean) ?? true,
138
138
  opLevelCond: undefined,
139
- maxLevels: arity < 0 ? (maxLevels ?? []).slice(0, 1) : (maxLevels ?? []),
139
+ maxLevels: operator[1] < 0 ? (operator[3] ?? []).slice(0, 1) : (operator[3] ?? []),
140
140
  minMaxLevel: undefined,
141
141
  labels: new Map(),
142
142
  step: undefined,
@@ -34,19 +34,7 @@ import {
34
34
  getTokenIndex,
35
35
  type SourceFile,
36
36
  } from "./source";
37
- import { SANY_OPERATOR_SYNONYMS } from "../tlc/jar-data";
38
-
39
- const SYNONYMS = new Map(
40
- SANY_OPERATOR_SYNONYMS.flatMap(([canonical, ...synonyms]) =>
41
- synonyms.map((synonym) => [synonym, canonical]),
42
- ),
43
- );
44
-
45
- export const resolveSynonym = (name: string) =>
46
- name
47
- .split("!")
48
- .map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
49
- .join("!");
37
+ import { resolveSynonym } from "../tlc/jar-data";
50
38
 
51
39
  export interface AssumeProveScope {
52
40
  isDeclaredBefore: boolean[];
@@ -382,6 +370,7 @@ export const matchArguments = (
382
370
  getSymbolArity(operand.op) === param.arity &&
383
371
  !(
384
372
  operand.op.kind === "OpDef" &&
373
+ // Deviation from SANY: OpDefNode#matchingOpArgOperand reads as many parameters as a RECURSIVE declaration gives and crashes when the definition has fewer.
385
374
  (operand.op.params ?? []).some((parameter) => parameter.arity > 0)
386
375
  );
387
376
  if (param.arity > 0 && !isMatching) {
@@ -60,10 +60,10 @@ import {
60
60
  popLabels,
61
61
  pushLabelScope,
62
62
  resolveSymbol,
63
- resolveSynonym,
64
63
  setRecursionFields,
65
64
  withContext,
66
65
  } from "./generation";
66
+ import { resolveSynonym } from "../tlc/jar-data";
67
67
  import {
68
68
  findNameOrKeyword,
69
69
  generateBounds,
@@ -123,6 +123,7 @@ export const processOperator = (
123
123
  const params = getParams(generation, definition, paramsSpan, true);
124
124
  const existing = resolveSymbol(generation.contexts, name);
125
125
  if (existing?.kind === "OpDef" && existing.inRecursive && !existing.isDefined) {
126
+ // Deviation from SANY: Generator#processOperator compares only the last parameter's arity with the RECURSIVE declaration's.
126
127
  const isMatching =
127
128
  existing.params?.length === params.length && params.every((param) => param.arity === 0);
128
129
  if (existing.letInLevel !== generation.curLevel) {
@@ -356,6 +357,7 @@ const processSubstitutions = (
356
357
  if (targetIndex !== -1) {
357
358
  cursor = getExpressionSpan(generation.file, substitution.expression).end + 1;
358
359
  }
360
+ // Deviation from SANY: Generator#generateSubst looks a target up as spelled, so it rejects `<= <- G` for a CONSTANT _ <= _.
359
361
  const target = getContextSymbol(instanceeContext, resolveSynonym(substitution.name));
360
362
  if (target?.kind !== "OpDecl") {
361
363
  generation.addError(
@@ -27,6 +27,7 @@ import {
27
27
  getArgumentSpan,
28
28
  getExpressionSpan,
29
29
  getMatchingIndex,
30
+ getParenthesizedSpan,
30
31
  getPreComments,
31
32
  getSpanLocation,
32
33
  getTokenIndex,
@@ -48,11 +49,10 @@ import {
48
49
  type ModuleGeneration,
49
50
  popLabels,
50
51
  pushLabelScope,
51
- resolveName,
52
52
  resolveSymbol,
53
- resolveSynonym,
54
53
  withContext,
55
54
  } from "./generation";
55
+ import { resolveSynonym } from "../tlc/jar-data";
56
56
  import { getOperandSpan } from "./generator-def-entries";
57
57
  import {
58
58
  checkForUndefinedRecursiveOps,
@@ -93,18 +93,6 @@ const isOperatorArgument = (argument: Expression) => {
93
93
  return OPERATOR_ARGUMENT_KINDS.has(argument.kind) || (items !== undefined && isGeneralId(items));
94
94
  };
95
95
 
96
- const POSTFIX_OPERATOR_TEXTS = new Set(["'", "^+", "^*", "^#"]);
97
-
98
- const getOperatorNodeKind = (
99
- expression: Expression & { kind: "OperatorReference" | "Lambda" },
100
- text: string,
101
- ) => {
102
- if (POSTFIX_OPERATOR_TEXTS.has(text)) return "N_GenPostfixOp";
103
- return expression.kind === "Lambda" || text === "~" || text === "-."
104
- ? "N_GenNonExpPrefixOp"
105
- : "N_GenInfixOp";
106
- };
107
-
108
96
  const locateSelectorItems = (file: SourceFile, items: SelectorItem[], span: TokenSpan) => {
109
97
  let cursor = span.start;
110
98
  return items.map((item): SelectorItem => {
@@ -244,22 +232,33 @@ const getOperatorArgumentName = (file: SourceFile, argument: Expression) =>
244
232
  ? argument.body.operator
245
233
  : file.tokens[getTokenIndex(file, argument.location)].text;
246
234
 
235
+ const resolveOperatorArgument = (
236
+ generation: ModuleGeneration,
237
+ argument: Expression,
238
+ location: SanyLocation,
239
+ ) => {
240
+ const name = getOperatorArgumentName(generation.file, argument);
241
+ const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
242
+ if (symbol !== undefined) return createOpArg(generation, symbol, location);
243
+ generation.addError(location, `Could not find declaration or definition of symbol '${name}'.`);
244
+ return createNullNode(generation);
245
+ };
246
+
247
247
  export const generateOperatorArgument = (
248
248
  generation: ModuleGeneration,
249
249
  argument: Expression,
250
250
  target: OpDeclNode,
251
251
  ): OpArgNode | OpApplNode => {
252
- const location = getLocation(generation.file, argument);
253
- if (argument.kind === "Lambda") {
252
+ const span = getExpressionSpan(generation.file, argument);
253
+ const parenthesizedSpan = getParenthesizedSpan(generation.file, span);
254
+ const location = getSpanLocation(generation.file, parenthesizedSpan);
255
+ const isParenthesized = parenthesizedSpan !== span;
256
+ if (argument.kind === "Lambda" && !isParenthesized) {
254
257
  if (argument.location.range !== undefined && argument.operator === undefined)
255
258
  return createOpArg(generation, generateLambda(generation, argument), location);
256
- return createOpArg(
257
- generation,
258
- resolveName(generation, getOperatorArgumentName(generation.file, argument), location),
259
- location,
260
- );
259
+ return resolveOperatorArgument(generation, argument, location);
261
260
  }
262
- if (!isOperatorArgument(argument)) {
261
+ if (isParenthesized || !isOperatorArgument(argument)) {
263
262
  generation.addError(
264
263
  location,
265
264
  `Arity ${target.arity} operator (not an expression) is expected \nto substitute for CONSTANT '${target.name}'.`,
@@ -267,7 +266,7 @@ export const generateOperatorArgument = (
267
266
  return createNullNode(generation);
268
267
  }
269
268
  if (argument.kind === "OperatorReference") {
270
- return createOpArg(generation, resolveName(generation, argument.operator, location), location);
269
+ return resolveOperatorArgument(generation, argument, location);
271
270
  }
272
271
  const node = generateSelector(generation, argument, target.arity, false, false);
273
272
  if (node.kind === "OpArg" || (node.kind === "OpAppl" && node.nullKind !== undefined)) return node;
@@ -283,10 +282,13 @@ export const generateArgument = (
283
282
  argument: Expression,
284
283
  operatorLocation: SanyLocation,
285
284
  ): ExprOrOpArgNode => {
286
- const isDefinition =
285
+ const params =
287
286
  operator.kind === "OpDef" &&
288
- (operator.defKind === "UserDefined" || operator.defKind === "ModuleInstance");
289
- const expectedArity = isDefinition ? (operator.params?.[index]?.arity ?? 0) : 0;
287
+ (operator.defKind === "UserDefined" || operator.defKind === "ModuleInstance")
288
+ ? (operator.params ?? [])
289
+ : undefined;
290
+ if (params !== undefined && params.length <= index) return createNullNode(generation);
291
+ const expectedArity = params?.[index]?.arity ?? 0;
290
292
  if (expectedArity === 0) return generateExpression(generation, argument);
291
293
  const span = getExpressionSpan(generation.file, argument);
292
294
  const location = getSpanLocation(generation.file, span);
@@ -722,13 +724,17 @@ export const generateExpression = (
722
724
  return { ...createNullNode(generation), nullKind: "absent" };
723
725
  case "OperatorReference":
724
726
  case "Lambda": {
725
- const text =
726
- generation.file.tokens[getExpressionSpan(generation.file, expression).start].text;
727
+ const token = generation.file.tokens[getExpressionSpan(generation.file, expression).start];
728
+ const name = expression.operator ?? token.text;
729
+ // Deviation from SANY: Generator#generateExpression names its internal node kind here, where tla-ts words it as for a name.
730
+ const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
727
731
  generation.addError(
728
732
  location,
729
- text === "LAMBDA"
733
+ token.text === "LAMBDA"
730
734
  ? "LAMBDA expression used where an expression is required."
731
- : `Unsupported expression type \`${getOperatorNodeKind(expression, text)}'.`,
735
+ : symbol === undefined
736
+ ? `Could not find declaration or definition of symbol '${token.spelling ?? name}'.`
737
+ : `The operator ${resolveSynonym(name)} requires ${getSymbolArity(symbol)} arguments.`,
732
738
  );
733
739
  return { ...createNullNode(generation), nullKind: "absent" };
734
740
  }
@@ -66,9 +66,9 @@ import {
66
66
  pushLabelScope,
67
67
  resolveModule,
68
68
  resolveName,
69
- resolveSynonym,
70
69
  withContext,
71
70
  } from "./generation";
71
+ import { resolveSynonym } from "../tlc/jar-data";
72
72
  import { getOperandSpan, reportDefEntry } from "./generator-def-entries";
73
73
  import {
74
74
  generateInstance,
@@ -108,9 +108,11 @@ const getFactModules = (generation: ModuleGeneration, fact: Fact & { kind: "Modu
108
108
  const generateFacts = (generation: ModuleGeneration, facts: Fact[]) =>
109
109
  facts.flatMap((fact): FactNode[] => {
110
110
  if (fact.kind === "ModuleFact") return getFactModules(generation, fact);
111
- const items = getSelectorItems(fact);
111
+ const reference: Expression =
112
+ fact.kind === "ExceptAt" ? { kind: "Identifier", name: "@", location: fact.location } : fact;
113
+ const items = getSelectorItems(reference);
112
114
  if (items === undefined || !isGeneralId(items)) return [generateExpression(generation, fact)];
113
- const node = generateSelector(generation, fact, 0, true, false);
115
+ const node = generateSelector(generation, reference, 0, true, false);
114
116
  if (node.kind === "ThmOrAssumpDef") throw new TlaSyntaxError("Expected a fact");
115
117
  return [node];
116
118
  });
@@ -51,8 +51,8 @@ import {
51
51
  type ModuleGeneration,
52
52
  resolveModule,
53
53
  resolveSymbol,
54
- resolveSynonym,
55
54
  } from "./generation";
55
+ import { resolveSynonym } from "../tlc/jar-data";
56
56
  import {
57
57
  checkForUndefinedRecursiveOps,
58
58
  checkRecursiveSection,
@@ -125,6 +125,7 @@ const isInternalInstance = (module: Module, instance: Instance) => {
125
125
  return seen.has(instance.module);
126
126
  }
127
127
  }
128
+ // Deviation from SANY: SpecObj#instanceResolvesToInternalModule reads only top-level INSTANCEs, so SANY loads an inner module that only a LET instantiates a second time and rejects it as multiply defined.
128
129
  return module.modules.some(
129
130
  (inner) => inner.name === instance.module && isBefore(inner.location, instance.location),
130
131
  );
package/src/sany/lexer.ts CHANGED
@@ -302,9 +302,9 @@ const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
302
302
 
303
303
  const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
304
304
  patterns
305
- .map(([name, regexes]) => ({
306
- kind: getKind(name),
307
- length: Math.max(...regexes.map((regex) => getMatchLength(regex, source, offset))),
305
+ .map((pattern) => ({
306
+ kind: getKind(pattern[0]),
307
+ length: Math.max(...pattern[1].map((regex) => getMatchLength(regex, source, offset))),
308
308
  }))
309
309
  .reduce(getLongerMatch, { kind: -1, length: 0 });
310
310
 
@@ -1289,8 +1289,10 @@ _TLCTrace ==
1289
1289
  ]);
1290
1290
 
1291
1291
  export const SANY_174_STANDARD_MODULES = new Map([
1292
- ...[...SANY_STANDARD_MODULES].filter(([name]) =>
1293
- ["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(name),
1292
+ ...[...SANY_STANDARD_MODULES].filter((entry) =>
1293
+ ["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
1294
+ entry[0],
1295
+ ),
1294
1296
  ),
1295
1297
  ["Bags", BAGS.replace("\nLOCAL INSTANCE Naturals\n", "\nEXTENDS TLC\nLOCAL INSTANCE Naturals\n")],
1296
1298
  [
package/src/sany/nodes.ts CHANGED
@@ -156,7 +156,7 @@ export interface OpApplNode extends LevelFields {
156
156
  nullKind?: "null" | "absent";
157
157
  }
158
158
 
159
- export const isAbsent = (node: LevelNode | undefined) =>
159
+ export const isAbsent = (node: LevelNode | SymbolNode | undefined) =>
160
160
  node?.kind === "OpAppl" && node.nullKind === "absent";
161
161
 
162
162
  export interface NumeralNode extends LevelFields {
@@ -4,6 +4,7 @@ import {
4
4
  CONSTANT_DECL_KIND,
5
5
  getContextSymbol,
6
6
  getSymbolArity,
7
+ isAbsent,
7
8
  type AssumeProveNode,
8
9
  type Context,
9
10
  type ExprNode,
@@ -382,7 +383,7 @@ export const createSelectorResolver =
382
383
  "`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
383
384
  );
384
385
  }
385
- } else if (node === undefined) {
386
+ } else if (node === undefined || isAbsent(node)) {
386
387
  return generator.addError(
387
388
  getItemLocation(),
388
389
  "Subexpression selection failed, probably due to an error in the selected expression.",
@@ -413,7 +414,11 @@ export const createSelectorResolver =
413
414
  const number = getArgNumber(item.op, operator.arity);
414
415
  if (number === -1) return addNonexistentError();
415
416
  walk.node = operands[number - 1];
416
- } else if (operator.kind === "OpDef" && operator.defKind === "BuiltIn") {
417
+ } else if (
418
+ operator.kind === "OpDef" &&
419
+ operator.defKind === "BuiltIn" &&
420
+ node.nullKind !== "null"
421
+ ) {
417
422
  if (operator.name === "$RcdConstructor" || operator.name === "$SetOfRcds") {
418
423
  if (operandNumber === -1) return addNonexistentError();
419
424
  const pair = operands[operandNumber - 1];
@@ -438,7 +443,7 @@ export const createSelectorResolver =
438
443
  );
439
444
  }
440
445
  walk.node = pair.operands[number - 1];
441
- if (walk.node === undefined)
446
+ if (walk.node === undefined || isAbsent(walk.node))
442
447
  return generator.addError(
443
448
  getItemLocation(),
444
449
  "Selecting OTHER in a CASE statement.",
@@ -476,7 +481,7 @@ export const createSelectorResolver =
476
481
  } else {
477
482
  return generator.addError(
478
483
  getItemLocation(),
479
- `Choosing operand \`${item.name}' of subexpression with no operands.`,
484
+ `Choosing operand \`${getSelectorItemName(item)}' of subexpression with no operands.`,
480
485
  );
481
486
  }
482
487
  } else if (node.kind === "AssumeProve") {
@@ -542,10 +547,10 @@ export const createSelectorResolver =
542
547
  "Selecting subexpression of expression that has none.",
543
548
  );
544
549
  }
545
- if (walk.node === undefined)
550
+ if (walk.node === undefined || isAbsent(walk.node))
546
551
  return generator.addError(
547
552
  getItemLocation(),
548
- `An unexpected null node specified by '${item.name}'.\nThis is probably due to a previous error.`,
553
+ `An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
549
554
  );
550
555
  if (walk.index !== items.length - 1) {
551
556
  const next = items[walk.index + 1];
package/src/sany/xml.ts CHANGED
@@ -894,10 +894,9 @@ const exportSpecification = (
894
894
  "context",
895
895
  [...entries.entries()]
896
896
  .toSorted(
897
- ([first], [second]) =>
898
- getHashMapBucket(first, capacity) - getHashMapBucket(second, capacity),
897
+ (left, right) => getHashMapBucket(left[0], capacity) - getHashMapBucket(right[0], capacity),
899
898
  )
900
- .map(([id, element]) => createElement("entry", [createText("UID", id), element])),
899
+ .map((pair) => createElement("entry", [createText("UID", pair[0]), pair[1]])),
901
900
  );
902
901
  return createElement("modules", [
903
902
  createText("RootModule", root.name),