tla-ts 0.0.4-dev.a297123 → 0.0.4-dev.b254db0

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 (313) hide show
  1. package/README.md +33 -143
  2. package/dist/deciders.cjs +366 -0
  3. package/dist/deciders.js +366 -0
  4. package/dist/index.cjs +1 -1
  5. package/dist/index.d.cts +35 -1
  6. package/dist/index.d.ts +35 -1
  7. package/dist/index.js +1 -1
  8. package/dist/parallel-worker.cjs +1 -4
  9. package/dist/parallel-worker.js +1 -4
  10. package/dist/prove-worker.cjs +9 -0
  11. package/dist/prove-worker.d.cts +9 -0
  12. package/dist/prove-worker.d.ts +9 -0
  13. package/dist/prove-worker.js +9 -0
  14. package/dist/prove.cjs +996 -0
  15. package/dist/prove.js +996 -0
  16. package/dist/run-cli.cjs +37 -47
  17. package/dist/run-cli.js +37 -47
  18. package/dist/tlapm.cjs +10 -0
  19. package/dist/tlapm.js +10 -0
  20. package/dist/transfer.cjs +38 -44
  21. package/dist/transfer.js +38 -44
  22. package/dist/worker.cjs +21 -0
  23. package/dist/worker.js +21 -0
  24. package/package.json +21 -12
  25. package/src/check.ts +1 -0
  26. package/src/codegen.ts +5 -3
  27. package/src/errors.ts +86 -0
  28. package/src/evaluate.ts +54 -19
  29. package/src/index.ts +10 -0
  30. package/src/{obligation-action.ts → obligations/action.ts} +265 -55
  31. package/src/{obligation-anon.ts → obligations/anon.ts} +47 -37
  32. package/src/obligations/ctx.ts +64 -0
  33. package/src/{obligation-deref.ts → obligations/deref.ts} +38 -61
  34. package/src/{obligation-expression.ts → obligations/expression.ts} +78 -45
  35. package/src/{obligation-format.ts → obligations/format.ts} +7 -8
  36. package/src/{obligation-generate.ts → obligations/generate.ts} +147 -74
  37. package/src/{obligations.ts → obligations/index.ts} +29 -13
  38. package/src/{obligation-levels.ts → obligations/levels.ts} +14 -5
  39. package/src/{obligation-module.ts → obligations/module.ts} +56 -33
  40. package/src/obligations/pickle.ts +98 -0
  41. package/src/obligations/pragma.ts +189 -0
  42. package/src/{obligation-printer.ts → obligations/printer.ts} +22 -80
  43. package/src/{obligation-proof.ts → obligations/proof.ts} +7 -1
  44. package/src/{obligation-source.ts → obligations/source.ts} +159 -97
  45. package/src/obligations/temporal.ts +319 -0
  46. package/src/{obligation-tuples.ts → obligations/tuples.ts} +1 -1
  47. package/src/ocaml-marshal.ts +166 -0
  48. package/src/parallel-worker.ts +2 -18
  49. package/src/parallel.ts +10 -43
  50. package/src/prove/decide-pool.ts +100 -0
  51. package/src/prove/deciders.ts +33 -0
  52. package/src/prove/isabelle/LICENSE +36 -0
  53. package/src/prove/isabelle/LICENSE-tlapm +26 -0
  54. package/src/prove/isabelle/decide.ts +47 -0
  55. package/src/prove/isabelle/encode.ts +503 -0
  56. package/src/prove/isabelle/isar/inner-syntax.ts +579 -0
  57. package/src/prove/isabelle/isar/method.ts +367 -0
  58. package/src/prove/isabelle/isar/proof.ts +28 -0
  59. package/src/prove/isabelle/isar/statement.ts +57 -0
  60. package/src/prove/isabelle/isar/theory.ts +192 -0
  61. package/src/prove/isabelle/isar/type-check.ts +278 -0
  62. package/src/prove/isabelle/provers/blast/blast.ts +258 -0
  63. package/src/prove/isabelle/provers/blast/branch.ts +322 -0
  64. package/src/prove/isabelle/provers/blast/prove.ts +347 -0
  65. package/src/prove/isabelle/provers/blast/rules.ts +330 -0
  66. package/src/prove/isabelle/provers/blast/state.ts +180 -0
  67. package/src/prove/isabelle/provers/blast/term.ts +547 -0
  68. package/src/prove/isabelle/provers/clasimp.ts +150 -0
  69. package/src/prove/isabelle/provers/classical.ts +389 -0
  70. package/src/prove/isabelle/provers/hypsubst.ts +441 -0
  71. package/src/prove/isabelle/pure/bicompose.ts +174 -0
  72. package/src/prove/isabelle/pure/consts.ts +32 -0
  73. package/src/prove/isabelle/pure/conv.ts +79 -0
  74. package/src/prove/isabelle/pure/drule.ts +264 -0
  75. package/src/prove/isabelle/pure/envir.ts +363 -0
  76. package/src/prove/isabelle/pure/goal.ts +53 -0
  77. package/src/prove/isabelle/pure/interrupt.ts +16 -0
  78. package/src/prove/isabelle/pure/list.ts +12 -0
  79. package/src/prove/isabelle/pure/logic.ts +402 -0
  80. package/src/prove/isabelle/pure/name.ts +110 -0
  81. package/src/prove/isabelle/pure/net.ts +262 -0
  82. package/src/prove/isabelle/pure/object-logic.ts +41 -0
  83. package/src/prove/isabelle/pure/pattern.ts +650 -0
  84. package/src/prove/isabelle/pure/raw-simplifier.ts +353 -0
  85. package/src/prove/isabelle/pure/rewriter.ts +602 -0
  86. package/src/prove/isabelle/pure/search.ts +68 -0
  87. package/src/prove/isabelle/pure/seq.ts +156 -0
  88. package/src/prove/isabelle/pure/simplifier.ts +112 -0
  89. package/src/prove/isabelle/pure/table.ts +208 -0
  90. package/src/prove/isabelle/pure/tactic.ts +276 -0
  91. package/src/prove/isabelle/pure/tactical.ts +347 -0
  92. package/src/prove/isabelle/pure/term-ord.ts +159 -0
  93. package/src/prove/isabelle/pure/term.ts +808 -0
  94. package/src/prove/isabelle/pure/thm.ts +806 -0
  95. package/src/prove/isabelle/pure/type.ts +133 -0
  96. package/src/prove/isabelle/pure/unify.ts +753 -0
  97. package/src/prove/isabelle/pure/variable.ts +25 -0
  98. package/src/prove/isabelle/tla/classical-setup.ts +101 -0
  99. package/src/prove/isabelle/tla/context.ts +74 -0
  100. package/src/prove/isabelle/tla/logic-data.ts +5 -0
  101. package/src/prove/isabelle/tla/logic.ts +215 -0
  102. package/src/prove/isabelle/tla/simpdata.ts +241 -0
  103. package/src/prove/isabelle/tools/intuitionistic.ts +132 -0
  104. package/src/prove/ocaml.ts +22 -0
  105. package/src/prove/prep/action.ts +521 -0
  106. package/src/prove/prep/defs.ts +33 -0
  107. package/src/prove/prep/elab.ts +156 -0
  108. package/src/prove/prep/enabled-axioms.ts +189 -0
  109. package/src/prove/prep/enabled.ts +43 -0
  110. package/src/prove/prep/fingerprint.ts +388 -0
  111. package/src/prove/prep/flatten.ts +70 -0
  112. package/src/prove/prep/level-comparison.ts +557 -0
  113. package/src/prove/prep/md5.ts +67 -0
  114. package/src/prove/prep/pragma.ts +221 -0
  115. package/src/prove/prep/trivial.ts +22 -0
  116. package/src/prove/prove-worker.ts +25 -0
  117. package/src/prove/prove.ts +505 -0
  118. package/src/prove/ptl/decide.ts +68 -0
  119. package/src/prove/ptl/encode.ts +256 -0
  120. package/src/prove/ptl/sat.ts +151 -0
  121. package/src/prove/ptl/tableau.ts +276 -0
  122. package/src/prove/smt/axiomatize.ts +69 -0
  123. package/src/prove/smt/axioms.ts +222 -0
  124. package/src/prove/smt/context.ts +108 -0
  125. package/src/prove/smt/data.ts +636 -0
  126. package/src/prove/smt/encode.ts +166 -0
  127. package/src/prove/smt/extensionality.ts +65 -0
  128. package/src/prove/smt/flatten.ts +112 -0
  129. package/src/prove/smt/format.ts +154 -0
  130. package/src/prove/smt/instances.ts +182 -0
  131. package/src/prove/smt/rewrite.ts +773 -0
  132. package/src/prove/smt/simplify.ts +57 -0
  133. package/src/prove/smt/solver/act-cache.ts +265 -0
  134. package/src/prove/smt/solver/arith-rewriter.ts +962 -0
  135. package/src/prove/smt/solver/array.ts +22 -0
  136. package/src/prove/smt/solver/asserted-formulas.ts +469 -0
  137. package/src/prove/smt/solver/ast-lt.ts +157 -0
  138. package/src/prove/smt/solver/ast-util.ts +147 -0
  139. package/src/prove/smt/solver/ast.ts +1315 -0
  140. package/src/prove/smt/solver/auf-solver.ts +572 -0
  141. package/src/prove/smt/solver/case-split-queue.ts +178 -0
  142. package/src/prove/smt/solver/cg-table.ts +175 -0
  143. package/src/prove/smt/solver/clause.ts +276 -0
  144. package/src/prove/smt/solver/conflict-resolution.ts +343 -0
  145. package/src/prove/smt/solver/context.ts +1292 -0
  146. package/src/prove/smt/solver/ctx-simplify.ts +334 -0
  147. package/src/prove/smt/solver/der.ts +224 -0
  148. package/src/prove/smt/solver/dyn-ack.ts +141 -0
  149. package/src/prove/smt/solver/e-matching.ts +659 -0
  150. package/src/prove/smt/solver/enode.ts +259 -0
  151. package/src/prove/smt/solver/expr-ref.ts +21 -0
  152. package/src/prove/smt/solver/expr-safe-replace.ts +172 -0
  153. package/src/prove/smt/solver/fingerprints.ts +92 -0
  154. package/src/prove/smt/solver/flat-literals.ts +51 -0
  155. package/src/prove/smt/solver/goal.ts +138 -0
  156. package/src/prove/smt/solver/hash.ts +173 -0
  157. package/src/prove/smt/solver/hashtable.ts +166 -0
  158. package/src/prove/smt/solver/internalizer.ts +1381 -0
  159. package/src/prove/smt/solver/lbool.ts +5 -0
  160. package/src/prove/smt/solver/literal.ts +24 -0
  161. package/src/prove/smt/solver/lp/bound-propagator.ts +391 -0
  162. package/src/prove/smt/solver/lp/constraints.ts +78 -0
  163. package/src/prove/smt/solver/lp/containers.ts +296 -0
  164. package/src/prove/smt/solver/lp/core-solver.ts +504 -0
  165. package/src/prove/smt/solver/lp/cross-nested.ts +224 -0
  166. package/src/prove/smt/solver/lp/dep-intervals.ts +656 -0
  167. package/src/prove/smt/solver/lp/dependency.ts +51 -0
  168. package/src/prove/smt/solver/lp/dioph-eq.ts +1181 -0
  169. package/src/prove/smt/solver/lp/explanation.ts +46 -0
  170. package/src/prove/smt/solver/lp/gomory.ts +255 -0
  171. package/src/prove/smt/solver/lp/hnf-cutter.ts +125 -0
  172. package/src/prove/smt/solver/lp/hnf.ts +281 -0
  173. package/src/prove/smt/solver/lp/int-cube.ts +295 -0
  174. package/src/prove/smt/solver/lp/int-solver.ts +514 -0
  175. package/src/prove/smt/solver/lp/lar-solver.ts +816 -0
  176. package/src/prove/smt/solver/lp/lar-term.ts +62 -0
  177. package/src/prove/smt/solver/lp/lp-settings.ts +91 -0
  178. package/src/prove/smt/solver/lp/maximize-term.ts +347 -0
  179. package/src/prove/smt/solver/lp/nex-creator.ts +381 -0
  180. package/src/prove/smt/solver/lp/nex.ts +120 -0
  181. package/src/prove/smt/solver/lp/nla-backoff.ts +43 -0
  182. package/src/prove/smt/solver/lp/nla-basics.ts +398 -0
  183. package/src/prove/smt/solver/lp/nla-core.ts +968 -0
  184. package/src/prove/smt/solver/lp/nla-divisions.ts +332 -0
  185. package/src/prove/smt/solver/lp/nla-emonics.ts +373 -0
  186. package/src/prove/smt/solver/lp/nla-factorization.ts +30 -0
  187. package/src/prove/smt/solver/lp/nla-grobner.ts +904 -0
  188. package/src/prove/smt/solver/lp/nla-horner.ts +126 -0
  189. package/src/prove/smt/solver/lp/nla-intervals.ts +265 -0
  190. package/src/prove/smt/solver/lp/nla-monomial-bounds.ts +715 -0
  191. package/src/prove/smt/solver/lp/nla-monotone.ts +59 -0
  192. package/src/prove/smt/solver/lp/nla-order.ts +307 -0
  193. package/src/prove/smt/solver/lp/nla-patcher.ts +112 -0
  194. package/src/prove/smt/solver/lp/nla-tangents.ts +251 -0
  195. package/src/prove/smt/solver/lp/nla-throttle.ts +85 -0
  196. package/src/prove/smt/solver/lp/nla-types.ts +124 -0
  197. package/src/prove/smt/solver/lp/nla-var-eqs.ts +141 -0
  198. package/src/prove/smt/solver/lp/nra-solver.ts +440 -0
  199. package/src/prove/smt/solver/lp/numeric-pair.ts +65 -0
  200. package/src/prove/smt/solver/lp/pdd-interval.ts +31 -0
  201. package/src/prove/smt/solver/lp/pdd-simplifier.ts +184 -0
  202. package/src/prove/smt/solver/lp/pdd-solver.ts +408 -0
  203. package/src/prove/smt/solver/lp/pdd.ts +971 -0
  204. package/src/prove/smt/solver/lp/random-updater.ts +138 -0
  205. package/src/prove/smt/solver/lp/static-matrix.ts +246 -0
  206. package/src/prove/smt/solver/lp/union-find.ts +96 -0
  207. package/src/prove/smt/solver/mam-compiler.ts +847 -0
  208. package/src/prove/smt/solver/mam-interpreter.ts +400 -0
  209. package/src/prove/smt/solver/maximize-ac-sharing.ts +118 -0
  210. package/src/prove/smt/solver/model-checker.ts +347 -0
  211. package/src/prove/smt/solver/model-evaluator.ts +262 -0
  212. package/src/prove/smt/solver/model-finder.ts +155 -0
  213. package/src/prove/smt/solver/model-generator.ts +97 -0
  214. package/src/prove/smt/solver/model-macro-solver.ts +728 -0
  215. package/src/prove/smt/solver/nlsat/algebraic.ts +1161 -0
  216. package/src/prove/smt/solver/nlsat/atoms.ts +238 -0
  217. package/src/prove/smt/solver/nlsat/evaluator.ts +303 -0
  218. package/src/prove/smt/solver/nlsat/explain.ts +607 -0
  219. package/src/prove/smt/solver/nlsat/interval-set.ts +351 -0
  220. package/src/prove/smt/solver/nlsat/levelwise.ts +740 -0
  221. package/src/prove/smt/solver/nlsat/mpbq.ts +161 -0
  222. package/src/prove/smt/solver/nlsat/polynomial.ts +1722 -0
  223. package/src/prove/smt/solver/nlsat/solver.ts +911 -0
  224. package/src/prove/smt/solver/nlsat/types.ts +43 -0
  225. package/src/prove/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
  226. package/src/prove/smt/solver/nlsat/upolynomial.ts +996 -0
  227. package/src/prove/smt/solver/nnf.ts +469 -0
  228. package/src/prove/smt/solver/pattern-inference.ts +351 -0
  229. package/src/prove/smt/solver/poly-rewriter.ts +477 -0
  230. package/src/prove/smt/solver/propagate-values.ts +83 -0
  231. package/src/prove/smt/solver/proto-model.ts +551 -0
  232. package/src/prove/smt/solver/pull-quant.ts +139 -0
  233. package/src/prove/smt/solver/qe-lite-der.ts +526 -0
  234. package/src/prove/smt/solver/qe-lite-fm.ts +576 -0
  235. package/src/prove/smt/solver/qe-lite.ts +381 -0
  236. package/src/prove/smt/solver/qi-queue.ts +362 -0
  237. package/src/prove/smt/solver/quant-tactics.ts +117 -0
  238. package/src/prove/smt/solver/quantifier-analyzer.ts +562 -0
  239. package/src/prove/smt/solver/quantifier-manager.ts +186 -0
  240. package/src/prove/smt/solver/random-gen.ts +10 -0
  241. package/src/prove/smt/solver/rational.ts +165 -0
  242. package/src/prove/smt/solver/ref-vector.ts +62 -0
  243. package/src/prove/smt/solver/relevancy.ts +247 -0
  244. package/src/prove/smt/solver/rewriter-tpl.ts +1159 -0
  245. package/src/prove/smt/solver/rewriter.ts +843 -0
  246. package/src/prove/smt/solver/rlimit.ts +79 -0
  247. package/src/prove/smt/solver/smtlib-parser.ts +526 -0
  248. package/src/prove/smt/solver/solver.ts +71 -0
  249. package/src/prove/smt/solver/sort.ts +35 -0
  250. package/src/prove/smt/solver/sticky-generations.ts +69 -0
  251. package/src/prove/smt/solver/theory-lra-axioms.ts +340 -0
  252. package/src/prove/smt/solver/theory-lra-bounds.ts +226 -0
  253. package/src/prove/smt/solver/theory-lra-final-check.ts +252 -0
  254. package/src/prove/smt/solver/theory-lra-internalize.ts +476 -0
  255. package/src/prove/smt/solver/theory-lra-model.ts +243 -0
  256. package/src/prove/smt/solver/theory-lra-propagate.ts +405 -0
  257. package/src/prove/smt/solver/theory-lra-state.ts +43 -0
  258. package/src/prove/smt/solver/theory-lra.ts +56 -0
  259. package/src/prove/smt/solver/var-subst.ts +258 -0
  260. package/src/prove/smt/solver/z3-license.txt +10 -0
  261. package/src/prove/smt/table.ts +170 -0
  262. package/src/prove/tlapm/tlapm.ts +96 -0
  263. package/src/prove/tlaps-module.ts +510 -0
  264. package/src/prove/verdict.ts +18 -0
  265. package/src/prove/zenon/LICENSE +32 -0
  266. package/src/prove/zenon/check/check.ts +105 -0
  267. package/src/prove/zenon/check/definitions.ts +144 -0
  268. package/src/prove/zenon/check/equality.ts +182 -0
  269. package/src/prove/zenon/check/functions.ts +62 -0
  270. package/src/prove/zenon/check/keys.ts +125 -0
  271. package/src/prove/zenon/check/propositional.ts +104 -0
  272. package/src/prove/zenon/check/records.ts +188 -0
  273. package/src/prove/zenon/check/relations.ts +121 -0
  274. package/src/prove/zenon/check/rewrites.ts +224 -0
  275. package/src/prove/zenon/check/sets.ts +302 -0
  276. package/src/prove/zenon/check/terms.ts +127 -0
  277. package/src/prove/zenon/check/tla.ts +126 -0
  278. package/src/prove/zenon/decide.ts +113 -0
  279. package/src/prove/zenon/encode.ts +437 -0
  280. package/src/prove/zenon/eqrel.ts +300 -0
  281. package/src/prove/zenon/equality-rules.ts +435 -0
  282. package/src/prove/zenon/expr.ts +551 -0
  283. package/src/prove/zenon/index-table.ts +350 -0
  284. package/src/prove/zenon/isar-case.ts +513 -0
  285. package/src/prove/zenon/isar.ts +1249 -0
  286. package/src/prove/zenon/limits.ts +15 -0
  287. package/src/prove/zenon/llproof.ts +173 -0
  288. package/src/prove/zenon/mltoll.ts +1566 -0
  289. package/src/prove/zenon/node.ts +297 -0
  290. package/src/prove/zenon/ocaml.ts +169 -0
  291. package/src/prove/zenon/parse.ts +247 -0
  292. package/src/prove/zenon/phrase.ts +191 -0
  293. package/src/prove/zenon/proof.ts +198 -0
  294. package/src/prove/zenon/propositional-rules.ts +387 -0
  295. package/src/prove/zenon/rules.ts +94 -0
  296. package/src/prove/zenon/search.ts +288 -0
  297. package/src/prove/zenon/tla/functions.ts +151 -0
  298. package/src/prove/zenon/tla/llproof.ts +480 -0
  299. package/src/prove/zenon/tla/records.ts +225 -0
  300. package/src/prove/zenon/tla/rewrites.ts +447 -0
  301. package/src/prove/zenon/tla/sets.ts +304 -0
  302. package/src/prove/zenon/tla/terms.ts +181 -0
  303. package/src/prove/zenon/tla/tla.ts +506 -0
  304. package/src/run-cli.ts +334 -75
  305. package/src/standard-modules.ts +5 -2
  306. package/src/successors.ts +24 -5
  307. package/src/tlapm-cache.ts +236 -0
  308. package/src/tlc-random.ts +55 -32
  309. package/src/tlc-version.ts +8 -7
  310. package/src/values.ts +80 -35
  311. package/src/worker.ts +65 -0
  312. package/dist/parallel.cjs +0 -12
  313. package/dist/parallel.js +0 -12
