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
package/src/run-cli.ts CHANGED
@@ -5,10 +5,9 @@ import {
5
5
  readFileSync,
6
6
  readSync,
7
7
  realpathSync,
8
+ rmSync,
8
9
  writeFileSync,
9
10
  } from "node:fs";
10
- import { spawnSync } from "node:child_process";
11
- import { createHash } from "node:crypto";
12
11
  import { basename, delimiter, dirname, isAbsolute, join, resolve } from "node:path";
13
12
  import { arch, availableParallelism, release, tmpdir, type } from "node:os";
14
13
  import { pathToFileURL } from "node:url";
@@ -43,11 +42,30 @@ import {
43
42
  TlaUnsupportedError,
44
43
  } from "./errors";
45
44
  import { EXIT_STATUS, setExitCode } from "./exit-codes";
46
- import type { LineRange } from "./obligation-generate";
47
- import { getAtPrefix, getLocusText } from "./obligation-expression";
48
- import { formatSummary, getObligations, WHOLE_MODULE, type ModuleObligations } from "./obligations";
45
+ import type { LineRange } from "./obligations/generate";
46
+ import { getAtPrefix, getLocusText } from "./obligations/expression";
47
+ import {
48
+ formatSummary,
49
+ getObligations,
50
+ WHOLE_MODULE,
51
+ type ModuleObligations,
52
+ type PrintedObligation,
53
+ } from "./obligations";
54
+ import { format, renderDoc } from "./obligations/format";
55
+ import { printSequent } from "./obligations/printer";
49
56
  import { check } from "./parallel";
50
57
  import { parseModule } from "./parser";
58
+ import {
59
+ encodeProofTheory,
60
+ formatNormalized,
61
+ isProveBackend,
62
+ prove,
63
+ proveObligations,
64
+ PROVE_BACKENDS,
65
+ type ProofAttempt,
66
+ type ProofStatus,
67
+ } from "./prove/prove";
68
+ import { TLAPS_MODULE } from "./prove/tlaps-module";
51
69
  import type { StateDump } from "./state-graph";
