tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5

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 (229) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +33 -33
  4. package/dist/deciders.js +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +17 -3
  7. package/dist/index.d.ts +17 -3
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +55 -55
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -42
  16. package/dist/run.js +42 -44
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +96 -91
  20. package/dist/transfer.js +95 -90
  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 +31 -3
  25. package/src/bags.ts +12 -10
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +146 -93
  29. package/src/check.ts +418 -246
  30. package/src/cli/tlc-output.ts +17 -2
  31. package/src/cli/tlc.ts +5 -4
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +23 -10
  34. package/src/coverage.ts +255 -18
  35. package/src/dependencies.ts +68 -15
  36. package/src/dfid.ts +93 -35
  37. package/src/environment.ts +106 -39
  38. package/src/errors.ts +7 -0
  39. package/src/evaluate.ts +415 -132
  40. package/src/exit-codes.ts +28 -15
  41. package/src/instances.ts +135 -11
  42. package/src/java-hash.ts +14 -0
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +674 -236
  45. package/src/lexer.ts +12 -2
  46. package/src/liveness-checker.ts +161 -60
  47. package/src/liveness.ts +55 -10
  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/obligations/source.ts +2 -0
  52. package/src/parser.ts +110 -111
  53. package/src/prover/isabelle/isar/attrib.ts +4 -4
  54. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  55. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  56. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  57. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  58. package/src/prover/isabelle/pure/term.ts +3 -3
  59. package/src/prover/prep/md5.ts +26 -29
  60. package/src/prover/smt/rewrite.ts +2 -7
  61. package/src/prover/smt/simplify.ts +1 -1
  62. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  63. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  64. package/src/prover/smt/solver/asserted-formulas.ts +164 -58
  65. package/src/prover/smt/solver/ast-lt.ts +1 -1
  66. package/src/prover/smt/solver/ast.ts +65 -13
  67. package/src/prover/smt/solver/auf-solver.ts +23 -12
  68. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  69. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  70. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  71. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  72. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  73. package/src/prover/smt/solver/card2bv.ts +35 -18
  74. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  75. package/src/prover/smt/solver/context.ts +65 -14
  76. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  77. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  78. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  79. package/src/prover/smt/solver/diff-neq.ts +1 -2
  80. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  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 +3 -9
  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/fd-solver.ts +608 -141
  93. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  94. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  95. package/src/prover/smt/solver/goal.ts +4 -3
  96. package/src/prover/smt/solver/hashtable.ts +4 -0
  97. package/src/prover/smt/solver/internalizer.ts +1 -1
  98. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  99. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  100. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  101. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  102. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  103. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  104. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  105. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  106. package/src/prover/smt/solver/maxcore.ts +2 -1
  107. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  108. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  109. package/src/prover/smt/solver/model-checker.ts +1 -1
  110. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  111. package/src/prover/smt/solver/model-generator.ts +85 -43
  112. package/src/prover/smt/solver/mpf.ts +2 -4
  113. package/src/prover/smt/solver/mus.ts +2 -3
  114. package/src/prover/smt/solver/muz/dl-context.ts +14 -42
  115. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  116. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  117. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  118. package/src/prover/smt/solver/muz/hnf.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 +15 -2
  121. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  122. package/src/prover/smt/solver/muz/spacer-context.ts +1 -4
  123. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  124. package/src/prover/smt/solver/nlqsat.ts +1 -1
  125. package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
  126. package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
  127. package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
  128. package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
  129. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  130. package/src/prover/smt/solver/nnf.ts +6 -2
  131. package/src/prover/smt/solver/opt-context.ts +16 -7
  132. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  133. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  134. package/src/prover/smt/solver/opt-solver.ts +4 -3
  135. package/src/prover/smt/solver/optsmt.ts +1 -1
  136. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  137. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  138. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  139. package/src/prover/smt/solver/probes.ts +88 -23
  140. package/src/prover/smt/solver/proto-model.ts +8 -8
  141. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  142. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  143. package/src/prover/smt/solver/qe-lite.ts +2 -2
  144. package/src/prover/smt/solver/qe.ts +3 -2
  145. package/src/prover/smt/solver/qsat.ts +23 -8
  146. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  147. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  148. package/src/prover/smt/solver/rewriter.ts +31 -25
  149. package/src/prover/smt/solver/rlimit.ts +7 -3
  150. package/src/prover/smt/solver/sat/config.ts +1 -1
  151. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  152. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  153. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  154. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  155. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  156. package/src/prover/smt/solver/sat/sat-tactic.ts +15 -6
  157. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  158. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  159. package/src/prover/smt/solver/sat/solver.ts +27 -47
  160. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  161. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  162. package/src/prover/smt/solver/seq-derive.ts +1 -1
  163. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  164. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  165. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  166. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  167. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  168. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  169. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  170. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  171. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  172. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  173. package/src/prover/smt/solver/smt-kernel.ts +40 -6
  174. package/src/prover/smt/solver/smt-setup.ts +106 -13
  175. package/src/prover/smt/solver/smtlib-parser.ts +579 -214
  176. package/src/prover/smt/solver/smtlib-script.ts +600 -170
  177. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  178. package/src/prover/smt/solver/solver.ts +18 -3
  179. package/src/prover/smt/solver/tactic.ts +342 -196
  180. package/src/prover/smt/solver/theory-bv.ts +13 -3
  181. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  182. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  183. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  184. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  185. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  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/theory-without-terms.ts +24 -0
  191. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  192. package/src/prover/tlapm/cache.ts +8 -8
  193. package/src/prover/zenon/index-table.ts +5 -2
  194. package/src/prover/zenon/isar-case.ts +1 -1
  195. package/src/prover/zenon/isar.ts +2 -2
  196. package/src/prover/zenon/phrase.ts +1 -1
  197. package/src/resolve.ts +1226 -246
  198. package/src/runtime.ts +19 -2
  199. package/src/sany/builtins.ts +10 -10
  200. package/src/sany/generation.ts +4 -2
  201. package/src/sany/generator-def-entries.ts +123 -36
  202. package/src/sany/generator-definitions.ts +4 -2
  203. package/src/sany/generator-expressions.ts +51 -20
  204. package/src/sany/generator-proofs.ts +17 -11
  205. package/src/sany/generator.ts +11 -5
  206. package/src/sany/lexer.ts +15 -7
  207. package/src/sany/modules.ts +4 -2
  208. package/src/sany/nodes.ts +1 -1
  209. package/src/sany/selectors.ts +11 -6
  210. package/src/sany/xml.ts +2 -3
  211. package/src/search.ts +283 -126
  212. package/src/simulate.ts +247 -185
  213. package/src/spec-description.ts +15 -7
  214. package/src/standard-definitions.ts +1 -0
  215. package/src/standard-modules.ts +56 -22
  216. package/src/subexpressions.ts +563 -139
  217. package/src/successors.ts +50 -20
  218. package/src/symmetry.ts +2 -1
  219. package/src/tlc/jar-data.ts +1 -3
  220. package/src/tlc/messages.ts +3 -3
  221. package/src/tlc/random.ts +2 -1
  222. package/src/tlc/replay.ts +147 -46
  223. package/src/tlc/tlc-operators.ts +10 -8
  224. package/src/tlc/tlcext-operators.ts +26 -10
  225. package/src/tlc/trace-spec.ts +9 -22
  226. package/src/trace-liveness.ts +529 -0
  227. package/src/typed-tier.ts +52 -31
  228. package/src/typescript/types.ts +2 -2
  229. 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,