@@ -1,7 +1,7 @@
1
1
  // A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon): names become de Bruijn
2
2
  // indices into the context, builtin definitions are inlined, and anonymous steps get names.
3
3
 
4
- import { TlapmBugError, TlaProofError } from "./errors";
4
+ import { TlapmBugError, TlaProofError } from "../errors";
5
5
  import {
6
6
  adjoin,
7
7
  adjoinAll,
@@ -35,8 +35,9 @@ import {
35
35
  type Selector,
36
36
  type Sequent,
37
37
  type WhereDefined,
38
- } from "./obligation-expression";
39
- import { resolveSubexpression } from "./obligation-deref";
38
+ } from "./expression";
39
+ import { resolveSubexpression } from "./deref";
40
+ import { getTime } from "./temporal";
40
41
  import {
41
42
  getStepName,
42
43
  getUnique,
@@ -46,12 +47,13 @@ import {
46
47
  type StepNumber,
47
48
  type UseDef,
48
49
  type Usable,
49
- } from "./obligation-proof";
50
+ } from "./proof";
50
51
 
51
52
  const DUMMY_FACT: Hyp = {
52
53
  kind: "Fact",
53
54
  expression: { kind: "At", isExcept: false },
54
55
  visibility: "Visible",
56
+ time: "Always",
55
57
  };
