tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576

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 (252) 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 +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +18 -4
  7. package/dist/index.d.ts +18 -4
  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 +56 -56
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -44
  16. package/dist/run.js +42 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +49 -44
  20. package/dist/transfer.js +48 -43
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +14 -2
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +516 -280
  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 +18 -4
  33. package/src/cli/tlc.ts +18 -12
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +23 -10
  36. package/src/coverage.ts +190 -1
  37. package/src/dependencies.ts +68 -15
  38. package/src/dfid.ts +101 -36
  39. package/src/environment.ts +123 -38
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +370 -99
  42. package/src/exit-codes.ts +28 -14
  43. package/src/instances.ts +135 -11
  44. package/src/java-hash.ts +14 -0
  45. package/src/java-overrides.ts +2 -2
  46. package/src/levels.ts +675 -236
  47. package/src/lexer.ts +12 -2
  48. package/src/liveness-checker.ts +179 -60
  49. package/src/liveness.ts +51 -10
  50. package/src/obligations/index.ts +1 -1
  51. package/src/obligations/normalize.ts +1 -4
  52. package/src/obligations/printer.ts +5 -5
  53. package/src/obligations/source.ts +2 -0
  54. package/src/parallel-worker.ts +8 -2
  55. package/src/parallel.ts +5 -0
  56. package/src/parser.ts +180 -149
  57. package/src/prover/isabelle/isar/attrib.ts +4 -4
  58. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  59. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  60. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  61. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  62. package/src/prover/isabelle/pure/term.ts +3 -3
  63. package/src/prover/prep/md5.ts +26 -29
  64. package/src/prover/smt/rewrite.ts +2 -7
  65. package/src/prover/smt/simplify.ts +1 -1
  66. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  67. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  68. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  69. package/src/prover/smt/solver/ast-lt.ts +1 -1
  70. package/src/prover/smt/solver/ast.ts +66 -14
  71. package/src/prover/smt/solver/auf-solver.ts +23 -12
  72. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  73. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  74. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  75. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  76. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  77. package/src/prover/smt/solver/card2bv.ts +35 -18
  78. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  79. package/src/prover/smt/solver/context.ts +84 -15
  80. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  81. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  82. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  83. package/src/prover/smt/solver/diff-neq.ts +1 -2
  84. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  85. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  86. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  87. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  88. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  89. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  90. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  91. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  92. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  93. package/src/prover/smt/solver/euf/mam.ts +1 -5
  94. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  95. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  96. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  97. package/src/prover/smt/solver/factor.ts +36 -14
  98. package/src/prover/smt/solver/fd-solver.ts +608 -139
  99. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  100. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  101. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  102. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  103. package/src/prover/smt/solver/goal.ts +6 -3
  104. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  105. package/src/prover/smt/solver/hashtable.ts +4 -0
  106. package/src/prover/smt/solver/internalizer.ts +1 -1
  107. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  108. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  109. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  110. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  111. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  112. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  113. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  114. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  115. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  116. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  117. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  118. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  119. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  120. package/src/prover/smt/solver/maxcore.ts +2 -1
  121. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  122. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  123. package/src/prover/smt/solver/model-checker.ts +1 -1
  124. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  125. package/src/prover/smt/solver/model-generator.ts +85 -43
  126. package/src/prover/smt/solver/mpf.ts +2 -4
  127. package/src/prover/smt/solver/mus.ts +2 -3
  128. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  129. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  130. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  131. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  132. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  133. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  134. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  135. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  136. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  137. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  138. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  139. package/src/prover/smt/solver/nlqsat.ts +1 -1
  140. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  141. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  142. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  143. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  144. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  145. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  146. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  147. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  148. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  149. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  150. package/src/prover/smt/solver/nnf.ts +6 -2
  151. package/src/prover/smt/solver/opt-context.ts +21 -7
  152. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  153. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  154. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  155. package/src/prover/smt/solver/opt-solver.ts +10 -6
  156. package/src/prover/smt/solver/optsmt.ts +1 -1
  157. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  158. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  159. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  160. package/src/prover/smt/solver/probes.ts +88 -23
  161. package/src/prover/smt/solver/proto-model.ts +8 -8
  162. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  163. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  164. package/src/prover/smt/solver/qe-lite.ts +2 -2
  165. package/src/prover/smt/solver/qe.ts +3 -2
  166. package/src/prover/smt/solver/qsat.ts +23 -8
  167. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  168. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  169. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  170. package/src/prover/smt/solver/rewriter.ts +31 -25
  171. package/src/prover/smt/solver/rlimit.ts +7 -3
  172. package/src/prover/smt/solver/sat/config.ts +1 -1
  173. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  174. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  175. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  176. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  177. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  178. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  179. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  180. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  181. package/src/prover/smt/solver/sat/solver.ts +27 -47
  182. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  183. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  184. package/src/prover/smt/solver/seq-derive.ts +2 -2
  185. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  186. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  187. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  188. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  189. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  190. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  191. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  192. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  193. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  194. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  195. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  196. package/src/prover/smt/solver/smt-setup.ts +106 -13
  197. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  198. package/src/prover/smt/solver/smtlib-script.ts +713 -210
  199. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  200. package/src/prover/smt/solver/solver.ts +18 -3
  201. package/src/prover/smt/solver/tactic.ts +350 -195
  202. package/src/prover/smt/solver/theory-bv.ts +13 -3
  203. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  204. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  205. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  206. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  207. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  208. package/src/prover/smt/solver/theory-lra.ts +1 -1
  209. package/src/prover/smt/solver/theory-pb.ts +24 -7
  210. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  211. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  212. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  213. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  214. package/src/prover/tlapm/cache.ts +8 -8
  215. package/src/prover/zenon/index-table.ts +5 -2
  216. package/src/prover/zenon/isar-case.ts +1 -1
  217. package/src/prover/zenon/isar.ts +2 -2
  218. package/src/prover/zenon/phrase.ts +1 -1
  219. package/src/resolve.ts +1274 -257
  220. package/src/runtime.ts +7 -1
  221. package/src/sany/builtins.ts +10 -10
  222. package/src/sany/generation.ts +5 -15
  223. package/src/sany/generator-def-entries.ts +123 -36
  224. package/src/sany/generator-definitions.ts +5 -3
  225. package/src/sany/generator-expressions.ts +60 -37
  226. package/src/sany/generator-proofs.ts +18 -12
  227. package/src/sany/generator.ts +12 -6
  228. package/src/sany/lexer.ts +15 -7
  229. package/src/sany/modules.ts +4 -2
  230. package/src/sany/nodes.ts +1 -1
  231. package/src/sany/selectors.ts +11 -6
  232. package/src/sany/xml.ts +2 -3
  233. package/src/search.ts +319 -135
  234. package/src/simulate.ts +235 -182
  235. package/src/spec-description.ts +8 -6
  236. package/src/standard-definitions.ts +1 -0
  237. package/src/standard-modules.ts +56 -22
  238. package/src/subexpressions.ts +564 -138
  239. package/src/successors.ts +37 -13
  240. package/src/symmetry.ts +2 -1
  241. package/src/tlc/jar-data.ts +10 -0
  242. package/src/tlc/messages.ts +3 -3
  243. package/src/tlc/order.ts +14 -3
  244. package/src/tlc/random.ts +2 -1
  245. package/src/tlc/replay.ts +67 -43
  246. package/src/tlc/tlc-operators.ts +10 -8
  247. package/src/tlc/tlcext-operators.ts +44 -15
  248. package/src/tlc/trace-spec.ts +9 -22
  249. package/src/trace-liveness.ts +529 -0
  250. package/src/typed-tier.ts +52 -31
  251. package/src/typescript/types.ts +2 -2
  252. package/src/values.ts +150 -79