52
70
  import {
53
71
  formatProbability,
@@ -55,10 +73,18 @@ import {
55
73
  getOptimisticProbability,
56
74
  getOutDegreeSummary,
57
75
  } from "./tlc-summary";
76
+ import { getTlapmPaths } from "./prove/tlapm/tlapm";
77
+ import {
78
+ getKnownResults,
79
+ loadFingerprints,
80
+ saveHistory,
81
+ type FingerprintTable,
82
+ } from "./tlapm-cache";
58
83
  import type { SanySpecification } from "./sany-generator";
59
84
  import { SANY_174_STANDARD_MODULES, SANY_STANDARD_MODULES } from "./sany-modules";
60
85
  import { getSanyModuleName, getSanyReport, type SanyModuleOrigin } from "./sany-report";
61
86
  import { exportSanyXml, XML_EXPORT_EXIT_CODE, type XmlExportOptions } from "./sany-xml";
87
+ import { getTlcFingerprint } from "./tlc-random";
62
88
  import { getTlcVersion, type TlcVersion } from "./tlc-version";
63
89
  import {
64
90
  createMessagePrinter,
@@ -101,14 +127,32 @@ const CHECK_COMMAND = defineCommand("tla-ts <Spec.tla|Spec.cfg|glob>... {options
101
127
  { flag: "-workers <count|auto>" },
102
128
  ]);
103
129
 
104
- const PROVE_COMMAND = defineCommand("tla-ts prove {options} <Module.tla|glob>...", [
105
- { flag: "-N", isRequired: true },
130
+ const TLAPM_COMMAND = defineCommand("tla-ts tlapm {options} <Module.tla|glob>...", [
131
+ { flag: "-N" },
132
+ { flag: "--summary" },
133
+ { flag: "--strict" },
106
134
  { flag: "--toolbox <start> <end>" },
107
135
  { flag: "--line <num>" },
108
136
  { flag: "--printallobs" },
109
- { flag: "--summary" },
110
- { flag: "--strict" },
137
+ { flag: "--threads <num>" },
138
+ { flag: "--version" },
111
139
  { flag: "-I <directory>", isRepeatable: true },
140
+ { flag: "-k" },
141
+ { flag: "--noproving" },
142
+ { flag: "--nofp" },
143
+ { flag: "--nofpl <start> <end>" },
144
+ { flag: "--safefp" },
145
+ { flag: "--cleanfp" },
146
+ { flag: "--usefp <file>" },
147
+ { flag: "--cache-dir <directory>" },
148
+ ]);
149
+
150
+ const TLAPM_INTEGER_OPTIONS = new Set(["--toolbox", "--line", "--threads", "--nofpl"]);
151
+
152
+ const PROVE_COMMAND = defineCommand("tla-ts prove {options} <Module.tla|glob>...", [
153
+ { flag: `--backend <${PROVE_BACKENDS.join("|")}>` },
154
+ { flag: "-I <directory>", isRepeatable: true },
155
+ { flag: "-workers <count|auto>" },
112
156
  ]);
113
157
 
114
158
  const XML_EXPORT_FLAGS = new Set(["-o", "-t", "-r", "-u"]);
@@ -166,7 +210,7 @@ const XML_EXPORT_USAGE = (() => {
166
210
  const USAGE = [
167
211
  `Usage: ${CHECK_COMMAND.usage}`,
168
212
  ` ${PROVE_COMMAND.usage}`,
169
- " tla-ts prove [<tlapm option>]... <Module.tla|glob>...",
213
+ ` ${TLAPM_COMMAND.usage}`,
170
214
  " tla-ts [<JVM option>]... tlc2.TLC <TLC option>... <Spec>",
171
215
  " (-cp tla2tools.jar or -Dtla-ts.tlc=1.7.4 picks the TLC to reproduce)",
172
216
  " tla-ts [<JVM option>]... tla2sany.xml.XMLExporter [-I <directory>]... [-o] [-t] [-r] [-u] <Module.tla>",
@@ -705,9 +749,9 @@ const getStandardModulesUrl = (jar: string) =>
705
749
  `jar:file:${pathToFileURL(resolve(jar)).pathname}!/tla2sany/StandardModules/`;
706
750
 
707
751
  // Java's Files.createTempDirectory names a directory by a random unsigned long. tla-ts derives it
708
- // from what the directory holds, so that each run of a spec prints the same files.
709
- const getTemporaryName = (contents: string) =>
710
- createHash("sha256").update(contents).digest().readBigUInt64BE().toString();
752
+ // from TLC's fingerprint of what the directory holds, so that each run of a spec prints the same
753
+ // files.
754
+ const getTemporaryName = (contents: string) => getTlcFingerprint([contents]).toString();
711
755
 
712
756
  // The file TLC's SANY says it parses each module from: the real path of a module's own file, or a
713
757
  // copy in a temporary directory of a module from the root module's file or from the jar on the
@@ -1041,51 +1085,47 @@ const runEach = async (
1041
1085
  return exitCodes.find((exitCode) => exitCode !== EXIT_STATUS.success) ?? EXIT_STATUS.success;
1042
1086
  };
1043
1087
 
1044
- // tlapm installs its standard library, with modules such as TLAPS, at lib/tlapm/stdlib beside
1045
- // bin/tlapm.
1046
- const getTlapmPaths = () =>
1047
- (process.env.PATH ?? "")
1048
- .split(delimiter)
1049
- .map((directory) => join(directory, "tlapm"))
1050
- .filter((path) => existsSync(path));
1051
-
1052
- const getTlapmLibrary = () =>
1053
- getTlapmPaths()
1088
+ // tlapm searches the current directory, then its standard library at lib/tlapm/stdlib beside
1089
+ // bin/tlapm, then each -I directory, the last given first.
1090
+ const getLibraryDirectories = (parsed: ParsedArgs) => [
1091
+ ".",
1092
+ ...getTlapmPaths()
1054
1093
  .map((path) => join(dirname(dirname(realpathSync(path))), "lib/tlapm/stdlib"))
1055
- .find((path) => existsSync(path));
1094
+ .filter((path) => existsSync(path))
1095
+ .slice(0, 1),
1096
+ ...parsed.options.flatMap((option) => (option.name === "-I" ? option.values : [])).toReversed(),
1097
+ ];
1056
1098
 
1057
1099
  const expandGlobs = (paths: string[]) =>
1058
1100
  paths.flatMap((path) => (GLOB_CHARACTERS.test(path) ? globSync(path).sort() : [path]));
1059
1101
 
1060
- const proveWithTlapm = (args: string[]) => {
1061
- const tlapm = getTlapmPaths()[0];
1062
- if (tlapm === undefined) {
1063
- console.error(
1064
- "Error: tla-ts prove runs tlapm to prove obligations, but tlapm isn't on your PATH. Install tlapm, or pass -N to only generate the obligations.",
1065
- );
1066
- return 1;
1067
- }
1068
- return spawnSync(tlapm, expandGlobs(args), { stdio: "inherit" }).status ?? 1;
1069
- };
1070
-
1071
- const readModule = (path: string) =>
1072
- existsSync(path) ? { file: path, source: readFileSync(path, "utf8") } : undefined;
1102
+ const getModulePath = (path: string) => (path.endsWith(".tla") ? path : `${path}.tla`);
1073
1103
 
1074
1104
  // A message of tlapm's toolbox protocol, which it writes to stderr.
1075
1105
  const printToolboxMessage = (fields: string[]) =>
1076
1106
  console.error(`@!!BEGIN\n${fields.map((field) => `@!!${field}\n`).join("")}@!!END\n`);
1077
1107
 
1078
- const TLAPM_VERSION = "5f5037f";
1108
+ const printObligationMessage = (obligation: PrintedObligation, status: string, fields: string[]) =>
1109
+ printToolboxMessage([
1110
+ "type:obligation",
1111
+ `id:${obligation.id}`,
1112
+ `loc:${obligation.location}`,
1113
+ `status:${status}`,
1114
+ ...fields,
1115
+ ]);
1116
+
1117
+ const TLAPM_VERSION = "9ed0376";
1079
1118
 
1080
1119
  const quoteArgument = (arg: string) =>
1081
1120
  /^[+,\-./0-9:=@A-Z_a-z]+$/.test(arg) ? arg : `'${arg.replaceAll("'", "'\\''")}'`;
1082
1121
 
1083
1122
  const printToolboxHeader = (args: string[]) =>
1084
1123
  console.log(
1085
- `\n\\* TLAPM version ${TLAPM_VERSION}\n\\* launched at ${formatTlcDate(new Date())} with command line:\n\\* ${["tla-ts", "prove", ...args].map(quoteArgument).join(" ")}\n`,
1124
+ `\n\\* TLAPM version ${TLAPM_VERSION}\n\\* launched at ${formatTlcDate(new Date())} with command line:\n\\* ${["tla-ts", "tlapm", ...args].map(quoteArgument).join(" ")}\n`,
1086
1125
  );
1087
1126
 
1088
- const STRICT_EXIT_STATUS = { incomplete: 11, emptyTarget: 12 };
1127
+ // The most severe first.
1128
+ const STRICT_EXIT_STATUS = { failed: 10, incomplete: 11, emptyTarget: 12 };
1089
1129
 
1090
1130
  const checkStrictly = (result: ModuleObligations, isTargeted: boolean, isSummary: boolean) => {
1091
1131
  const summary = result.summary;
@@ -1113,6 +1153,17 @@ const checkStrictly = (result: ModuleObligations, isTargeted: boolean, isSummary
1113
1153
 
1114
1154
  const TLAPM_FAILURE_STATUS = 3;
1115
1155
 
1156
+ const UNPROVED_ENDING = [
1157
+ ' tlapm ending abnormally with Failure("backend errors: there are unproved obligations")',
1158
+ 'Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33',
1159
+ 'Called from Tlapm_lib.process_module in file "src/tlapm_lib.ml", lines 492-493, characters 12-37',
1160
+ 'Called from Tlapm_lib.main.f in file "src/tlapm_lib.ml", line 640, characters 23-43',
1161
+ 'Called from Stdlib__List.fold_left in file "list.ml", line 125, characters 24-34',
1162
+ 'Called from Tlapm_lib.main in file "src/tlapm_lib.ml", line 643, characters 13-40',
1163
+ 'Called from Tlapm_lib.init in file "src/tlapm_lib.ml", line 659, characters 8-59',
1164
+ "",
1165
+ ].join("\n");
1166
+
1116
1167
  const generateObligations = (generate: () => ModuleObligations[]) => {
1117
1168
  try {
1118
1169
  return generate();
@@ -1123,12 +1174,155 @@ const generateObligations = (generate: () => ModuleObligations[]) => {
1123
1174
  }
1124
1175
  };
1125
1176
 
1126
- const prove = (args: string[]) => {
1127
- if (!args.includes("-N") && !args.includes("--summary")) return proveWithTlapm(args);
1177
+ // tla-ts prove: proves each module with prove, printing each obligation as it ends.
1178
+ const proveModules = (args: string[]) => {
1128
1179
  const parsed = PROVE_COMMAND.parse(args);
1129
- const unsupported = parsed.unknown[0];
1180
+ const backend = parsed.get("--backend")?.[0];
1181
+ const modulePaths = expandGlobs(parsed.positionals).map(getModulePath);
1182
+ if (
1183
+ parsed.unknown[0] !== undefined ||
1184
+ parsed.incomplete ||
1185
+ (backend !== undefined && !isProveBackend(backend)) ||
1186
+ modulePaths.length === 0
1187
+ ) {
1188
+ console.error(`Usage: ${PROVE_COMMAND.usage}`);
1189
+ return 1;
1190
+ }
1191
+ const libraries = getLibraryDirectories(parsed);
1192
+ return runEach(
1193
+ modulePaths,
1194
+ async (path) => {
1195
+ const result = await prove({
1196
+ source: readFileSync(path, "utf8"),
1197
+ loadModule: createModuleLoader([dirname(path), ...libraries]),
1198
+ backend,
1199
+ workers: getWorkerCount(parsed.get("-workers")),
1200
+ onObligation: (obligation) =>
1201
+ console.log(
1202
+ `${path}:${obligation.location}: ${obligation.status}${obligation.status === "proved" ? ` by ${obligation.prover}` : ""}${obligation.status === "failed" || obligation.status === "unsupported" ? ` (${obligation.reason})` : ""}`,
1203
+ ),
1204
+ });
1205
+ const counts = Map.groupBy(result.obligations, (obligation) => obligation.status);
1206
+ const getCount = (status: ProofStatus) => counts.get(status)?.length ?? 0;
1207
+ console.log(
1208
+ `${result.obligations.length} obligations: ${getCount("proved")} proved, ${getCount("trivial")} trivial, ${getCount("failed")} failed, ${getCount("unsupported")} unsupported`,
1209
+ );
1210
+ return getCount("failed") + getCount("unsupported") === 0 ? EXIT_STATUS.success : 1;
1211
+ },
1212
+ () => createMessagePrinter(false),
1213
+ );
1214
+ };
1215
+
1216
+ // Toolbox.print_res_aux.
1217
+ const printAttempt = (obligation: PrintedObligation, attempt: ProofAttempt) => {
1218
+ const limit = attempt.method.timeLimitMs;
1219
+ const used =
1220
+ attempt.timeUsedMs === undefined
1221
+ ? ""
1222
+ : `; time-used: ${(attempt.timeUsedMs / 1000).toFixed(1)} (${Math.round((100 * attempt.timeUsedMs) / limit)}%)`;
1223
+ const times =
1224
+ limit === 0
1225
+ ? ""
1226
+ : `time-limit: ${limit === Infinity ? "inf" : Number((limit / 1000).toPrecision(6))}${used}`;
1227
+ const method = [attempt.method.tactic, times].filter(Boolean).join("; ");
1228
+ const isSmt = attempt.method.prover === "smt" || attempt.method.prover === "z3";
1229
+ const note =
1230
+ isSmt && attempt.reason === "false" && attempt.verdict
1231
+ ? `(* SMT failed with status = ${attempt.verdict}\n *)\n`
1232
+ : "";
1233
+ printObligationMessage(obligation, attempt.isProved ? "proved" : "failed", [
1234
+ `prover:${attempt.method.prover}`,
1235
+ ...(method === "" ? [] : [`meth:${method}`]),
1236
+ ...(attempt.reason === undefined ? [] : [`reason:${attempt.reason}`]),
1237
+ `already:${attempt.isReused}`,
1238
+ ...(attempt.isProved
1239
+ ? []
1240
+ : [
1241
+ `obl:${attempt.isReused ? "" : `\n${note}`}${formatNormalized(obligation, attempt.isReused)}`,
1242
+ ]),
1243
+ ]);
1244
+ };
1245
+
1246
+ // Method.Fail, for an error obligation or one no method was tried on.
1247
+ const printFailure = (obligation: PrintedObligation, reason: string) =>
1248
+ printObligationMessage(obligation, "failed", [
1249
+ "prover:fail",
1250
+ "meth:time-limit: inf",
1251
+ `reason:${reason}`,
1252
+ "already:false",
1253
+ `obl:${obligation.text}`,
1254
+ ]);
1255
+
1256
+ interface ProvingSettings {
1257
+ isToolbox: boolean;
1258
+ isProving: boolean;
1259
+ workers: number;
1260
+ isFingerprinted: (obligation: PrintedObligation) => boolean;
1261
+ fingerprints: FingerprintTable;
1262
+ }
1263
+
1264
+ // Tlapm_lib.process_obs. Returns whether some obligation failed.
1265
+ const proveModule = async (
1266
+ result: ModuleObligations,
1267
+ theoryPath: string,
1268
+ fingerprintsPath: string,
1269
+ sources: string[],
1270
+ settings: ProvingSettings,
1271
+ ) => {
1272
+ saveHistory(fingerprintsPath, sources);
1273
+ const known = getKnownResults(settings.fingerprints);
1274
+ const reports = await proveObligations(result.obligations, {
1275
+ workers: settings.workers,
1276
+ results: known.results,
1277
+ isFingerprinted: settings.isFingerprinted,
1278
+ isProving: settings.isProving,
1279
+ onReport: (report, obligation) => {
1280
+ if (!settings.isToolbox) return;
1281
+ if (report.obligation.status === "trivial")
1282
+ return printObligationMessage(obligation, "trivial", ["prover:tlapm", "already:false"]);
1283
+ if (obligation.kind.kind === "Error") return printFailure(obligation, "user error");
1284
+ report.attempts.forEach((attempt) => printAttempt(obligation, attempt));
1285
+ },
1286
+ });
1287
+ writeFileSync(theoryPath, encodeProofTheory(result.name, reports, result.obligations));
1288
+ console.log(`(* created new ${JSON.stringify(theoryPath)} *)`);
1289
+ known.save(fingerprintsPath);
1290
+ console.log(`(* fingerprints written in ${JSON.stringify(fingerprintsPath)} *)`);
1291
+ if (!settings.isProving) return false;
1292
+ const unproved = reports.flatMap((report, index) =>
1293
+ "reason" in report.obligation ? [{ report, obligation: result.obligations[index] }] : [],
1294
+ );
1295
+ if (settings.isToolbox) {
1296
+ unproved
1297
+ .filter(
1298
+ (entry) => entry.report.attempts.length === 0 && entry.obligation.kind.kind !== "Error",
1299
+ )
1300
+ .forEach((entry) => printFailure(entry.obligation, "unexpected error"));
1301
+ }
1302
+ unproved
1303
+ .toReversed()
1304
+ .forEach((entry) =>
1305
+ console.error(
1306
+ `${getAtPrefix(entry.obligation.locus)}${renderDoc(format("[ERROR]: @[<v2>Could not prove or check:@,%a@]", printSequent(entry.obligation.sequent)), 35)}`,
1307
+ ),
1308
+ );
1309
+ const total = `${result.obligations.length} obligation${result.obligations.length > 1 ? "s" : ""}`;
1310
+ console.error(
1311
+ unproved.length === 0
1312
+ ? `${getAtPrefix(result.location)}[INFO]: All ${total} proved.`
1313
+ : `${getAtPrefix(result.location)}[ERROR]: ${unproved.length}/${total} failed.\nThere were backend errors processing module \`${JSON.stringify(result.name)}\`.`,
1314
+ );
1315
+ return unproved.length > 0;
1316
+ };
1317
+
1318
+ const runTlapm = async (args: string[]) => {
1319
+ const parsed = TLAPM_COMMAND.parse(args);
1320
+ const isProcessing = !parsed.has("-N") && !parsed.has("--summary");
1321
+ const unsupported =
1322
+ parsed.unknown[0] ??
1323
+ (isProcessing && parsed.has("--printallobs") ? "--printallobs" : undefined);
1130
1324
  if (unsupported !== undefined) {
1131
- console.error(`Error: tla-ts prove does not support the tlapm option ${unsupported}.`);
1325
+ console.error(`Error: tla-ts tlapm does not support the tlapm option ${unsupported}.`);
1132
1326
  return 1;
1133
1327
  }
1134
1328
  if (parsed.incomplete) {
@@ -1136,14 +1330,20 @@ const prove = (args: string[]) => {
1136
1330
  return 1;
1137
1331
  }
1138
1332
  const nonInteger = parsed.options.find(
1139
- (option) => option.name !== "-I" && option.values.some((value) => !/^-?\d+$/.test(value)),
1333
+ (option) =>
1334
+ TLAPM_INTEGER_OPTIONS.has(option.name) &&
1335
+ option.values.some((value) => !/^-?\d+$/.test(value)),
1140
1336
  );
1141
1337
  if (nonInteger) {
1142
1338
  console.error(`Error: option '${nonInteger.name}' expects an integer.`);
1143
1339
  return 1;
1144
1340
  }
1341
+ if (parsed.has("--version")) {
1342
+ console.log(TLAPM_VERSION);
1343
+ return EXIT_STATUS.success;
1344
+ }
1145
1345
  const files = expandGlobs(parsed.positionals);
1146
- const modulePaths = files.map((path) => (path.endsWith(".tla") ? path : `${path}.tla`));
1346
+ const modulePaths = files.map(getModulePath);
1147
1347
  if (modulePaths.length === 0) {
1148
1348
  console.error(USAGE);
1149
1349
  return 1;
@@ -1157,15 +1357,12 @@ const prove = (args: string[]) => {
1157
1357
  if (option.name === "--line") return start === 0 ? WHOLE_MODULE : { start, end: start };
1158
1358
  return range;
1159
1359
  }, WHOLE_MODULE);
1160
- // tlapm searches the current directory and each module's, then its library, then each -I
1161
- // directory, the last given first.
1162
- const tlapmLibrary = getTlapmLibrary();
1163
- const includes = parsed.options.flatMap((option) => (option.name === "-I" ? option.values : []));
1360
+ // tlapm also searches each module's directory. Without tlapm, TLAPS is tla-ts's copy.
1164
1361
  const directories = modulePaths.reduce(
1165
1362
  (found, path) => (found.includes(dirname(path)) ? found : [dirname(path), ...found]),
1166
- [".", ...(tlapmLibrary ? [tlapmLibrary] : []), ...includes.toReversed()],
1363
+ getLibraryDirectories(parsed),
1167
1364
  );
1168
- // tlapm names each file it reads by joining a search directory and the name, as in ./Module.tla.
1365
+ const moduleNames = new Set<string>();
1169
1366
  const results = generateObligations(() => {
1170
1367
  const missingIndex = modulePaths.findIndex((path) => !existsSync(path));
1171
1368
  if (missingIndex !== -1) {
@@ -1175,8 +1372,16 @@ const prove = (args: string[]) => {
1175
1372
  }
1176
1373
  return getObligations(
1177
1374
  modulePaths.map((path) => ({ file: `./${path}`, source: readFileSync(path, "utf8") })),
1178
- (name) =>
1179
- directories.map((directory) => readModule(`${directory}/${name}.tla`)).find(Boolean),
1375
+ (name) => {
1376
+ moduleNames.add(name);
1377
+ // tlapm names each file it reads by joining a search directory and the name, as in
1378
+ // ./Module.tla.
1379
+ const file = directories
1380
+ .map((directory) => `${directory}/${name}.tla`)
1381
+ .find((path) => existsSync(path));
1382
+ if (file !== undefined) return { file, source: readFileSync(file, "utf8") };
1383
+ return name === "TLAPS" ? { file: "TLAPS.tla", source: TLAPS_MODULE } : undefined;
1384
+ },
1180
1385
  {
1181
1386
  lines,
1182
1387
  onWarning: (warning) => {
@@ -1191,26 +1396,79 @@ const prove = (args: string[]) => {
1191
1396
  );
1192
1397
  });
1193
1398
  if (!results) return TLAPM_FAILURE_STATUS;
1194
- const failures = results.flatMap((result) => {
1399
+ const cacheDirectory =
1400
+ parsed.get("--cache-dir")?.[0] ?? process.env.TLAPM_CACHE_DIR ?? ".tlacache";
1401
+ const forgottenLines = parsed.get("--nofpl")?.map(Number) ?? [0, 0];
1402
+ const settings: ProvingSettings = {
1403
+ isToolbox,
1404
+ isProving: !parsed.has("--noproving"),
1405
+ workers: Math.max(1, Number(parsed.get("--threads")?.[0] ?? availableParallelism())),
1406
+ isFingerprinted: (obligation) =>
1407
+ !parsed.has("--nofp") &&
1408
+ !(
1409
+ obligation.locus &&
1410
+ obligation.locus.startLine >= forgottenLines[0] &&
1411
+ obligation.locus.endLine <= forgottenLines[1]
1412
+ ),
1413
+ fingerprints: new Map(),
1414
+ };
1415
+ const statuses: number[] = [];
1416
+ for (const [index, result] of results.entries()) {
1417
+ // Tlapm_lib.mkdir_tlaps.
1418
+ const directory = `${cacheDirectory}/${result.name}.tlaps`;
1419
+ const fingerprintsPath = `${directory}/fingerprints`;
1420
+ const loadedPath = parsed.get("--usefp")?.[0] ?? fingerprintsPath;
1421
+ mkdirSync(directory, { recursive: true });
1422
+ if (parsed.has("--cleanfp") && existsSync(fingerprintsPath)) {
1423
+ rmSync(fingerprintsPath);
1424
+ console.log(`(* fingerprints file ${JSON.stringify(fingerprintsPath)} removed *)`);
1425
+ }
1426
+ if (!parsed.has("--cleanfp") && existsSync(loadedPath) && result.summary.total !== 0) {
1427
+ console.log(
1428
+ parsed.has("--nofp")
1429
+ ? `(* will not use fingerprints (because of option \`--nofp\`), but will now load fingerprints from the file \`${loadedPath}\`, in order to overwrite with the new fingerprints, and then save the results at the end. *)`
1430
+ : `(* loading fingerprints in ${JSON.stringify(loadedPath)} *)`,
1431
+ );
1432
+ loadFingerprints(settings.fingerprints, loadedPath, parsed.has("--safefp"));
1433
+ }
1195
1434
  if (parsed.has("--summary")) console.log(formatSummary(result));
1196
1435
  if (isToolbox) {
1197
1436
  result.obligations.forEach((obligation) =>
1198
- printToolboxMessage([
1199
- "type:obligation",
1200
- `id:${obligation.id}`,
1201
- `loc:${obligation.location}`,
1202
- "status:to be proved",
1203
- ...(parsed.has("--printallobs") ? [`obl:${obligation.text}`] : []),
1204
- ]),
1437
+ printObligationMessage(
1438
+ obligation,
1439
+ "to be proved",
1440
+ parsed.has("--printallobs") ? [`obl:${obligation.text}`] : [],
1441
+ ),
1205
1442
  );
1206
1443
  printToolboxMessage(["type:obligationsnumber", `count:${result.obligations.length}`]);
1207
1444
  }
1208
- if (!parsed.has("--strict")) return [];
1209
- return checkStrictly(result, lines.start > 0 || lines.end < Infinity, parsed.has("--summary"));
1210
- });
1211
- return failures.includes(STRICT_EXIT_STATUS.incomplete)
1212
- ? STRICT_EXIT_STATUS.incomplete
1213
- : (failures[0] ?? EXIT_STATUS.success);
1445
+ if (parsed.has("--strict"))
1446
+ statuses.push(
1447
+ ...checkStrictly(result, lines.start > 0 || lines.end < Infinity, parsed.has("--summary")),
1448
+ );
1449
+ if (!isProcessing) continue;
1450
+ // tlapm's history holds the source of each module read so far.
1451
+ const sources = [
1452
+ ...moduleNames,
1453
+ ...results.slice(0, index + 1).map((innerResult) => innerResult.name),
1454
+ ].map((name) => `${name}.tla`);
1455
+ const isFailed = await proveModule(
1456
+ result,
1457
+ `${directory}/${result.name}.thy`,
1458
+ fingerprintsPath,
1459
+ sources,
1460
+ settings,
1461
+ );
1462
+ if (isFailed && parsed.has("--strict")) statuses.push(STRICT_EXIT_STATUS.failed);
1463
+ if (isFailed && !parsed.has("--strict") && !isToolbox) {
1464
+ console.error(UNPROVED_ENDING);
1465
+ return TLAPM_FAILURE_STATUS;
1466
+ }
1467
+ }
1468
+ return (
1469
+ Object.values(STRICT_EXIT_STATUS).find((status) => statuses.includes(status)) ??
1470
+ EXIT_STATUS.success
1471
+ );
1214
1472
  };
1215
1473
 
1216
1474
  const checkSpecs = async (args: string[], java: JavaProperties) => {
@@ -1247,7 +1505,7 @@ const checkSpecs = async (args: string[], java: JavaProperties) => {
1247
1505
  ? path
1248
1506
  : (java.libraries.map((directory) => join(directory, path)).find(existsSync) ?? path);
1249
1507
  const paths = [...new Set(specPaths.map(findSpec))];
1250
- const tlcVersion = getJavaTlcVersion(java);
1508
+ const tlcVersion = java.tlcVersion ?? "master";
1251
1509
  return runEach(
1252
1510
  paths,
1253
1511
  (path, printer) => {
@@ -1488,9 +1746,6 @@ interface JavaProperties {
1488
1746
  const getJar = (java: JavaProperties) =>
1489
1747
  java.classPath?.split(delimiter).find((entry) => entry.endsWith(".jar"));
1490
1748
 
1491
- // The TLC that -Dtla-ts.tlc names, or else the one of the jar on the class path.
1492
- const getJavaTlcVersion = (java: JavaProperties) => java.tlcVersion ?? getTlcVersion(getJar(java));
1493
-
1494
1749
  interface JavaLaunch {
1495
1750
  mainClass: string;
1496
1751
  args: string[];
@@ -1525,7 +1780,7 @@ const runJavaClass = (launch: JavaLaunch) => {
1525
1780
  if (launch.mainClass === "tlc2.TLC") return checkSpecs(launch.args, launch.java);
1526
1781
  if (launch.mainClass === "tla2sany.xml.XMLExporter") {
1527
1782
  return reportErrors(() =>
1528
- getJavaTlcVersion(launch.java) === "1.7.4"
1783
+ launch.java.tlcVersion === "1.7.4"
1529
1784
  ? exportXml174(launch.args, getJar(launch.java))
1530
1785
  : exportXml(launch.args),
1531
1786
  );
@@ -1537,9 +1792,13 @@ const runJavaClass = (launch: JavaLaunch) => {
1537
1792
  };
1538
1793
 
1539
1794
  const run = async (args: string[]) => {
1540
- if (args[0] === "prove") return reportErrors(() => prove(args.slice(1)));
1795
+ if (args[0] === "prove") return reportErrors(() => proveModules(args.slice(1)));
1796
+ if (args[0] === "tlapm") return reportErrors(() => runTlapm(args.slice(1)));
1541
1797
  const launch = getJavaLaunch(args);
1542
- return launch ? runJavaClass(launch) : checkSpecs(args, { libraries: [] });
1798
+ if (launch === undefined) return checkSpecs(args, { libraries: [] });
1799
+ // The TLC that -Dtla-ts.tlc names, or else the one of the jar on the class path.
1800
+ launch.java.tlcVersion ??= await getTlcVersion(getJar(launch.java));
1801
+ return runJavaClass(launch);
1543
1802
  };
1544
1803
 
1545
1804
  export const runCli = async () => {
@@ -162,8 +162,11 @@ export const CORE_OPERATORS: Builtin[] = [
162
162
  : differenceSorted;
163
163
  // The merge compares the elements, which TLC tests for membership one by one instead.
164
164
  return computeLikeTlcOnFailure(
165
- () => merge(toFiniteSet(left), toFiniteSet(right)),
166
- () => combineReducible(operator, left, right),
165
+ (finiteLeft, finiteRight) => merge(toFiniteSet(finiteLeft), toFiniteSet(finiteRight)),
166
+ (reducibleLeft, reducibleRight) =>
167
+ combineReducible(operator, reducibleLeft, reducibleRight),
168
+ left,
169
+ right,
167
170
  );
168
171
  }
169
172
  if (isReducibleSet(left)) return combineReducible(operator, left, right);
package/src/successors.ts CHANGED
@@ -25,6 +25,7 @@ import {
25
25
  toKeepLazyContext,
26
26
  getDefinition,
27
27
  getContextElements,
28
+ getEntryEvaluator,
28
29
  getReevaluatedDefinitions,
29
30
  lookupScope,
30
31
  resolveApplyOperator,
@@ -32,6 +33,7 @@ import {
32
33
  toUnspecifiedSubscriptError,
33
34
  type Context,
34
35
  type Environment,
36
+ type Evaluator,
35
37
  type Scope,
36
38
  type State,
37
39
  } from "./evaluate";
@@ -129,12 +131,24 @@ const getIfConditionMessage = (run: Run, value: Value, expression: Expression) =
129
131
  return `In computing ${getComputation(run)}, a non-boolean expression (${kind}) was used as the condition of an IF.${run.isInit ? "\n" : ""}${range}`;
130
132
  };
131
133
 
132
- const holds = (run: Run, expression: Expression, context: Context, isWalked = true) => {
133
- const value = evaluate(expression, context);
134
+ const holds = (run: Run, expression: Expression, context: Context, isWalked = true) =>
135
+ holdsValue(run, expression, evaluate(expression, context), isWalked);
136
+
137
+ const holdsValue = (run: Run, expression: Expression, value: Value, isWalked = true) => {
134
138
  if (typeof value === "boolean") return value;
135
139
  throw createRunError(run, getNonBooleanMessage(run, value, expression, isWalked));
136
140
  };
137
141
 
142
+ const evaluateCached = (
143
+ evaluators: (Evaluator | undefined)[],
144
+ index: number,
145
+ expression: Expression,
146
+ context: Context,
147
+ ) =>
148
+ context.environment.callStack
149
+ ? evaluate(expression, context)
150
+ : (evaluators[index] ??= getEntryEvaluator(expression, context.environment))(context);
151
+
138
152
  const isAssignmentOperator = (operator: string) =>
139
153
  operator === "=" || operator === "\\in" || operator === "\\subseteq";
140
154
 
@@ -357,6 +371,8 @@ const compileConjunction = (
357
371
  isInit: boolean,
358
372
  ): Runner => {
359
373
  const conjuncts = operands.map((operand) => toConjunct(operand, environment, isInit));
374
+ const evaluators: (Evaluator | undefined)[] = [];
375
+ const restEvaluators: (Evaluator | undefined)[] = [];
360
376
  const runFrom = (
361
377
  start: number,
362
378
  run: Run,
@@ -372,7 +388,9 @@ const compileConjunction = (
372
388
  if (index > 0 && isShortcut && isComplete(current)) {
373
389
  context ??= getContext(run, scope, current);
374
390
  for (let rest = index; rest < conjuncts.length; rest++) {
375
- if (!holds(run, conjuncts[rest].expression, context, false)) return;
391
+ const expression = conjuncts[rest].expression;
392
+ const value = evaluateCached(restEvaluators, rest, expression, context);
393
+ if (!holdsValue(run, expression, value, false)) return;
376
394
  }
377
395
  onComplete(current, action);
378
396
  return;
@@ -380,12 +398,13 @@ const compileConjunction = (
380
398
  const conjunct = conjuncts[index];
381
399
  if (conjunct.kind === "Guard") {
382
400
  context ??= getContext(run, scope, current);
383
- if (!holds(run, conjunct.expression, context)) return;
401
+ const value = evaluateCached(evaluators, index, conjunct.expression, context);
402
+ if (!holdsValue(run, conjunct.expression, value)) return;
384
403
  continue;
385
404
  }
386
405
  if (conjunct.kind === "Assign") {
387
406
  context ??= getContext(run, scope, current);
388
- const value = evaluate(conjunct.value, context);
407
+ const value = evaluateCached(evaluators, index, conjunct.value, context);
389
408
  const assigned = current[conjunct.index];
390
409
  if (assigned === undefined) {
391
410
  current = assign(current, conjunct.index, value);