tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b

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 (390) hide show
  1. package/README.md +7 -0
  2. package/dist/compile.cjs +3 -3
  3. package/dist/compile.js +3 -3
  4. package/dist/deciders.cjs +28 -28
  5. package/dist/deciders.js +52 -52
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +105 -10
  8. package/dist/index.d.ts +105 -10
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +116 -36
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +1 -1
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +129 -104
  21. package/dist/transfer.js +129 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +1 -1
  25. package/src/ast.ts +4 -23
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +40 -78
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check.ts +564 -366
  30. package/src/cli/options.ts +10 -5
  31. package/src/cli/run.ts +0 -2
  32. package/src/cli/runtime-invariants.ts +136 -0
  33. package/src/cli/shared.ts +18 -11
  34. package/src/cli/tlapm.ts +0 -12
  35. package/src/cli/tlc-arguments.ts +640 -0
  36. package/src/cli/tlc-usage.ts +361 -0
  37. package/src/cli/tlc.ts +525 -216
  38. package/src/cli/typescript.ts +0 -3
  39. package/src/cli/xml-exporter.ts +4 -16
  40. package/src/cli.ts +0 -1
  41. package/src/codegen.ts +191 -64
  42. package/src/config.ts +140 -109
  43. package/src/coverage.ts +837 -0
  44. package/src/dependencies.ts +6 -40
  45. package/src/dfid.ts +618 -0
  46. package/src/environment.ts +237 -119
  47. package/src/errors.ts +56 -56
  48. package/src/evaluate.ts +543 -341
  49. package/src/exit-codes.ts +37 -3
  50. package/src/fingerprints.ts +10 -10
  51. package/src/index.ts +3 -0
  52. package/src/instances.ts +38 -31
  53. package/src/java-overrides.ts +4 -19
  54. package/src/json-reader.ts +455 -0
  55. package/src/json.ts +255 -139
  56. package/src/levels.ts +8 -17
  57. package/src/lexer.ts +80 -100
  58. package/src/liveness-checker.ts +77 -117
  59. package/src/liveness.ts +106 -62
  60. package/src/obligations/action.ts +4 -28
  61. package/src/obligations/anonymize.ts +84 -80
  62. package/src/obligations/equality.ts +1 -1
  63. package/src/obligations/expression.ts +2 -19
  64. package/src/obligations/format.ts +1 -9
  65. package/src/obligations/generate.ts +1 -11
  66. package/src/obligations/index.ts +0 -11
  67. package/src/obligations/levels.ts +4 -8
  68. package/src/obligations/module.ts +1 -15
  69. package/src/obligations/normalize.ts +5 -24
  70. package/src/obligations/operators.ts +1 -2
  71. package/src/obligations/pragma.ts +1 -10
  72. package/src/obligations/printer.ts +47 -46
  73. package/src/obligations/proof.ts +1 -5
  74. package/src/obligations/regroup.ts +1 -4
  75. package/src/obligations/simplify.ts +3 -14
  76. package/src/obligations/source.ts +1 -21
  77. package/src/obligations/subexpression.ts +5 -11
  78. package/src/obligations/substitution.ts +1 -3
  79. package/src/obligations/temporal.ts +8 -14
  80. package/src/obligations/tuples.ts +3 -9
  81. package/src/parallel-worker.ts +24 -33
  82. package/src/parallel.ts +48 -40
  83. package/src/parser.ts +565 -282
  84. package/src/pcal/ast.ts +53 -86
  85. package/src/pcal/parse.ts +144 -219
  86. package/src/pcal/tokenize.ts +91 -131
  87. package/src/pcal/translate.ts +83 -130
  88. package/src/pcal/validate.ts +48 -68
  89. package/src/pretty-print.ts +7 -8
  90. package/src/prover/decide-pool.ts +5 -10
  91. package/src/prover/deciders.ts +0 -4
  92. package/src/prover/first-order.ts +0 -11
  93. package/src/prover/isabelle/decide.ts +0 -6
  94. package/src/prover/isabelle/encode.ts +11 -23
  95. package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
  96. package/src/prover/isabelle/isar/method.ts +25 -38
  97. package/src/prover/isabelle/isar/proof.ts +1 -10
  98. package/src/prover/isabelle/isar/statement.ts +1 -6
  99. package/src/prover/isabelle/isar/theory.ts +15 -26
  100. package/src/prover/isabelle/isar/type-check.ts +11 -25
  101. package/src/prover/isabelle/provers/blast/blast.ts +10 -41
  102. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  103. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  104. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  105. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  106. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  107. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  108. package/src/prover/isabelle/provers/classical.ts +14 -42
  109. package/src/prover/isabelle/provers/hypsubst.ts +11 -25
  110. package/src/prover/isabelle/pure/bicompose.ts +16 -13
  111. package/src/prover/isabelle/pure/consts.ts +1 -7
  112. package/src/prover/isabelle/pure/conv.ts +1 -9
  113. package/src/prover/isabelle/pure/drule.ts +24 -40
  114. package/src/prover/isabelle/pure/envir.ts +3 -52
  115. package/src/prover/isabelle/pure/goal.ts +1 -7
  116. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  117. package/src/prover/isabelle/pure/list.ts +0 -3
  118. package/src/prover/isabelle/pure/logic.ts +1 -14
  119. package/src/prover/isabelle/pure/name.ts +2 -9
  120. package/src/prover/isabelle/pure/net.ts +3 -59
  121. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  122. package/src/prover/isabelle/pure/pattern.ts +2 -19
  123. package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
  124. package/src/prover/isabelle/pure/rewriter.ts +26 -58
  125. package/src/prover/isabelle/pure/search.ts +3 -10
  126. package/src/prover/isabelle/pure/seq.ts +1 -10
  127. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  128. package/src/prover/isabelle/pure/table.ts +1 -31
  129. package/src/prover/isabelle/pure/tactic.ts +12 -22
  130. package/src/prover/isabelle/pure/tactical.ts +6 -12
  131. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  132. package/src/prover/isabelle/pure/term.ts +2 -43
  133. package/src/prover/isabelle/pure/thm.ts +13 -36
  134. package/src/prover/isabelle/pure/type.ts +2 -15
  135. package/src/prover/isabelle/pure/unify.ts +20 -30
  136. package/src/prover/isabelle/pure/variable.ts +3 -7
  137. package/src/prover/isabelle/tla/classical-setup.ts +9 -19
  138. package/src/prover/isabelle/tla/context.ts +8 -16
  139. package/src/prover/isabelle/tla/logic.ts +4 -11
  140. package/src/prover/isabelle/tla/simpdata.ts +46 -34
  141. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  142. package/src/prover/ocaml.ts +0 -6
  143. package/src/prover/prep/action.ts +4 -36
  144. package/src/prover/prep/enabled-axioms.ts +12 -19
  145. package/src/prover/prep/fingerprint.ts +0 -16
  146. package/src/prover/prep/level-comparison.ts +8 -12
  147. package/src/prover/prep/md5.ts +0 -2
  148. package/src/prover/prep/methods.ts +9 -36
  149. package/src/prover/prep/normalize.ts +4 -28
  150. package/src/prover/prove-worker.ts +0 -2
  151. package/src/prover/prove.ts +0 -36
  152. package/src/prover/ptl/decide.ts +7 -12
  153. package/src/prover/ptl/encode.ts +14 -36
  154. package/src/prover/ptl/sat.ts +24 -32
  155. package/src/prover/ptl/tableau.ts +12 -26
  156. package/src/prover/smt/axioms.ts +0 -7
  157. package/src/prover/smt/context.ts +19 -26
  158. package/src/prover/smt/data.ts +51 -54
  159. package/src/prover/smt/encode.ts +14 -35
  160. package/src/prover/smt/extensionality.ts +0 -10
  161. package/src/prover/smt/flatten.ts +3 -22
  162. package/src/prover/smt/format.ts +5 -10
  163. package/src/prover/smt/instances.ts +0 -10
  164. package/src/prover/smt/rewrite.ts +66 -101
  165. package/src/prover/smt/solver/act-cache.ts +0 -15
  166. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  167. package/src/prover/smt/solver/array.ts +1 -3
  168. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  169. package/src/prover/smt/solver/ast-lt.ts +1 -11
  170. package/src/prover/smt/solver/ast-util.ts +1 -6
  171. package/src/prover/smt/solver/ast.ts +1 -143
  172. package/src/prover/smt/solver/auf-solver.ts +6 -39
  173. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  174. package/src/prover/smt/solver/cg-table.ts +1 -18
  175. package/src/prover/smt/solver/clause.ts +1 -27
  176. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  177. package/src/prover/smt/solver/context.ts +4 -61
  178. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  179. package/src/prover/smt/solver/der.ts +2 -21
  180. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  181. package/src/prover/smt/solver/e-matching.ts +3 -34
  182. package/src/prover/smt/solver/enode.ts +1 -21
  183. package/src/prover/smt/solver/expr-ref.ts +1 -5
  184. package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
  185. package/src/prover/smt/solver/fingerprints.ts +1 -12
  186. package/src/prover/smt/solver/flat-literals.ts +1 -9
  187. package/src/prover/smt/solver/goal.ts +2 -14
  188. package/src/prover/smt/solver/hash.ts +0 -8
  189. package/src/prover/smt/solver/hashtable.ts +1 -12
  190. package/src/prover/smt/solver/internalizer.ts +6 -98
  191. package/src/prover/smt/solver/lbool.ts +1 -2
  192. package/src/prover/smt/solver/literal.ts +0 -3
  193. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  194. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  195. package/src/prover/smt/solver/lp/containers.ts +12 -30
  196. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  197. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  198. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  199. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  200. package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
  201. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  202. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  203. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  204. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  205. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  206. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  207. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  208. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  209. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  210. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  211. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  212. package/src/prover/smt/solver/lp/nex.ts +1 -6
  213. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  214. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  215. package/src/prover/smt/solver/lp/nla-core.ts +35 -130
  216. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  217. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  218. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  220. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  221. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  222. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  223. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  224. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  225. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  226. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  227. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  228. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  229. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  230. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  231. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  232. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  233. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  234. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  235. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  236. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  237. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  238. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  239. package/src/prover/smt/solver/mam-compiler.ts +14 -56
  240. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  241. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  242. package/src/prover/smt/solver/model-checker.ts +2 -36
  243. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  244. package/src/prover/smt/solver/model-finder.ts +3 -15
  245. package/src/prover/smt/solver/model-generator.ts +1 -12
  246. package/src/prover/smt/solver/model-macro-solver.ts +12 -69
  247. package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
  248. package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
  249. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  250. package/src/prover/smt/solver/nlsat/explain.ts +3 -47
  251. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  252. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
  253. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  254. package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
  255. package/src/prover/smt/solver/nlsat/solver.ts +7 -67
  256. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  257. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
  258. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  259. package/src/prover/smt/solver/nnf.ts +3 -38
  260. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  261. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  262. package/src/prover/smt/solver/propagate-values.ts +1 -10
  263. package/src/prover/smt/solver/proto-model.ts +3 -48
  264. package/src/prover/smt/solver/pull-quant.ts +1 -12
  265. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  266. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  267. package/src/prover/smt/solver/qe-lite.ts +3 -33
  268. package/src/prover/smt/solver/qi-queue.ts +1 -16
  269. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  270. package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
  271. package/src/prover/smt/solver/quantifier-manager.ts +1 -8
  272. package/src/prover/smt/solver/random-gen.ts +1 -2
  273. package/src/prover/smt/solver/rational.ts +1 -8
  274. package/src/prover/smt/solver/ref-vector.ts +1 -6
  275. package/src/prover/smt/solver/relevancy.ts +2 -15
  276. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  277. package/src/prover/smt/solver/rewriter.ts +3 -85
  278. package/src/prover/smt/solver/rlimit.ts +2 -20
  279. package/src/prover/smt/solver/smtlib-parser.ts +2 -37
  280. package/src/prover/smt/solver/solver.ts +1 -16
  281. package/src/prover/smt/solver/sort.ts +1 -5
  282. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  283. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  284. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
  285. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  286. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
  287. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  288. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  289. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  290. package/src/prover/smt/solver/theory-lra.ts +1 -8
  291. package/src/prover/smt/solver/var-subst.ts +2 -26
  292. package/src/prover/smt/table.ts +0 -8
  293. package/src/prover/tlapm/cache.ts +20 -25
  294. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  295. package/src/prover/tlapm/tlapm.ts +12 -17
  296. package/src/prover/verdict.ts +0 -2
  297. package/src/prover/zenon/check/check.ts +0 -9
  298. package/src/prover/zenon/check/definitions.ts +5 -15
  299. package/src/prover/zenon/check/equality.ts +0 -8
  300. package/src/prover/zenon/check/functions.ts +0 -4
  301. package/src/prover/zenon/check/keys.ts +0 -7
  302. package/src/prover/zenon/check/propositional.ts +0 -3
  303. package/src/prover/zenon/check/records.ts +0 -5
  304. package/src/prover/zenon/check/relations.ts +0 -13
  305. package/src/prover/zenon/check/rewrites.ts +0 -6
  306. package/src/prover/zenon/check/sets.ts +0 -3
  307. package/src/prover/zenon/check/terms.ts +0 -17
  308. package/src/prover/zenon/check/tla.ts +0 -6
  309. package/src/prover/zenon/decide.ts +0 -12
  310. package/src/prover/zenon/encode.ts +1 -8
  311. package/src/prover/zenon/eqrel.ts +0 -13
  312. package/src/prover/zenon/equality-rules.ts +0 -4
  313. package/src/prover/zenon/expr.ts +1 -26
  314. package/src/prover/zenon/index-table.ts +17 -38
  315. package/src/prover/zenon/isar-case.ts +9 -19
  316. package/src/prover/zenon/isar.ts +1 -29
  317. package/src/prover/zenon/limits.ts +0 -4
  318. package/src/prover/zenon/llproof.ts +0 -9
  319. package/src/prover/zenon/mltoll.ts +54 -76
  320. package/src/prover/zenon/node.ts +1 -11
  321. package/src/prover/zenon/ocaml.ts +1 -17
  322. package/src/prover/zenon/parse.ts +2 -7
  323. package/src/prover/zenon/phrase.ts +1 -11
  324. package/src/prover/zenon/proof.ts +0 -9
  325. package/src/prover/zenon/propositional-rules.ts +0 -5
  326. package/src/prover/zenon/rules.ts +2 -6
  327. package/src/prover/zenon/search.ts +1 -17
  328. package/src/prover/zenon/tla/functions.ts +57 -29
  329. package/src/prover/zenon/tla/llproof.ts +63 -70
  330. package/src/prover/zenon/tla/records.ts +56 -27
  331. package/src/prover/zenon/tla/rewrites.ts +12 -19
  332. package/src/prover/zenon/tla/sets.ts +68 -39
  333. package/src/prover/zenon/tla/terms.ts +0 -6
  334. package/src/prover/zenon/tla/tla.ts +59 -58
  335. package/src/randomization.ts +81 -35
  336. package/src/resolve.ts +12 -112
  337. package/src/runtime.ts +22 -22
  338. package/src/sany/builtins.ts +2 -5
  339. package/src/sany/generator.ts +149 -252
  340. package/src/sany/levels.ts +6 -34
  341. package/src/sany/lexer.ts +41 -61
  342. package/src/sany/linter.ts +1 -9
  343. package/src/sany/modules.ts +1 -5
  344. package/src/sany/nodes.ts +0 -31
  345. package/src/sany/parse-error.ts +39 -117
  346. package/src/sany/report.ts +29 -63
  347. package/src/sany/selectors.ts +15 -39
  348. package/src/sany/source.ts +1 -17
  349. package/src/sany/xml.ts +13 -63
  350. package/src/search.ts +495 -155
  351. package/src/simulate.ts +685 -0
  352. package/src/spec-description.ts +176 -69
  353. package/src/standard-definitions.ts +0 -4
  354. package/src/standard-modules.ts +254 -69
  355. package/src/state-graph.ts +50 -24
  356. package/src/subexpressions.ts +69 -52
  357. package/src/substitution-levels.ts +2 -3
  358. package/src/successors.ts +260 -91
  359. package/src/symmetry.ts +33 -25
  360. package/src/tableau.ts +27 -24
  361. package/src/tlc/fingerprint.ts +183 -67
  362. package/src/tlc/jar-data.ts +112 -6
  363. package/src/tlc/messages.ts +110 -44
  364. package/src/tlc/order.ts +37 -60
  365. package/src/tlc/random.ts +33 -45
  366. package/src/tlc/replay.ts +549 -217
  367. package/src/tlc/summary.ts +36 -47
  368. package/src/tlc/tlc-operators.ts +76 -41
  369. package/src/tlc/tlcext-operators.ts +139 -122
  370. package/src/tlc/trace-spec.ts +269 -0
  371. package/src/tlc/value-stream.ts +139 -0
  372. package/src/tlc/version.ts +1 -4
  373. package/src/transfer.ts +22 -25
  374. package/src/typescript/actions.ts +8 -21
  375. package/src/typescript/collections.ts +0 -15
  376. package/src/typescript/compile.ts +0 -5
  377. package/src/typescript/context.ts +0 -12
  378. package/src/typescript/emit.ts +0 -1
  379. package/src/typescript/expressions.ts +0 -12
  380. package/src/typescript/formula.ts +4 -12
  381. package/src/typescript/functions.ts +6 -17
  382. package/src/typescript/model.ts +10 -11
  383. package/src/typescript/names.ts +0 -2
  384. package/src/typescript/program.ts +0 -3
  385. package/src/typescript/properties.ts +6 -8
  386. package/src/typescript/scope.ts +0 -5
  387. package/src/typescript/steps.ts +0 -10
  388. package/src/typescript/types.ts +1 -8
  389. package/src/values.ts +749 -330
  390. package/src/worker.ts +7 -8