@@ -9,6 +9,7 @@ import {
9
9
  type Instance,
10
10
  type Module,
11
11
  type OperatorParam,
12
+ type Proof,
12
13
  type SourceLocation,
13
14
  } from "./ast";
14
15
  import type { ModuleOperator } from "./check";
@@ -49,7 +50,9 @@ import {
49
50
  import { overrideDefinitions, type JavaOverride } from "./java-overrides";
50
51
  import { extractModule } from "./parser";
51
52
  import {
53
+ collectSemanticErrors,
52
54
  getArity,
55
+ getFunctionArity,
53
56
  getParamArities,
54
57
  isBefore,
55
58
  isTheoremDefinition,
@@ -100,6 +103,12 @@ interface EnvironmentOptions {
100
103
  version?: TlcVersion;
101
104
  moduleOperators?: ModuleOperator[];
102
105
  readLine?: () => string | undefined;
106
+ runtimeInvariants?: RuntimeInvariant[];
107
+ }
108
+
109
+ export interface RuntimeInvariant {
110
+ name: string;
111
+ module: string | undefined;
103
112
  }
104
113
 
105
114
  export interface ResolvedModuleOperator extends ModuleOperator {
@@ -114,6 +123,7 @@ export interface Specification {
114
123
  startupDefinitions: Definition[];
115
124
  javaOverrides: JavaOverride[];
116
125
  moduleOperators: ResolvedModuleOperator[];
126
+ runtimeInvariants: RuntimeInvariant[];
117
127
  rootName: string;
118
128
  }
119
129
 
@@ -143,7 +153,7 @@ interface ModuleScope {
143
153
  nested: Module[];
144
154
  errors: SanyError[];
145
155
  warnings: SanyError[];
146
- levelChecks: (() => void)[];
156
+ levelChecks: ReturnType<typeof checkModuleLevels>[];
147
157
  }
148
158
 
149
159
  const getDeclarations = (linked: LinkedModule): Declaration[] => [
@@ -229,6 +239,19 @@ const getSubstitutions = (instances: Instance[]) =>
229
239
  instance.substitutions.map((substitution) => substitution.expression),
230
240
  );
231
241
 
242
+ const getProofInstances = (proof: Proof | undefined): Instance[] =>
243
+ proof?.kind === "Steps"
244
+ ? proof.steps.flatMap((step) => [
245
+ ...(step.body.kind === "Instance" ? [step.body] : []),
246
+ ...(step.body.kind === "Define"
247
+ ? step.body.definitions.flatMap((definition) =>
248
+ definition.kind === "Instance" ? [definition] : [],
249
+ )
250
+ : []),
251
+ ...getProofInstances(step.proof),
252
+ ])
253
+ : [];
254
+
232
255
  const rejectLiterals = (expressions: Expression[]): void =>
233
256
  expressions.forEach((expression) => {
234
257
  if (expression.kind === "Decimal") throw createRealNumberError(expression);
@@ -268,9 +291,10 @@ export const createEnvironment = (
268
291
  const dependencies = new Map<string, Set<string>>();
269
292
  const loading: Set<string>[] = [];
270
293
  const linking: string[] = [];
294
+ const usedModules = new Set<string>();
271
295
 
272
296
  const useModule = (name: string, used: Iterable<string>) =>
273
- loading.forEach((closure) => {
297
+ [usedModules, ...loading].forEach((closure) => {
274
298
  closure.add(name);
275
299
  [...used].forEach((dependency) => closure.add(dependency));
276
300
  });
@@ -382,7 +406,7 @@ export const createEnvironment = (
382
406
  const closure = new Set<string>();
383
407
  const nested: Module[] = [];
384
408
  const errors: SanyError[] = [];
385
- const levelChecks: (() => void)[] = [];
409
+ const levelChecks: ReturnType<typeof checkModuleLevels>[] = [];
386
410
  linking.push(parsed.name);
387
411
  loading.push(closure);
388
412
  const linked = linkModule(parsed, {
@@ -402,7 +426,20 @@ export const createEnvironment = (
402
426
  const redefinition = loaded && getModuleRedefinition(duplicate, loaded.module);
403
427
  if (redefinition) throw createSanyError([redefinition], false, undefined, warnings);
404
428
  if (duplicate) throw createModuleRedefinedError(duplicate);
405
- levelChecks.forEach((check) => check());
429
+ // SANY's Errors#addMessage drops a message it already has, such as an instantiated body's.
430
+ const levelErrors = [
431
+ ...collectSemanticErrors(
432
+ levelChecks.flatMap((check) => check.sections),
433
+ warnings,
434
+ ),
435
+ ...levelChecks.flatMap((check) => check.check(check !== levelChecks.at(-1))),
436
+ ].filter(
437
+ (error, index, all) =>
438
+ all.findIndex(
439
+ (other) => other.location === error.location && other.message === error.message,
440
+ ) === index,
441
+ );
442
+ if (levelErrors.length > 0) throw createSanyError(levelErrors, false, undefined, warnings);
406
443
  return { linked, closure };
407
444
  };
408
445
 
@@ -498,7 +535,7 @@ export const createEnvironment = (
498
535
  const instantiation = createInstantiation({
499
536
  params,
500
537
  substitutions: new Map(
501
- [...substitutions].map(([name, expression]) => [name, renameLocals(expression, renamed)]),
538
+ [...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
502
539
  ),
503
540
  variables: new Set(linked.variables),
504
541
  getDefinition: (key) => definitions.get(key),
@@ -541,9 +578,14 @@ export const createEnvironment = (
541
578
  instance.name === undefined
542
579
  ? standardSymbols
543
580
  : new Map(
544
- [...standardSymbols].map(([name, symbol]) => [
545
- `${instance.name}!${name}`,
546
- { key: symbol.key, arity: symbol.arity, params: symbol.params, kind: symbol.kind },
581
+ [...standardSymbols].map((entry) => [
582
+ `${instance.name}!${entry[0]}`,
583
+ {
584
+ key: entry[1].key,
585
+ arity: entry[1].arity,
586
+ params: entry[1].params,
587
+ kind: entry[1].kind,
588
+ },
547
589
  ]),
548
590
  );
549
591
 
@@ -556,32 +598,41 @@ export const createEnvironment = (
556
598
  const declared = new Set(declarations.map((declaration) => declaration.name));
557
599
  return new Map(
558
600
  [...exported]
559
- .filter(([name]) => !declared.has(name))
560
- .map(([name, symbol]): [string, ModuleSymbol] => {
601
+ .filter(
602
+ (entry) =>
603
+ !declared.has(entry[0]) &&
604
+ (instance.name !== undefined || entry[1].kind !== "Instance"),
605
+ )
606
+ .map((entry): [string, ModuleSymbol] => {
561
607
  if (instance.name === undefined) {
562
608
  return [
563
- name,
609
+ entry[0],
564
610
  {
565
- key: getKey(symbol.key, name),
566
- arity: symbol.arity,
567
- params: symbol.params,
568
- kind: symbol.kind,
611
+ key: getKey(entry[1].key, entry[0]),
612
+ arity: entry[1].arity,
613
+ params: entry[1].params,
614
+ kind: entry[1].kind,
569
615
  range:
570
- parameterized.get(symbol.key) === true ? instance.location.range : symbol.range,
616
+ parameterized.get(entry[1].key) === true
617
+ ? instance.location.range
618
+ : entry[1].range,
619
+ functionArity:
620
+ parameterized.get(entry[1].key) === true ? undefined : entry[1].functionArity,
571
621
  },
572
622
  ];
573
623
  }
574
- const qualified = `${instance.name}!${name}`;
624
+ const qualified = `${instance.name}!${entry[0]}`;
575
625
  return [
576
626
  qualified,
577
627
  {
578
- key: getKey(symbol.key, qualified),
579
- arity: symbol.arity + instance.params.length,
580
- params: symbol.params && [
628
+ key: entry[1].kind === "Instance" ? qualified : getKey(entry[1].key, qualified),
629
+ arity: entry[1].arity + instance.params.length,
630
+ params: entry[1].params && [
581
631
  ...instance.params.map((param) => param.arity),
582
- ...symbol.params,
632
+ ...entry[1].params,
583
633
  ],
584
- kind: symbol.kind,
634
+ kind: entry[1].kind,
635
+ functionArity: declarations.length > 0 ? undefined : entry[1].functionArity,
585
636
  },
586
637
  ];
587
638
  }),
@@ -629,11 +680,11 @@ export const createEnvironment = (
629
680
  const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
630
681
  if (standardSymbols) {
631
682
  if (instance.name === undefined) return [];
632
- return [...standardSymbols].map(([name, symbol]) => {
633
- const forwarded = createArgumentParams(symbol.arity, symbol.params);
683
+ return [...standardSymbols].map((entry) => {
684
+ const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
634
685
  return createLocalAlias(
635
- `${instance.name}!${name}`,
636
- symbol.key,
686
+ `${instance.name}!${entry[0]}`,
687
+ entry[1].key,
637
688
  [...instance.params, ...forwarded],
638
689
  forwarded,
639
690
  location,
@@ -714,16 +765,16 @@ export const createEnvironment = (
714
765
  });
715
766
  const declared = new Set(declarations.map((declaration) => declaration.name));
716
767
  const aliases = [...linked.exported]
717
- .filter(([name]) => !declared.has(name))
718
- .map(([name, symbol]) => {
719
- const key = instantiation.getKey(symbol.key);
720
- const ownParams = createArgumentParams(symbol.arity, symbol.params);
768
+ .filter((entry) => !declared.has(entry[0]) && entry[1].kind !== "Instance")
769
+ .map((entry) => {
770
+ const key = instantiation.getKey(entry[1].key);
771
+ const ownParams = createArgumentParams(entry[1].arity, entry[1].params);
721
772
  const params = [...instance.params, ...ownParams];
722
773
  return createLocalAlias(
723
- instance.name === undefined ? name : `${instance.name}!${name}`,
774
+ instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`,
724
775
  key,
725
776
  params,
726
- key === symbol.key ? ownParams : params,
777
+ key === entry[1].key ? ownParams : params,
727
778
  location,
728
779
  );
729
780
  });
@@ -731,9 +782,9 @@ export const createEnvironment = (
731
782
  };
732
783
 
733
784
  const getAvailableDefinitions = (visible: Symbols) =>
734
- [...visible].flatMap(([name, symbol]) => {
735
- const definition = definitions.get(symbol.key);
736
- return definition ? [{ ...definition, name }] : [];
785
+ [...visible].flatMap((entry) => {
786
+ const definition = definitions.get(entry[1].key);
787
+ return definition ? [{ ...definition, name: entry[0] }] : [];
737
788
  });
738
789
 
739
790
  const javaOverrides = new Map<string, JavaOverride[]>();
@@ -843,6 +894,7 @@ export const createEnvironment = (
843
894
  params: getParamArities(definition),
844
895
  kind: isTheoremDefinition(parsed, definition) ? "Theorem" : "Definition",
845
896
  range: definition.location.range,
897
+ functionArity: getFunctionArity(definition),
846
898
  });
847
899
  const isParameterFree = constants.length === 0 && variables.length === 0;
848
900
  const getKey = (definition: Definition) =>
@@ -882,6 +934,13 @@ export const createEnvironment = (
882
934
  module.definitions.toReversed().map((definition) => [definition.name, definition]),
883
935
  ),
884
936
  getKey,
937
+ isModuleKnown: (name, location) =>
938
+ name === parsed.name ||
939
+ usedModules.has(name) ||
940
+ scope.modules.has(name) ||
941
+ parsed.modules.some(
942
+ (nested) => nested.name === name && isBefore(nested.location, location),
943
+ ),
885
944
  instanced,
886
945
  facts,
887
946
  reports,
@@ -902,7 +961,7 @@ export const createEnvironment = (
902
961
  getDefinitionSymbol(definition),
903
962
  ]),
904
963
  ].reduce(
905
- (symbols, [name, symbol]) => (symbols.has(name) ? symbols : symbols.set(name, symbol)),
964
+ (symbols, entry) => (symbols.has(entry[0]) ? symbols : symbols.set(entry[0], entry[1])),
906
965
  new Map(visible),
907
966
  );
908
967
  const linkNested = (nested: Module) => {
@@ -943,6 +1002,14 @@ export const createEnvironment = (
943
1002
  visible.set(name, symbol);
944
1003
  if (!instance.isLocal) exported.set(name, symbol);
945
1004
  });
1005
+ if (instance.name !== undefined && !instance.isLocal) {
1006
+ exported.set(instance.name, {
1007
+ key: `${instance.name}${KEY_SEPARATOR}${scope.id}`,
1008
+ arity: instance.params.length,
1009
+ kind: "Instance",
1010
+ range: instance.location.range,
1011
+ });
1012
+ }
946
1013
  },
947
1014
  })),
948
1015
  ...parsed.modules.map((nested) => ({
@@ -958,6 +1025,13 @@ export const createEnvironment = (
958
1025
  ),
959
1026
  getAvailableDefinitions(visible),
960
1027
  );
1028
+ parsed.theorems
1029
+ .flatMap((theorem) => getProofInstances(theorem.proof))
1030
+ .filter((instance) => !getVisibleModules().has(instance.module))
1031
+ .forEach(
1032
+ (instance) =>
1033
+ getStandardSymbols(instance.module) ?? getLinkedModule(instance.module, parsed.name),
1034
+ );
961
1035
  scope.errors.push(...resolveModule(module, getUnit(module)));
962
1036
  module.definitions.forEach((definition) => {
963
1037
  const key = getKey(definition);
@@ -993,7 +1067,7 @@ export const createEnvironment = (
993
1067
  const checks = instanceChecks
994
1068
  .splice(firstCheck)
995
1069
  .map((check) => ({ location: check.location, check: () => checkInstance(check) }));
996
- scope.levelChecks.push(() =>
1070
+ scope.levelChecks.push(
997
1071
  checkModuleLevels(
998
1072
  module,
999
1073
  {
@@ -1031,6 +1105,15 @@ export const createEnvironment = (
1031
1105
  );
1032
1106
  linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
1033
1107
  if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
1108
+ const runtimeInvariants = options.runtimeInvariants ?? [];
1109
+ runtimeInvariants.forEach((invariant) => {
1110
+ if (invariant.module === undefined) return;
1111
+ linkedModules.set(root.name, linkedRoot);
1112
+ const linked = getLinkedModule(invariant.module, root.name);
1113
+ linkOrder.splice(linkOrder.indexOf(linked), 1);
1114
+ const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
1115
+ if (definition) definitions.set(invariant.name, definition);
1116
+ });
1034
1117
  linkedRoot.visible.forEach((symbol, name) => {
1035
1118
  const definition = definitions.get(symbol.key);
1036
1119
  if (definition && symbol.key !== name) definitions.set(name, definition);
@@ -1057,7 +1140,7 @@ export const createEnvironment = (
1057
1140
  root: linkedRoot,
1058
1141
  moduleSymbols: new Map([
1059
1142
  ...standardExports,
1060
- ...[...linkedModules].map(([name, linked]): [string, Symbols] => [name, linked.visible]),
1143
+ ...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
1061
1144
  [root.name, linkedRoot.visible],
1062
1145
  ]),
1063
1146
  definitions,
@@ -1108,6 +1191,7 @@ export const createEnvironment = (
1108
1191
  variableIndex,
1109
1192
  facts,
1110
1193
  startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
1194
+ tlcEvalValues: new WeakMap(),
1111
1195
  substitutedDefinitions,
1112
1196
  instanceParams,
1113
1197
  evaluators: new WeakMap(),
@@ -1171,6 +1255,7 @@ export const createEnvironment = (
1171
1255
  ),
1172
1256
  javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
1173
1257
  moduleOperators,
1258
+ runtimeInvariants,
1174
1259
  rootName: root.name,
1175
1260
  };
1176
1261
  };
package/src/errors.ts CHANGED
@@ -320,6 +320,13 @@ export class SmtTacticError extends TlaError {
320
320
  }
321
321
  }
322
322
 
323
+ export class SmtDefaultError extends TlaError {
324
+ constructor(message: string) {
325
+ super(message);
326
+ this.name = "SmtDefaultError";
327
+ }
328
+ }
329
+
323
330
  export class SmtInvariantError extends TlaError {
324
331
  constructor(message: string) {
325
332
  super(message);