@@ -105,7 +108,6 @@ interface EnvironmentOptions {
105
108
 
106
109
  export interface RuntimeInvariant {
107
110
  name: string;
108
- /** Undefined when the invariant names a definition of the root module. */
109
111
  module: string | undefined;
110
112
  }
111
113
 
@@ -151,7 +153,7 @@ interface ModuleScope {
151
153
  nested: Module[];
152
154
  errors: SanyError[];
153
155
  warnings: SanyError[];
154
- levelChecks: (() => void)[];
156
+ levelChecks: ReturnType<typeof checkModuleLevels>[];
155
157
  }
156
158
 
157
159
  const getDeclarations = (linked: LinkedModule): Declaration[] => [
@@ -237,6 +239,19 @@ const getSubstitutions = (instances: Instance[]) =>
237
239
  instance.substitutions.map((substitution) => substitution.expression),
238
240
  );
239
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
+
240
255
  const rejectLiterals = (expressions: Expression[]): void =>
241
256
  expressions.forEach((expression) => {
242
257
  if (expression.kind === "Decimal") throw createRealNumberError(expression);
@@ -276,9 +291,10 @@ export const createEnvironment = (
276
291
  const dependencies = new Map<string, Set<string>>();
277
292
  const loading: Set<string>[] = [];
278
293
  const linking: string[] = [];
294
+ const usedModules = new Set<string>();
279
295
 
280
296
  const useModule = (name: string, used: Iterable<string>) =>
281
- loading.forEach((closure) => {
297
+ [usedModules, ...loading].forEach((closure) => {
282
298
  closure.add(name);
283
299
  [...used].forEach((dependency) => closure.add(dependency));
284
300
  });
@@ -390,7 +406,7 @@ export const createEnvironment = (
390
406
  const closure = new Set<string>();
391
407
  const nested: Module[] = [];
392
408
  const errors: SanyError[] = [];
393
- const levelChecks: (() => void)[] = [];
409
+ const levelChecks: ReturnType<typeof checkModuleLevels>[] = [];
394
410
  linking.push(parsed.name);
395
411
  loading.push(closure);
396
412
  const linked = linkModule(parsed, {
@@ -410,7 +426,20 @@ export const createEnvironment = (
410
426
  const redefinition = loaded && getModuleRedefinition(duplicate, loaded.module);
411
427
  if (redefinition) throw createSanyError([redefinition], false, undefined, warnings);
412
428
  if (duplicate) throw createModuleRedefinedError(duplicate);
413
- 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);
414
443
  return { linked, closure };
415
444
  };
416
445
 
@@ -506,7 +535,7 @@ export const createEnvironment = (
506
535
  const instantiation = createInstantiation({
507
536
  params,
508
537
  substitutions: new Map(
509
- [...substitutions].map(([name, expression]) => [name, renameLocals(expression, renamed)]),
538
+ [...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
510
539
  ),
511
540
  variables: new Set(linked.variables),
512
541
  getDefinition: (key) => definitions.get(key),
@@ -549,9 +578,14 @@ export const createEnvironment = (
549
578
  instance.name === undefined
550
579
  ? standardSymbols
551
580
  : new Map(
552
- [...standardSymbols].map(([name, symbol]) => [
553
- `${instance.name}!${name}`,
554
- { 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
+ },
555
589
  ]),
556
590
  );
557
591
 
@@ -564,32 +598,41 @@ export const createEnvironment = (
564
598
  const declared = new Set(declarations.map((declaration) => declaration.name));
565
599
  return new Map(
566
600
  [...exported]
567
- .filter(([name]) => !declared.has(name))
568
- .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] => {
569
607
  if (instance.name === undefined) {
570
608
  return [
571
- name,
609
+ entry[0],
572
610
  {
573
- key: getKey(symbol.key, name),
574
- arity: symbol.arity,
575
- params: symbol.params,
576
- 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,
577
615
  range:
578
- 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,
579
621
  },
580
622
  ];
581
623
  }
582
- const qualified = `${instance.name}!${name}`;
624
+ const qualified = `${instance.name}!${entry[0]}`;
583
625
  return [
584
626
  qualified,
585
627
  {
586
- key: getKey(symbol.key, qualified),
587
- arity: symbol.arity + instance.params.length,
588
- 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 && [
589
631
  ...instance.params.map((param) => param.arity),
590
- ...symbol.params,
632
+ ...entry[1].params,
591
633
  ],
592
- kind: symbol.kind,
634
+ kind: entry[1].kind,
635
+ functionArity: declarations.length > 0 ? undefined : entry[1].functionArity,
593
636
  },
594
637
  ];
595
638
  }),
@@ -637,11 +680,11 @@ export const createEnvironment = (
637
680
  const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
638
681
  if (standardSymbols) {
639
682
  if (instance.name === undefined) return [];
640
- return [...standardSymbols].map(([name, symbol]) => {
641
- const forwarded = createArgumentParams(symbol.arity, symbol.params);
683
+ return [...standardSymbols].map((entry) => {
684
+ const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
642
685
  return createLocalAlias(
643
- `${instance.name}!${name}`,
644
- symbol.key,
686
+ `${instance.name}!${entry[0]}`,
687
+ entry[1].key,
645
688
  [...instance.params, ...forwarded],
646
689
  forwarded,
647
690
  location,
@@ -722,16 +765,16 @@ export const createEnvironment = (
722
765
  });
723
766
  const declared = new Set(declarations.map((declaration) => declaration.name));
724
767
  const aliases = [...linked.exported]
725
- .filter(([name]) => !declared.has(name))
726
- .map(([name, symbol]) => {
727
- const key = instantiation.getKey(symbol.key);
728
- 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);
729
772
  const params = [...instance.params, ...ownParams];
730
773
  return createLocalAlias(
731
- instance.name === undefined ? name : `${instance.name}!${name}`,
774
+ instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`,
732
775
  key,
733
776
  params,
734
- key === symbol.key ? ownParams : params,
777
+ key === entry[1].key ? ownParams : params,
735
778
  location,
736
779
  );
737
780
  });
@@ -739,9 +782,9 @@ export const createEnvironment = (
739
782
  };
740
783
 
741
784
  const getAvailableDefinitions = (visible: Symbols) =>
742
- [...visible].flatMap(([name, symbol]) => {
743
- const definition = definitions.get(symbol.key);
744
- return definition ? [{ ...definition, name }] : [];
785
+ [...visible].flatMap((entry) => {
786
+ const definition = definitions.get(entry[1].key);
787
+ return definition ? [{ ...definition, name: entry[0] }] : [];
745
788
  });
746
789
 
747
790
  const javaOverrides = new Map<string, JavaOverride[]>();
@@ -851,6 +894,7 @@ export const createEnvironment = (
851
894
  params: getParamArities(definition),
852
895
  kind: isTheoremDefinition(parsed, definition) ? "Theorem" : "Definition",
853
896
  range: definition.location.range,
897
+ functionArity: getFunctionArity(definition),
854
898
  });
855
899
  const isParameterFree = constants.length === 0 && variables.length === 0;
856
900
  const getKey = (definition: Definition) =>
@@ -890,6 +934,13 @@ export const createEnvironment = (
890
934
  module.definitions.toReversed().map((definition) => [definition.name, definition]),
891
935
  ),
892
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
+ ),
893
944
  instanced,
894
945
  facts,
895
946
  reports,
@@ -910,7 +961,7 @@ export const createEnvironment = (
910
961
  getDefinitionSymbol(definition),
911
962
  ]),
912
963
  ].reduce(
913
- (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])),
914
965
  new Map(visible),
915
966
  );
916
967
  const linkNested = (nested: Module) => {
@@ -951,6 +1002,14 @@ export const createEnvironment = (
951
1002
  visible.set(name, symbol);
952
1003
  if (!instance.isLocal) exported.set(name, symbol);
953
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
+ }
954
1013
  },
955
1014
  })),
956
1015
  ...parsed.modules.map((nested) => ({
@@ -966,6 +1025,13 @@ export const createEnvironment = (
966
1025
  ),
967
1026
  getAvailableDefinitions(visible),
968
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
+ );
969
1035
  scope.errors.push(...resolveModule(module, getUnit(module)));
970
1036
  module.definitions.forEach((definition) => {
971
1037
  const key = getKey(definition);
@@ -1001,7 +1067,7 @@ export const createEnvironment = (
1001
1067
  const checks = instanceChecks
1002
1068
  .splice(firstCheck)
1003
1069
  .map((check) => ({ location: check.location, check: () => checkInstance(check) }));
1004
- scope.levelChecks.push(() =>
1070
+ scope.levelChecks.push(
1005
1071
  checkModuleLevels(
1006
1072
  module,
1007
1073
  {
@@ -1074,7 +1140,7 @@ export const createEnvironment = (
1074
1140
  root: linkedRoot,
1075
1141
  moduleSymbols: new Map([
1076
1142
  ...standardExports,
1077
- ...[...linkedModules].map(([name, linked]): [string, Symbols] => [name, linked.visible]),
1143
+ ...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
1078
1144
  [root.name, linkedRoot.visible],
1079
1145
  ]),
1080
1146
  definitions,
@@ -1125,6 +1191,7 @@ export const createEnvironment = (
1125
1191
  variableIndex,
1126
1192
  facts,
1127
1193
  startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
1194
+ tlcEvalValues: new WeakMap(),
1128
1195
  substitutedDefinitions,
1129
1196
  instanceParams,
1130
1197
  evaluators: new WeakMap(),
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);