56
58
 
57
59
  const ANON_SELECTOR_FAILURES = {
@@ -61,7 +63,7 @@ const ANON_SELECTOR_FAILURES = {
61
63
  Instance: "1INST",
62
64
  Left: "1",
63
65
  Right: "1",
64
- } as const;
66
+ };
65
67
 
66
68
  const BAD_EXPRESSION: Expr = { kind: "Opaque", name: "$badexp" };
67
69
 
@@ -81,6 +83,8 @@ export const createAnonymizer = (
81
83
  // Elab.desugar's current_at: the value @ stands for inside an EXCEPT, and the context size there.
82
84
  let currentAt: { expression: Expr; size: number } | undefined;
83
85
 
86
+ const getContext = (scope: Scope | undefined): AnonContext => ({ warnedSteps: [], scope });
87
+
84
88
  const getSize = (context: AnonContext) => context.scope?.size ?? 0;
85
89
 
86
90
  const expr = (context: AnonContext, expression: Expr): Expr => {
@@ -217,7 +221,7 @@ export const createAnonymizer = (
217
221
  mapSelectorArgs(selector, (arg) => expr(context, arg)),
218
222
  );
219
223
  const args = inner.args.map((arg) => expr(context, arg));
220
- const bangContext = { warnedSteps: [], scope: context.scope };
224
+ const bangContext = getContext(context.scope);
221
225
  return resolveBang(bangContext, inner.operator.name, args, selectors, false, expression);
222
226
  }
223
227
  return expr(context, {
@@ -273,13 +277,15 @@ export const createAnonymizer = (
273
277
  const adjoinContext = (context: AnonContext, hyp: Hyp) =>
274
278
  withScope(context, adjoin(context.scope, hyp));
275
279
 
276
- const bounds = (context: AnonContext, items: Bound[]): [AnonContext, Bound[]] => {
277
- const mapped = mapBoundDomains(items, (domain) => expr(context, domain));
278
- const inner = mapped.reduce(
280
+ const adjoinBounds = (context: AnonContext, items: Bound[]) =>
281
+ items.reduce(
279
282
  (current, bound) => adjoinContext(current, getFresh(bound.name, bound.level)),
280
283
  context,
281
284
  );
282
- return [inner, mapped];
285
+
286
+ const bounds = (context: AnonContext, items: Bound[]): [AnonContext, Bound[]] => {
287
+ const mapped = mapBoundDomains(items, (domain) => expr(context, domain));
288
+ return [adjoinBounds(context, mapped), mapped];
283
289
  };
284
290
 
285
291
  // Visit.map, apart from the definitions an ASSUME or a LET binds.
@@ -331,6 +337,7 @@ export const createAnonymizer = (
331
337
  whereDefined: "User",
332
338
  visibility: "Visible",
333
339
  isLocal: true,
340
+ isConstnessUnset: true,
334
341
  });
335
342
  mapped.push(result);
336
343
  }
@@ -346,8 +353,10 @@ export const createAnonymizer = (
346
353
  return item;
347
354
  case "Defn":
348
355
  return { ...item, definition: defn(context, item.definition) };
349
- case "Fact":
350
- return { ...item, expression: expr(context, item.expression) };
356
+ case "Fact": {
357
+ const expression = expr(context, item.expression);
358
+ return { ...item, expression, time: getTime(context.scope, expression) };
359
+ }
351
360
  }
352
361
  })();
353
362
  return [adjoinContext(context, mapped), mapped];
@@ -363,13 +372,14 @@ export const createAnonymizer = (
363
372
  scope: context.scope,
364
373
  });
365
374
 
366
- const adjStep = (context: AnonContext, step: StepNumber, body: Expr, from: Step) =>
375
+ const adjoinStep = (context: AnonContext, step: StepNumber, body: Expr, from: Step) =>
367
376
  adjoinContext(context, {
368
377
  kind: "Defn",
369
378
  definition: { kind: "Operator", name: getStepName(step), body, location: from.location },
370
- whereDefined: "Proof",
379
+ whereDefined: { kind: "Proof", time: "Always" },
371
380
  visibility: "Visible",
372
381
  isLocal: true,
382
+ isConstnessUnset: true,
373
383
  location: from.location,
374
384
  });
375
385
 
@@ -458,22 +468,22 @@ export const createAnonymizer = (
458
468
  const [, mapped] = sequent(context, item.sequent);
459
469
  const assumptions = mapped.context.reduce(adjoinContext, context);
460
470
  const withTuple = bumpContext(
461
- adjStep(bumpContext(assumptions, 1), number, at(tupleForm(mapped), item), item),
471
+ adjoinStep(bumpContext(assumptions, 1), number, at(tupleForm(mapped), item), item),
462
472
  1,
463
473
  );
464
474
  const inner = mapped.context.length === 0 ? pushWarnedStep(withTuple, number) : withTuple;
465
475
  const result: Step = { ...item, sequent: mapped, proof: proof(inner, item.proof) };
466
476
  return [
467
- bumpContext(adjStep(context, number, at(exprifySequent(mapped), item), item), 1),
477
+ bumpContext(adjoinStep(context, number, at(exprifySequent(mapped), item), item), 1),
468
478
  result,
469
479
  ];
470
480
  }
471
481
  case "Pcase": {
472
482
  const expression = expr(context, item.expression);
473
483
  const tuple = at({ kind: "Tuple", elements: [shiftExpr(2, expression)] }, item);
474
- const inner = bumpContext(adjStep(bumpContext(context, 2), number, tuple, item), 1);
484
+ const inner = bumpContext(adjoinStep(bumpContext(context, 2), number, tuple, item), 1);
475
485
  const result: Step = { ...item, expression, proof: proof(inner, item.proof) };
476
- const after = adjStep(
486
+ const after = adjoinStep(
477
487
  context,
478
488
  number,
479
489
  at({ kind: "Tuple", elements: [expression] }, item),
@@ -484,17 +494,20 @@ export const createAnonymizer = (
484
494
  case "Suffices": {
485
495
  const [, mapped] = sequent(context, item.sequent);
486
496
  const fact = at({ kind: "Tuple", elements: [at(exprifySequent(mapped), item)] }, item);
487
- const inner = bumpContext(adjStep(context, number, fact, item), 1);
497
+ const inner = bumpContext(adjoinStep(context, number, fact, item), 1);
488
498
  const result: Step = { ...item, sequent: mapped, proof: proof(inner, item.proof) };
489
499
  const assumptions = mapped.context.reduce(adjoinContext, context);
490
500
  const tuple = at({ kind: "Tuple", elements: [at(tupleForm(mapped), item)] }, item);
491
- return [bumpContext(adjStep(bumpContext(assumptions, 1), number, tuple, item), 1), result];
501
+ return [
502
+ bumpContext(adjoinStep(bumpContext(assumptions, 1), number, tuple, item), 1),
503
+ result,
504
+ ];
492
505
  }
493
506
  case "Have": {
494
507
  const expression = expr(context, item.expression);
495
508
  const tuple = at({ kind: "Tuple", elements: [shiftExpr(2, expression)] }, item);
496
509
  return [
497
- bumpContext(adjStep(bumpContext(context, 2), number, tuple, item), 1),
510
+ bumpContext(adjoinStep(bumpContext(context, 2), number, tuple, item), 1),
498
511
  { ...item, expression },
499
512
  ];
500
513
  }
@@ -505,7 +518,7 @@ export const createAnonymizer = (
505
518
  item,
506
519
  );
507
520
  return [
508
- bumpContext(adjStep(bumpContext(inner, 1), number, universal, item), 1),
521
+ bumpContext(adjoinStep(bumpContext(inner, 1), number, universal, item), 1),
509
522
  { ...item, bounds: mapped },
510
523
  ];
511
524
  }
@@ -513,7 +526,7 @@ export const createAnonymizer = (
513
526
  const expressions = item.expressions.map((expression) => expr(context, expression));
514
527
  const tuple = at({ kind: "Tuple", elements: expressions }, item);
515
528
  return [
516
- bumpContext(adjStep(bumpContext(context, 1), number, tuple, item), 1),
529
+ bumpContext(adjoinStep(bumpContext(context, 1), number, tuple, item), 1),
517
530
  { ...item, expressions },
518
531
  ];
519
532
  }
@@ -525,7 +538,7 @@ export const createAnonymizer = (
525
538
  item,
526
539
  );
527
540
  const inner = pushWarnedStep(
528
- bumpContext(adjStep(bumpContext(context, 1), number, existential, item), 1),
541
+ bumpContext(adjoinStep(bumpContext(context, 1), number, existential, item), 1),
529
542
  number,
530
543
  );
531
544
  const result: Step = {
@@ -534,12 +547,12 @@ export const createAnonymizer = (
534
547
  expression,
535
548
  proof: proof(inner, item.proof),
536
549
  };
537
- const declared = mapped.reduce(
538
- (current, bound) => adjoinContext(current, getFresh(bound.name, bound.level)),
539
- bumpContext(context, 2),
540
- );
550
+ const declared = adjoinBounds(bumpContext(context, 2), mapped);
541
551
  const shifted = shiftExpr(4 + mapped.length, existential);
542
- return [bumpContext(adjStep(bumpContext(declared, 2), number, shifted, item), 1), result];
552
+ return [
553
+ bumpContext(adjoinStep(bumpContext(declared, 2), number, shifted, item), 1),
554
+ result,
555
+ ];
543
556
  }
544
557
  case "Use": {
545
558
  const mapped = usable(context, item.usable);
@@ -557,14 +570,11 @@ export const createAnonymizer = (
557
570
  };
558
571
 
559
572
  return {
560
- expr: (scope: Scope | undefined, expression: Expr) =>
561
- expr({ warnedSteps: [], scope }, expression),
562
- defn: (scope: Scope | undefined, definition: Defn) =>
563
- defn({ warnedSteps: [], scope }, definition),
564
- sequent: (scope: Scope | undefined, item: Sequent) =>
565
- sequent({ warnedSteps: [], scope }, item)[1],
566
- usable: (scope: Scope | undefined, item: Usable) => usable({ warnedSteps: [], scope }, item),
567
- proof: (scope: Scope | undefined, item: Proof) => proof({ warnedSteps: [], scope }, item),
573
+ expr: (scope: Scope | undefined, expression: Expr) => expr(getContext(scope), expression),
574
+ defn: (scope: Scope | undefined, definition: Defn) => defn(getContext(scope), definition),
575
+ sequent: (scope: Scope | undefined, item: Sequent) => sequent(getContext(scope), item)[1],
576
+ usable: (scope: Scope | undefined, item: Usable) => usable(getContext(scope), item),
577
+ proof: (scope: Scope | undefined, item: Proof) => proof(getContext(scope), item),
568
578
  };
569
579
  };
570
580
 
@@ -0,0 +1,64 @@
1
+ // tlapm's Ctx, which names each binder apart from the names in scope by adding a salt, as a
2
+ // mutable stack: printers bind and unbind names in strict nesting order.
3
+
4
+ interface Ident {
5
+ rep: string;
6
+ salt: number;
7
+ }
8
+
9
+ export interface Context {
10
+ stack: Ident[];
11
+ idents: Map<string, Ident[]>;
12
+ defined: Map<string, number>;
13
+ }
14
+
15
+ const getIdentName = (ident: Ident) =>
16
+ ident.salt === 0 ? ident.rep : `${ident.rep}_${ident.salt}`;
17
+
18
+ export const createContext = (): Context => ({
19
+ stack: [],
20
+ idents: new Map(),
21
+ defined: new Map(),
22
+ });
23
+
24
+ // The name of the binder index places in, counting from 1 for the innermost.
25
+ export const getBoundName = (context: Context, index: number) => {
26
+ const ident = context.stack[context.stack.length - index];
27
+ return ident && getIdentName(ident);
28
+ };
29
+
30
+ export const pushName = (context: Context, rep: string) => {
31
+ const previous = context.idents.get(rep)?.at(-1);
32
+ let ident: Ident = previous ? { rep, salt: previous.salt + 1 } : { rep, salt: 0 };
33
+ while (context.defined.has(getIdentName(ident))) ident = { rep, salt: ident.salt + 1 };
34
+ context.stack.push(ident);
35
+ const idents = context.idents.get(rep);
36
+ if (idents) idents.push(ident);
37
+ else context.idents.set(rep, [ident]);
38
+ const key = getIdentName(ident);
39
+ context.defined.set(key, (context.defined.get(key) ?? 0) + 1);
40
+ return key;
41
+ };
42
+
43
+ export const popNames = (context: Context, count: number) => {
44
+ for (let index = 0; index < count; index++) {
45
+ const ident = context.stack.pop();
46
+ if (!ident) return;
47
+ context.idents.get(ident.rep)?.pop();
48
+ const key = getIdentName(ident);
49
+ const remaining = (context.defined.get(key) ?? 1) - 1;
50
+ if (remaining === 0) context.defined.delete(key);
51
+ else context.defined.set(key, remaining);
52
+ }
53
+ };
54
+
55
+ export const withNames = <Result>(
56
+ context: Context,
57
+ names: string[],
58
+ body: (idents: string[]) => Result,
59
+ ) => {
60
+ const idents = names.map((name) => pushName(context, name));
61
+ const result = body(idents);
62
+ popNames(context, names.length);
63
+ return result;
64
+ };
@@ -1,7 +1,7 @@
1
1
  // A port of tlapm's Expr.Deref: a subexpression reference such as Op!2!<< resolves to the
2
2
  // subexpression it names, abstracted over the bound names it uses.
3
3
 
4
- import { TlaProofError, TlapmBugError } from "./errors";
4
+ import { TlaProofError, TlapmBugError } from "../errors";
5
5
  import {
6
6
  at,
7
7
  consAll,
@@ -20,7 +20,7 @@ import {
20
20
  type ObligationWarning,
21
21
  type Param,
22
22
  type Selector,
23
- } from "./obligation-expression";
23
+ } from "./expression";
24
24
 
25
25
  interface Deref {
26
26
  params: Param[];
@@ -245,7 +245,6 @@ const abstract = (
245
245
 
246
246
  const getNumbered = (
247
247
  onWarning: (warning: ObligationWarning) => void,
248
- definitions: Defn[],
249
248
  expression: Expr,
250
249
  position: number,
251
250
  origin: Expr,
@@ -260,7 +259,10 @@ const getNumbered = (
260
259
  checkAtMost(items.length);
261
260
  return items[position - 1];
262
261
  };
263
- const result = ((): [Defn[], Expr] => {
262
+ if (expression.kind === "With") {
263
+ return getNumbered(onWarning, expression.expression, position, origin, message);
264
+ }
265
+ const result = ((): Expr => {
264
266
  switch (expression.kind) {
265
267
  case "Sequent": {
266
268
  const sequent = expression.sequent;
@@ -287,102 +289,78 @@ const getNumbered = (
287
289
  { failure: "Expr.Deref.deref_num" },
288
290
  );
289
291
  }
290
- return [definitions, shifted];
292
+ return shifted;
291
293
  }
292
294
  case "Apply":
293
- return [definitions, pick(expression.args)];
294
- case "With":
295
- return getNumbered(
296
- onWarning,
297
- definitions,
298
- expression.expression,
299
- position,
300
- origin,
301
- message,
302
- );
295
+ return pick(expression.args);
303
296
  case "If":
304
- return [
305
- definitions,
306
- pick([expression.condition, expression.consequent, expression.alternative]),
307
- ];
297
+ return pick([expression.condition, expression.consequent, expression.alternative]);
308
298
  case "List":
309
- return [definitions, pick(expression.items)];
299
+ return pick(expression.items);
310
300
  case "SetEnum":
311
301
  case "Tuple":
312
- return [definitions, pick(expression.elements)];
302
+ return pick(expression.elements);
313
303
  case "Product":
314
- return [definitions, pick(expression.factors)];
304
+ return pick(expression.factors);
315
305
  case "Let":
316
306
  checkAtMost(1);
317
- return [[...definitions, ...expression.definitions], expression.body];
307
+ return expression.body;
318
308
  case "Quant":
319
309
  case "SetOf":
320
310
  case "Fcn":
321
- return [
322
- definitions,
323
- pick(
324
- expression.bounds.flatMap((bound) =>
325
- bound.domain.kind === "Domain" ? [bound.domain.expression] : [],
326
- ),
311
+ return pick(
312
+ expression.bounds.flatMap((bound) =>
313
+ bound.domain.kind === "Domain" ? [bound.domain.expression] : [],
327
314
  ),
328
- ];
315
+ );
329
316
  case "Choose":
330
317
  case "SetSt":
331
318
  if (!expression.domain) break;
332
- return [definitions, pick([expression.domain])];
319
+ return pick([expression.domain]);
333
320
  case "Arrow":
334
- return [definitions, pick([expression.domain, expression.range])];
321
+ return pick([expression.domain, expression.range]);
335
322
  case "FcnApp": {
336
323
  const argument =
337
324
  expression.args.length === 1
338
325
  ? expression.args[0]
339
326
  : at({ kind: "Tuple", elements: expression.args }, expression);
340
- return [definitions, pick([expression.function, argument])];
327
+ return pick([expression.function, argument]);
341
328
  }
342
329
  case "Rect":
343
330
  case "Record":
344
- return [definitions, pick(expression.fields.map((field) => field.value))];
331
+ return pick(expression.fields.map((field) => field.value));
345
332
  case "Dot":
346
- return [
347
- definitions,
348
- pick([
349
- expression.expression,
350
- at({ kind: "String", value: expression.field }, expression),
351
- ]),
352
- ];
333
+ return pick([
334
+ expression.expression,
335
+ at({ kind: "String", value: expression.field }, expression),
336
+ ]);
353
337
  case "Except":
354
- return [
355
- definitions,
356
- pick([expression.function, ...expression.specs.map((spec) => spec.value)]),
357
- ];
338
+ return pick([expression.function, ...expression.specs.map((spec) => spec.value)]);
358
339
  case "Sub":
359
340
  case "Tsub":
360
- return [definitions, pick([expression.action, expression.subscript])];
341
+ return pick([expression.action, expression.subscript]);
361
342
  case "Fair":
362
- return [definitions, pick([expression.subscript, expression.action])];
343
+ return pick([expression.subscript, expression.action]);
363
344
  case "Case":
364
- return [
365
- definitions,
366
- pick([
367
- ...expression.arms.map((arm) =>
368
- at({ kind: "Tuple", elements: [arm.condition, arm.body] }, arm.body),
369
- ),
370
- ...(expression.other
371
- ? [at({ kind: "Tuple", elements: [BAD, expression.other] }, expression.other)]
372
- : []),
373
- ]),
374
- ];
345
+ return pick([
346
+ ...expression.arms.map((arm) =>
347
+ at({ kind: "Tuple", elements: [arm.condition, arm.body] }, arm.body),
348
+ ),
349
+ ...(expression.other
350
+ ? [at({ kind: "Tuple", elements: [BAD, expression.other] }, expression.other)]
351
+ : []),
352
+ ]);
375
353
  }
376
354
  const emptyMessage = "Expression has no subexpressions";
377
355
  onWarning(getErrorNote(expression.location, emptyMessage));
378
356
  throw new TlaProofError(emptyMessage, { failure: "Expr.Deref.deref_num" });
379
357
  })();
380
- if (isBad(result[1])) {
358
+ if (isBad(result)) {
381
359
  const badMessage = `Cannot resolve subexpression reference !${position}`;
382
360
  onWarning(getErrorNote(expression.location, badMessage));
383
361
  throw new TlaProofError(badMessage, { failure: "Expr.Deref.deref_num" });
384
362
  }
385
- return result;
363
+ return [expression.kind === "Let" ? expression.definitions : [], result];
386
364
  };
387
365
 
388
366
  // Reorders label arguments given in source order to the order of the label's de Bruijn indices.
@@ -547,7 +525,6 @@ const deref = (
547
525
  const numbered = (position: number, message: string) => {
548
526
  const [definitions, inner] = getNumbered(
549
527
  onWarning,
550
- [],
551
528
  expression,
552
529
  position,
553
530
  state.expression,