@@ -1,10 +1,6 @@
1
- // encode/n_rewrite.ml, type/t_synth.ml, and encode/n_standardize.ml: a TLA+ expression as an
2
- // SMT-LIB term over the sort Idv. Set extensionality is in extensionality.ts, and the axioms each
3
- // flattened symbol brings are in instances.ts.
4
-
5
1
  import { TlaUnsupportedError } from "../../errors";
6
2
  import { normalizeApply, shiftExpr } from "../../obligations/substitution";
7
- import { type Bound, type Builtin, type Expr, type Sequent } from "../../obligations/expression";
3
+ import type { Bound, Builtin, Expr, Sequent } from "../../obligations/expression";
8
4
  import { createContext, type Identifier } from "./context";
9
5
  import {
10
6
  createFlattener,
@@ -48,17 +44,14 @@ import {
48
44
  interface Term {
49
45
  isBool: boolean;
50
46
  text: string;
51
- // Type.Synthesize: the Int-sorted form of a term that is an integer before it's cast to Idv.
52
47
  integer?: string;
53
48
  }
54
49
 
55
- // What tlapm keeps across the obligations of one run.
56
50
  export interface EncodingSession {
57
51
  caseErrors: number;
58
52
  }
59
53
 
60
54
  export interface Mode {
61
- // Whether the text encodes a fact that tlapm leaves out, which may declare operators.
62
55
  isOmitted: boolean;
63
56
  polarity: Polarity;
64
57
  at: string | undefined;
@@ -77,8 +70,6 @@ export interface Env {
77
70
  rest: Env | undefined;
78
71
  }
79
72
 
80
- // A nested ASSUME's declarations and facts so far: each wraps the goal in a quantifier or an
81
- // implication.
82
73
  interface NestedContext {
83
74
  env: Env | undefined;
84
75
  mode: Mode;
@@ -88,25 +79,20 @@ interface NestedContext {
88
79
  export const createEncoder = (session: EncodingSession) => {
89
80
  const flattener = createFlattener();
90
81
  const flatten = flattener.flatten;
91
- // The arity of each anonymous operator Coalesce introduces.
92
82
  const anonymous = new Map<string, number>();
93
- // The fields of each record symbol.
94
83
  const recordFields = new Map<string, string[]>();
95
84
  const context = createContext();
96
- // The salted name of each declared user symbol, for the printer's context.
97
85
  const declared = new Map<string, Identifier>();
98
86
 
99
- // Standardize wraps a cast term in an application, and set_extensionality_visitor visits the
100
- // arguments of an application with neither polarity, so a cast triggers every set equality in it.
101
87
  const toBool = (term: Term) =>
102
88
  term.isBool ? term.text : `(= ${resolveTriggers(term.text, true)} ${TT_IDV})`;
103
89
 
104
90
  const toIdv = (term: Term) =>
105
91
  term.isBool ? `(${CAST_BOOL} ${resolveTriggers(term.text, true)})` : term.text;
106
92
 
107
- const bool = (text: string): Term => ({ isBool: true, text });
93
+ const wrapBool = (text: string): Term => ({ isBool: true, text });
108
94
 
109
- const idv = (text: string): Term => ({ isBool: false, text });
95
+ const wrapIdv = (text: string): Term => ({ isBool: false, text });
110
96
 
111
97
  const getBinding = (env: Env | undefined, index: number): Binding => {
112
98
  const found = Array.from({ length: index - 1 }).reduce<Env | undefined>(
@@ -119,13 +105,11 @@ export const createEncoder = (session: EncodingSession) => {
119
105
 
120
106
  const push = (env: Env | undefined, binding: Binding): Env => ({ binding, rest: env });
121
107
 
122
- // The variables bound outside depth that text uses, outermost first.
123
108
  const getFree = (text: string, depth: number) =>
124
109
  [...new Set(text.match(/[^\s()]+#\d+/g))]
125
110
  .filter((variable) => getDepth(variable) < depth)
126
111
  .toSorted((left, right) => getDepth(left) - getDepth(right));
127
112
 
128
- // Smtlib.adj: the Action frontend's name, salted while it's taken.
129
113
  const getUniqueName = (name: string) => {
130
114
  const identifier = context.adjoin(name);
131
115
  context.enter(identifier);
@@ -133,7 +117,7 @@ export const createEncoder = (session: EncodingSession) => {
133
117
  return identifier.name;
134
118
  };
135
119
 
136
- const neither = (mode: Mode): Mode => ({ ...mode, polarity: "Neither" });
120
+ const clearPolarity = (mode: Mode): Mode => ({ ...mode, polarity: "Neither" });
137
121
 
138
122
  const invert = (mode: Mode): Mode => ({
139
123
  ...mode,
@@ -146,13 +130,12 @@ export const createEncoder = (session: EncodingSession) => {
146
130
  });
147
131
 
148
132
  const encodeIdv = (expression: Expr, env: Env | undefined, mode: Mode) =>
149
- toIdv(encode(expression, env, neither(mode)));
133
+ toIdv(encode(expression, env, clearPolarity(mode)));
150
134
 
151
135
  const encodeBool = (expression: Expr, env: Env | undefined, mode: Mode) =>
152
136
  toBool(encode(expression, env, mode));
153
137
 
154
- // The domains of bounds, each in the scope outside them. A Ditto copies the last domain, and
155
- // tlapm's Rewrite encodes each copy, so each one flattens again.
138
+ // tlapm's Rewrite encodes each Ditto's copy of a domain, so each copy flattens again.
156
139
  const encodeDomains = (bounds: Bound[], env: Env | undefined, mode: Mode) =>
157
140
  bounds
158
141
  .reduce<(Expr | undefined)[]>((domains, bound) => {
@@ -203,7 +186,7 @@ export const createEncoder = (session: EncodingSession) => {
203
186
  mode: Mode,
204
187
  ) => {
205
188
  const domain = encodeIdv(expression.domain, env, mode);
206
- const bound = bindVariables([expression.name], env, neither(mode));
189
+ const bound = bindVariables([expression.name], env, clearPolarity(mode));
207
190
  const body = encodeBool(expression.body, bound.env, bound.mode);
208
191
  const free = getFree(body, mode.depth);
209
192
  const symbol = flatten(
@@ -213,7 +196,7 @@ export const createEncoder = (session: EncodingSession) => {
213
196
  (name) => getSetStAxioms(name, free, body, bound.variables[0]),
214
197
  free.length + 1,
215
198
  );
216
- return idv(call(symbol, [domain, ...free]));
199
+ return wrapIdv(call(symbol, [domain, ...free]));
217
200
  };
218
201
 
219
202
  const encodeSetOf = (
@@ -225,7 +208,7 @@ export const createEncoder = (session: EncodingSession) => {
225
208
  const bound = bindVariables(
226
209
  expression.bounds.map((innerBound) => innerBound.name),
227
210
  env,
228
- neither(mode),
211
+ clearPolarity(mode),
229
212
  );
230
213
  const element = encodeIdv(expression.element, bound.env, bound.mode);
231
214
  const free = getFree(element, mode.depth);
@@ -237,10 +220,9 @@ export const createEncoder = (session: EncodingSession) => {
237
220
  (name) => getSetOfAxioms(name, free, element, bound.variables),
238
221
  count + free.length,
239
222
  );
240
- return idv(call(symbol, [...domains, ...free]));
223
+ return wrapIdv(call(symbol, [...domains, ...free]));
241
224
  };
242
225
 
243
- // Rewrite.elim_multiarg: a function of several arguments is a function of a tuple.
244
226
  const encodeFunction = (
245
227
  expression: Extract<Expr, { kind: "Fcn" }>,
246
228
  env: Env | undefined,
@@ -253,7 +235,7 @@ export const createEncoder = (session: EncodingSession) => {
253
235
  domains.length === 1 ? expression.bounds[0].name : "x",
254
236
  mode.depth,
255
237
  );
256
- const inner = { ...neither(mode), depth: mode.depth + 1 };
238
+ const inner = { ...clearPolarity(mode), depth: mode.depth + 1 };
257
239
  const bodyEnv =
258
240
  domains.length === 1
259
241
  ? push(env, { kind: "constant", symbol: variable })
@@ -271,16 +253,15 @@ export const createEncoder = (session: EncodingSession) => {
271
253
  (name, axioms) => getFunctionAxioms(name, free, body, variable, axioms),
272
254
  free.length + 1,
273
255
  );
274
- return idv(call(symbol, [domain, ...free]));
256
+ return wrapIdv(call(symbol, [domain, ...free]));
275
257
  };
276
258
 
277
- // Elab: CHOOSE x \in S : P is CHOOSE x : x \in S /\ P.
278
259
  const encodeChoose = (
279
260
  expression: Extract<Expr, { kind: "Choose" }>,
280
261
  env: Env | undefined,
281
262
  mode: Mode,
282
263
  ) => {
283
- const bound = bindVariables([expression.name], env, neither(mode));
264
+ const bound = bindVariables([expression.name], env, clearPolarity(mode));
284
265
  const variable = bound.variables[0];
285
266
  const domain =
286
267
  expression.domain && `(${MEM} ${variable} ${encodeIdv(expression.domain, env, mode)})`;
@@ -294,11 +275,9 @@ export const createEncoder = (session: EncodingSession) => {
294
275
  (name) => getChooseAxioms(name, free, body, variable),
295
276
  free.length,
296
277
  );
297
- return idv(call(symbol, free));
278
+ return wrapIdv(call(symbol, free));
298
279
  };
299
280
 
300
- // Type.Synthesize compares values of the same sort only above type level 1, so two formulas are
301
- // compared as values.
302
281
  const encodeEquality = (args: Expr[], env: Env | undefined, mode: Mode, isNegated: boolean) =>
303
282
  getEquality(
304
283
  encodeIdv(args[0], env, mode),
@@ -307,11 +286,9 @@ export const createEncoder = (session: EncodingSession) => {
307
286
  isNegated,
308
287
  );
309
288
 
310
- // Type.Synthesize: SelectSeq's test becomes the predicate LAMBDA x1 : Test(x1), its body the
311
- // text Flatten compares.
312
289
  const getSelectionTest = (test: Expr, env: Env | undefined, mode: Mode) => {
313
290
  const lambda = test.kind === "Lambda" && test.params.length === 1 ? test : undefined;
314
- const bound = bindVariables([lambda?.params[0].name ?? "x1"], env, neither(mode));
291
+ const bound = bindVariables([lambda?.params[0].name ?? "x1"], env, clearPolarity(mode));
315
292
  const body = encodeBool(
316
293
  lambda?.body ?? {
317
294
  kind: "Apply",
@@ -330,43 +307,44 @@ export const createEncoder = (session: EncodingSession) => {
330
307
  env: Env | undefined,
331
308
  mode: Mode,
332
309
  ): Term => {
333
- const idvs = () => args.map((arg) => encodeIdv(arg, env, mode));
310
+ const encodeArgs = () => args.map((arg) => encodeIdv(arg, env, mode));
334
311
  switch (builtin) {
335
312
  case "Conj":
336
- return bool(conjoin(args.map((arg) => encodeBool(arg, env, mode))));
313
+ return wrapBool(conjoin(args.map((arg) => encodeBool(arg, env, mode))));
337
314
  case "Disj":
338
- return bool(disjoin(args.map((arg) => encodeBool(arg, env, mode))));
315
+ return wrapBool(disjoin(args.map((arg) => encodeBool(arg, env, mode))));
339
316
  case "Implies":
340
- return bool(
317
+ return wrapBool(
341
318
  `(=> ${encodeBool(args[0], env, invert(mode))} ${encodeBool(args[1], env, mode)})`,
342
319
  );
343
320
  case "Equiv":
344
- return bool(`(= ${args.map((arg) => encodeBool(arg, env, neither(mode))).join(" ")})`);
321
+ return wrapBool(
322
+ `(= ${args.map((arg) => encodeBool(arg, env, clearPolarity(mode))).join(" ")})`,
323
+ );
345
324
  case "Neg":
346
- return bool(`(not ${encodeBool(args[0], env, invert(mode))})`);
325
+ return wrapBool(`(not ${encodeBool(args[0], env, invert(mode))})`);
347
326
  case "Eq":
348
- return bool(encodeEquality(args, env, mode, false));
327
+ return wrapBool(encodeEquality(args, env, mode, false));
349
328
  case "Neq":
350
- return bool(encodeEquality(args, env, mode, true));
329
+ return wrapBool(encodeEquality(args, env, mode, true));
351
330
  case "Mem":
352
- return bool(call(MEM, idvs()));
353
- // Rewrite.elim_notmem: a \notin S is ~(a \in S).
331
+ return wrapBool(call(MEM, encodeArgs()));
354
332
  case "Notmem":
355
- return bool(`(not ${call(MEM, idvs())})`);
333
+ return wrapBool(`(not ${call(MEM, encodeArgs())})`);
356
334
  case "Subseteq":
357
- return bool(call(SUBSET_EQ, idvs()));
358
- // Rewrite.elim_compare: a < b is a <= b /\ a # b, and a > b is b < a.
335
+ return wrapBool(call(SUBSET_EQ, encodeArgs()));
359
336
  case "Lteq":
360
- return bool(call(INT_LTEQ, idvs()));
337
+ return wrapBool(call(INT_LTEQ, encodeArgs()));
361
338
  case "Gteq":
362
- return bool(call(INT_LTEQ, idvs().toReversed()));
339
+ return wrapBool(call(INT_LTEQ, encodeArgs().toReversed()));
363
340
  case "Lt":
364
341
  case "Gt": {
365
342
  // Rewrite copies the operands before Flatten, which flattens each copy again.
366
- const getOperands = () => (builtin === "Lt" ? idvs() : idvs().toReversed());
367
- return bool(`(and ${call(INT_LTEQ, getOperands())} (distinct ${getOperands().join(" ")}))`);
343
+ const getOperands = () => (builtin === "Lt" ? encodeArgs() : encodeArgs().toReversed());
344
+ return wrapBool(
345
+ `(and ${call(INT_LTEQ, getOperands())} (distinct ${getOperands().join(" ")}))`,
346
+ );
368
347
  }
369
- // Flatten: SelectSeq(s, Test) is a fresh operator of s and the bound variables Test uses.
370
348
  case "SelectSeq": {
371
349
  const test = getSelectionTest(args[1], env, mode);
372
350
  const free = getFree(test.body, mode.depth);
@@ -377,16 +355,16 @@ export const createEncoder = (session: EncodingSession) => {
377
355
  (name) => getSelectSeqAxioms(name, free, test.body, test.variable),
378
356
  free.length + 1,
379
357
  );
380
- return idv(call(symbol, [encodeIdv(args[0], env, mode), ...free]));
358
+ return wrapIdv(call(symbol, [encodeIdv(args[0], env, mode), ...free]));
381
359
  }
382
360
  case "Unprimable": {
383
- const term = encode(args[0], env, neither(mode));
361
+ const term = encode(args[0], env, clearPolarity(mode));
384
362
  return { ...term, text: `(${UNPRIMABLE} ${term.text})` };
385
363
  }
386
364
  default: {
387
365
  const symbol = BUILTIN_SYMBOLS[builtin];
388
366
  if (symbol === undefined) throw new TlaUnsupportedError(`the operator ${builtin}`);
389
- return idv(call(symbol, idvs()));
367
+ return wrapIdv(call(symbol, encodeArgs()));
390
368
  }
391
369
  }
392
370
  };
@@ -401,26 +379,22 @@ export const createEncoder = (session: EncodingSession) => {
401
379
  case "constant":
402
380
  case "variable":
403
381
  if (args.length > 0) throw new TlaUnsupportedError(`an applied ${binding.kind}`);
404
- return idv(binding.symbol);
382
+ return wrapIdv(binding.symbol);
405
383
  case "operator":
406
384
  if (args.length !== binding.arity)
407
385
  throw new TlaUnsupportedError("an operator applied to the wrong number of arguments");
408
- return idv(
386
+ return wrapIdv(
409
387
  call(
410
388
  binding.symbol,
411
389
  args.map((arg) => encodeIdv(arg, env, mode)),
412
390
  ),
413
391
  );
414
- // Flatten: an application of a second-order operator, which has no axioms, is a fresh
415
- // operator of its first-order arguments and the bound variables its others use.
416
392
  case "secondOrder": {
417
393
  if (args.length !== binding.shapes.length)
418
394
  throw new TlaUnsupportedError("an operator applied to the wrong number of arguments");
419
395
  const operands = args.map((arg, index) => {
420
396
  if (binding.shapes[index] === 0)
421
397
  return { isFirstOrder: true, text: encodeIdv(arg, env, mode) };
422
- // An operator's name as the argument stands for the operator, which compare_expr
423
- // matches by name.
424
398
  if (arg.kind === "Ix") {
425
399
  const argument = getBinding(env, arg.index);
426
400
  if (argument.kind !== "operator")
@@ -432,7 +406,7 @@ export const createEncoder = (session: EncodingSession) => {
432
406
  const bound = bindVariables(
433
407
  arg.params.map((param) => param.name),
434
408
  env,
435
- neither(mode),
409
+ clearPolarity(mode),
436
410
  );
437
411
  return { isFirstOrder: false, text: encodeIdv(arg.body, bound.env, bound.mode) };
438
412
  });
@@ -451,15 +425,13 @@ export const createEncoder = (session: EncodingSession) => {
451
425
  firstOrder.length + free.length,
452
426
  binding.name,
453
427
  );
454
- return idv(call(symbol, [...firstOrder, ...free]));
428
+ return wrapIdv(call(symbol, [...firstOrder, ...free]));
455
429
  }
456
430
  case "unsupported":
457
431
  throw new TlaUnsupportedError(binding.reason);
458
432
  }
459
433
  };
460
434
 
461
- // Rewrite.elim_flex: the Action frontend's name#prime is the primed copy of the variable it
462
- // names, which tlapm finds by name.
463
435
  const getPrimed = (env: Env | undefined, name: string): string => {
464
436
  if (!env) throw new TlaUnsupportedError(`a primed declaration that isn't a variable`);
465
437
  const binding = env.binding;
@@ -468,14 +440,12 @@ export const createEncoder = (session: EncodingSession) => {
468
440
  : getPrimed(env.rest, name);
469
441
  };
470
442
 
471
- // Standardize: an opaque name the Action frontend introduces is an anonymous operator, named
472
- // OPAQUE_ when it has no arguments.
473
443
  const encodeOpaque = (name: string, args: Expr[], env: Env | undefined, mode: Mode) => {
474
444
  if (args.length === 0 && name.endsWith("#prime"))
475
- return idv(getPrimed(env, name.slice(0, -"#prime".length)));
445
+ return wrapIdv(getPrimed(env, name.slice(0, -"#prime".length)));
476
446
  const anonymousName = args.length === 0 ? `Anon_OPAQUE_${name}` : `Anon_${name}`;
477
447
  anonymous.set(anonymousName, args.length);
478
- return idv(
448
+ return wrapIdv(
479
449
  call(
480
450
  tla(anonymousName),
481
451
  args.map((arg) => encodeIdv(arg, env, mode)),
@@ -490,7 +460,6 @@ export const createEncoder = (session: EncodingSession) => {
490
460
  ) =>
491
461
  expression.specs.reduce(
492
462
  (base, spec) => {
493
- // Elab.desugar: @ is the value at the whole trail.
494
463
  const update = (value: string, trail: typeof spec.trail): string => {
495
464
  if (trail.length === 0) return encodeIdv(spec.value, env, { ...mode, at: value });
496
465
  const point = trail[0];
@@ -511,7 +480,6 @@ export const createEncoder = (session: EncodingSession) => {
511
480
  encodeIdv(expression.function, env, mode),
512
481
  );
513
482
 
514
- // Standardize names each CASE with no OTHER by a count that tlapm never resets.
515
483
  const getCaseError = () => {
516
484
  session.caseErrors++;
517
485
  const name = `Anon_incomplete_case_error_${session.caseErrors}`;
@@ -525,17 +493,16 @@ export const createEncoder = (session: EncodingSession) => {
525
493
  mode: Mode,
526
494
  ): Term => {
527
495
  const bodies = expression.arms.map((arm) => encode(arm.body, env, mode));
528
- // Standardize: a CASE with no OTHER ends in an unknown value.
529
496
  const other: Term = expression.other
530
497
  ? encode(expression.other, env, mode)
531
- : idv(getCaseError());
498
+ : wrapIdv(getCaseError());
532
499
  const isBool = other.isBool && bodies.every((body) => body.isBool);
533
500
  const isInteger =
534
501
  other.integer !== undefined && bodies.every((body) => body.integer !== undefined);
535
502
  if (isInteger) {
536
503
  const integer = expression.arms.reduceRight(
537
504
  (rest, arm, index) =>
538
- `(ite ${encodeBool(arm.condition, env, neither(mode))} ${bodies[index].integer} ${rest})`,
505
+ `(ite ${encodeBool(arm.condition, env, clearPolarity(mode))} ${bodies[index].integer} ${rest})`,
539
506
  other.integer ?? "",
540
507
  );
541
508
  return { isBool: false, text: `(${CAST_INT} ${integer})`, integer };
@@ -610,17 +577,17 @@ export const createEncoder = (session: EncodingSession) => {
610
577
  case "Internal":
611
578
  switch (expression.builtin) {
612
579
  case "TRUE":
613
- return bool("true");
580
+ return wrapBool("true");
614
581
  case "FALSE":
615
- return bool("false");
582
+ return wrapBool("false");
616
583
  case "BOOLEAN":
617
- return idv(BOOL_SET);
584
+ return wrapIdv(BOOL_SET);
618
585
  case "STRING":
619
- return idv(STR_SET);
586
+ return wrapIdv(STR_SET);
620
587
  case "Nat":
621
- return idv(NAT_SET);
588
+ return wrapIdv(NAT_SET);
622
589
  case "Int":
623
- return idv(INT_SET);
590
+ return wrapIdv(INT_SET);
624
591
  default:
625
592
  throw new TlaUnsupportedError(`the operator ${expression.builtin}`);
626
593
  }
@@ -637,7 +604,7 @@ export const createEncoder = (session: EncodingSession) => {
637
604
  throw new TlaUnsupportedError(`an application of ${operator.kind}`);
638
605
  }
639
606
  case "Sequent":
640
- return bool(encodeSequent(expression.sequent, env, mode));
607
+ return wrapBool(encodeSequent(expression.sequent, env, mode));
641
608
  case "With":
642
609
  case "Parens":
643
610
  return encode(expression.expression, env, mode);
@@ -650,17 +617,17 @@ export const createEncoder = (session: EncodingSession) => {
650
617
  return { isBool: false, text: `(${CAST_INT} ${integer})`, integer };
651
618
  }
652
619
  return consequent.isBool && alternative.isBool
653
- ? bool(`(ite ${condition} ${consequent.text} ${alternative.text})`)
654
- : idv(`(ite ${condition} ${toIdv(consequent)} ${toIdv(alternative)})`);
620
+ ? wrapBool(`(ite ${condition} ${consequent.text} ${alternative.text})`)
621
+ : wrapIdv(`(ite ${condition} ${toIdv(consequent)} ${toIdv(alternative)})`);
655
622
  }
656
623
  case "List": {
657
624
  const items = expression.items.map((item) => encodeBool(item, env, mode));
658
- return bool(expression.bullet === "Or" ? disjoin(items) : conjoin(items));
625
+ return wrapBool(expression.bullet === "Or" ? disjoin(items) : conjoin(items));
659
626
  }
660
627
  case "Opaque":
661
628
  return encodeOpaque(expression.name, [], env, mode);
662
629
  case "Quant":
663
- return bool(encodeQuantifier(expression, env, mode));
630
+ return wrapBool(encodeQuantifier(expression, env, mode));
664
631
  case "Choose":
665
632
  return encodeChoose(expression, env, mode);
666
633
  case "SetSt":
@@ -668,21 +635,21 @@ export const createEncoder = (session: EncodingSession) => {
668
635
  case "SetOf":
669
636
  return encodeSetOf(expression, env, mode);
670
637
  case "SetEnum":
671
- return idv(
638
+ return wrapIdv(
672
639
  call(
673
640
  tla(`SetEnum_${expression.elements.length}`),
674
641
  expression.elements.map((element) => encodeIdv(element, env, mode)),
675
642
  ),
676
643
  );
677
644
  case "Product":
678
- return idv(
645
+ return wrapIdv(
679
646
  call(
680
647
  tla(`Product_${expression.factors.length}`),
681
648
  expression.factors.map((factor) => encodeIdv(factor, env, mode)),
682
649
  ),
683
650
  );
684
651
  case "Tuple":
685
- return idv(
652
+ return wrapIdv(
686
653
  call(
687
654
  tla(`Tuple_${expression.elements.length}`),
688
655
  expression.elements.map((element) => encodeIdv(element, env, mode)),
@@ -690,15 +657,14 @@ export const createEncoder = (session: EncodingSession) => {
690
657
  );
691
658
  case "Fcn":
692
659
  return encodeFunction(expression, env, mode);
693
- // Rewrite.elim_multiarg: f[a, b] applies f to the tuple <<a, b>>.
694
660
  case "FcnApp": {
695
661
  const encodedFunction = encodeIdv(expression.function, env, mode);
696
662
  const args = expression.args.map((arg) => encodeIdv(arg, env, mode));
697
663
  const argument = args.length === 1 ? args[0] : call(tla(`Tuple_${args.length}`), args);
698
- return idv(`(${FUN_APP} ${encodedFunction} ${argument})`);
664
+ return wrapIdv(`(${FUN_APP} ${encodedFunction} ${argument})`);
699
665
  }
700
666
  case "Arrow":
701
- return idv(
667
+ return wrapIdv(
702
668
  call(FUN_SET, [
703
669
  encodeIdv(expression.domain, env, mode),
704
670
  encodeIdv(expression.range, env, mode),
@@ -710,7 +676,7 @@ export const createEncoder = (session: EncodingSession) => {
710
676
  const suffix = names.join("_");
711
677
  recordFields.set(`Record_${suffix}`, names);
712
678
  recordFields.set(`RecordSet_${suffix}`, names);
713
- return idv(
679
+ return wrapIdv(
714
680
  call(
715
681
  tla(`${expression.kind === "Record" ? "Record" : "RecordSet"}_${suffix}`),
716
682
  expression.fields.map((field) => encodeIdv(field.value, env, mode)),
@@ -718,15 +684,15 @@ export const createEncoder = (session: EncodingSession) => {
718
684
  );
719
685
  }
720
686
  case "Except":
721
- return idv(encodeExcept(expression, env, mode));
687
+ return wrapIdv(encodeExcept(expression, env, mode));
722
688
  case "Dot":
723
- return idv(
689
+ return wrapIdv(
724
690
  `(${FUN_APP} ${encodeIdv(expression.expression, env, mode)} ${tla(`StrLit_${expression.field}`)})`,
725
691
  );
726
692
  case "Case":
727
693
  return encodeCase(expression, env, mode);
728
694
  case "String":
729
- return idv(tla(`StrLit_${expression.value}`));
695
+ return wrapIdv(tla(`StrLit_${expression.value}`));
730
696
  case "Num":
731
697
  if (expression.fraction !== "") throw new TlaUnsupportedError("a real number");
732
698
  return {
@@ -736,7 +702,7 @@ export const createEncoder = (session: EncodingSession) => {
736
702
  };
737
703
  case "At":
738
704
  if (mode.at === undefined) throw new TlaUnsupportedError("@ outside EXCEPT");
739
- return idv(mode.at);
705
+ return wrapIdv(mode.at);
740
706
  case "Tquant":
741
707
  case "Tsub":
742
708
  case "Fair":
@@ -746,7 +712,6 @@ export const createEncoder = (session: EncodingSession) => {
746
712
  }
747
713
  };
748
714
 
749
- // One fact or the goal, after the declarations of the symbols it flattens.
750
715
  const getEntries = (line: string): Entry[] => [
751
716
  ...flattener.takeIntroduced(),
752
717
  removeUnprimable(resolveTriggers(line, false)),
@@ -1,7 +1,4 @@
1
1
  // Ported from Z3 (src/ast/act_cache.cpp, src/util/chashtable.h), MIT license, see z3-license.txt.
2
- // The rewriter's cache from an expression and a shift to its result. It holds a reference to each
3
- // key and value, and keeps at most maxUnused entries that were never looked up. Z3 releases the
4
- // entries in the order of its chained hash table, so the table is ported cell for cell.
5
2
  import type { AstManager } from "./ast";
6
3
  import { shrink } from "./array";
7
4
 
@@ -9,7 +6,6 @@ const INIT_SLOTS = 8;
9
6
  const INIT_CELLAR = 2;
10
7
  const MIN_MAX_UNUSED = 1024;
11
8
  const NO_CELL = -1;
12
- // m_next of a free cell, which Z3 tags.
13
9
  const FREE_CELL = -2;
14
10
  const MAX_SPARE_CAPACITY = 1024;
15
11
 
@@ -27,21 +23,16 @@ export class ActCache {
27
23
  private keys = new Int32Array(0);
28
24
  private offsets = new Int32Array(0);
29
25
  private values = new Int32Array(0);
30
- // Whether client code looked the entry up, the tag of Z3's value pointer.
31
26
  private isUsed = new Uint8Array(0);
32
27
  private nexts = new Int32Array(0);
33
28
  private nextCell = INIT_SLOTS;
34
29
  private freeCell = NO_CELL;
35
30
  private size = 0;
36
- // The entries in insertion order from qhead on, where the oldest unused entry is searched.
37
31
  private queueKeys: number[] = [];
38
32
  private queueOffsets: number[] = [];
39
33
  private qhead = 0;
40
34
  private numUnused = 0;
41
35
  private maxUnused: number;
42
- // The cells of the small tables that reset and expand_table let go, by capacity. Z3 frees them and
43
- // takes the next table from its small-object allocator, which is cheap, where V8 allocates each
44
- // typed array slowly, so the next table of the same capacity reuses them.
45
36
  private spares = new Map<number, Cells>();
46
37
 
47
38
  constructor(
@@ -109,8 +100,6 @@ export class ActCache {
109
100
  this.nexts[target] = this.nexts[source];
110
101
  }
111
102
 
112
- // expand_table: copy_table into twice the slots and cellar, doubling the cellar again while it is
113
- // too small.
114
103
  private expandTable() {
115
104
  const old = {
116
105
  slots: this.slots,
@@ -148,7 +137,6 @@ export class ActCache {
148
137
  this.size = size;
149
138
  }
150
139
 
151
- // del_unused: deletes the oldest entry that was never looked up.
152
140
  private delUnused() {
153
141
  while (this.qhead < this.queueKeys.length) {
154
142
  const key = this.queueKeys[this.qhead];
@@ -208,7 +196,6 @@ export class ActCache {
208
196
  if (this.nexts[slot] !== FREE_CELL) {
209
197
  for (let cell = slot; cell !== NO_CELL; cell = this.nexts[cell]) {
210
198
  if (this.keys[cell] !== key || this.offsets[cell] !== offset) continue;
211
- // A new value replaces the old one and clears the tag, though it is not counted as unused.
212
199
  if (this.values[cell] !== value) {
213
200
  this.manager.incRef(value);
214
201
  this.manager.decRef(this.values[cell]);
@@ -217,7 +204,6 @@ export class ActCache {
217
204
  }
218
205
  return;
219
206
  }
220
- // The new entry takes the slot, and the old head moves to a free cell after it.
221
207
  const moved = this.getFreeCell();
222
208
  this.copyCell(moved, slot);
223
209
  this.nexts[slot] = moved;
@@ -244,7 +230,6 @@ export class ActCache {
244
230
  return this.values[cell];
245
231
  }
246
232
 
247
- // reset: releases the entries in the table's order.
248
233
  reset() {
249
234
  for (let slot = 0; slot < this.slots && this.size > 0; slot++) {
250
235
  if (this.nexts[slot] === FREE_CELL) continue;