tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0

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 (631) hide show
  1. package/README.md +8 -0
  2. package/dist/compile.cjs +6 -6
  3. package/dist/compile.js +10 -10
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +121 -12
  8. package/dist/index.d.ts +121 -12
  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 +2746 -410
  15. package/dist/prove.js +2745 -409
  16. package/dist/run.cjs +144 -31
  17. package/dist/run.js +144 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +134 -104
  21. package/dist/transfer.js +134 -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 +56 -60
  26. package/src/bags.ts +128 -110
  27. package/src/builtins.ts +31 -77
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +118 -0
  30. package/src/check-trace.ts +320 -0
  31. package/src/check.ts +1155 -900
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +100 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +433 -82
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +701 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +318 -656
  41. package/src/cli/typescript.ts +0 -3
  42. package/src/cli/xml-exporter.ts +27 -49
  43. package/src/cli.ts +0 -1
  44. package/src/codegen.ts +217 -82
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +1019 -0
  47. package/src/dependencies.ts +101 -66
  48. package/src/dfid.ts +683 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +260 -371
  51. package/src/errors.ts +93 -58
  52. package/src/evaluate.ts +848 -374
  53. package/src/exit-codes.ts +63 -13
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +97 -43
  57. package/src/java-hash.ts +21 -0
  58. package/src/java-overrides.ts +6 -21
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +231 -154
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +743 -325
  64. package/src/liveness.ts +224 -131
  65. package/src/obligations/action.ts +17 -44
  66. package/src/obligations/anonymize.ts +120 -95
  67. package/src/obligations/enabled-axioms.ts +218 -0
  68. package/src/obligations/equality.ts +1 -3
  69. package/src/obligations/expression.ts +37 -26
  70. package/src/obligations/format.ts +0 -10
  71. package/src/obligations/generate.ts +66 -64
  72. package/src/obligations/index.ts +39 -20
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +31 -41
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +94 -63
  79. package/src/obligations/proof.ts +3 -6
  80. package/src/obligations/regroup.ts +0 -5
  81. package/src/obligations/simplify.ts +57 -63
  82. package/src/obligations/source.ts +121 -95
  83. package/src/obligations/subexpression.ts +49 -28
  84. package/src/obligations/substitution.ts +1 -5
  85. package/src/obligations/temporal.ts +12 -20
  86. package/src/obligations/tuples.ts +2 -10
  87. package/src/parallel-worker.ts +34 -57
  88. package/src/parallel.ts +62 -72
  89. package/src/parser.ts +1184 -531
  90. package/src/pcal/ast.ts +53 -86
  91. package/src/pcal/parse.ts +144 -219
  92. package/src/pcal/tokenize.ts +91 -131
  93. package/src/pcal/translate.ts +83 -130
  94. package/src/pcal/validate.ts +48 -68
  95. package/src/pretty-print.ts +7 -8
  96. package/src/prover/decide-pool.ts +8 -13
  97. package/src/prover/deciders.ts +12 -13
  98. package/src/prover/first-order.ts +0 -11
  99. package/src/prover/isabelle/decide.ts +3 -31
  100. package/src/prover/isabelle/encode.ts +82 -64
  101. package/src/prover/isabelle/isar/attrib.ts +250 -0
  102. package/src/prover/isabelle/isar/context.ts +335 -0
  103. package/src/prover/isabelle/isar/induct.ts +382 -0
  104. package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
  105. package/src/prover/isabelle/isar/method.ts +510 -226
  106. package/src/prover/isabelle/isar/proof.ts +570 -23
  107. package/src/prover/isabelle/isar/rule-cases.ts +226 -0
  108. package/src/prover/isabelle/isar/theory.ts +488 -88
  109. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  110. package/src/prover/isabelle/isar/type-check.ts +99 -38
  111. package/src/prover/isabelle/provers/blast/blast.ts +16 -105
  112. package/src/prover/isabelle/provers/blast/branch.ts +0 -33
  113. package/src/prover/isabelle/provers/blast/prove.ts +0 -36
  114. package/src/prover/isabelle/provers/blast/rules.ts +5 -45
  115. package/src/prover/isabelle/provers/blast/state.ts +1 -29
  116. package/src/prover/isabelle/provers/blast/term.ts +8 -37
  117. package/src/prover/isabelle/provers/clasimp.ts +1 -15
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +29 -54
  120. package/src/prover/isabelle/pure/bicompose.ts +24 -39
  121. package/src/prover/isabelle/pure/consts.ts +0 -8
  122. package/src/prover/isabelle/pure/conv.ts +2 -18
  123. package/src/prover/isabelle/pure/drule.ts +95 -45
  124. package/src/prover/isabelle/pure/envir.ts +2 -53
  125. package/src/prover/isabelle/pure/goal.ts +1 -9
  126. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  127. package/src/prover/isabelle/pure/list.ts +0 -3
  128. package/src/prover/isabelle/pure/logic.ts +1 -16
  129. package/src/prover/isabelle/pure/name.ts +1 -10
  130. package/src/prover/isabelle/pure/net.ts +2 -60
  131. package/src/prover/isabelle/pure/object-logic.ts +15 -16
  132. package/src/prover/isabelle/pure/pattern.ts +1 -20
  133. package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
  134. package/src/prover/isabelle/pure/rewriter.ts +34 -77
  135. package/src/prover/isabelle/pure/search.ts +2 -11
  136. package/src/prover/isabelle/pure/seq.ts +0 -11
  137. package/src/prover/isabelle/pure/simplifier.ts +27 -16
  138. package/src/prover/isabelle/pure/table.ts +2 -33
  139. package/src/prover/isabelle/pure/tactic.ts +11 -23
  140. package/src/prover/isabelle/pure/tactical.ts +47 -48
  141. package/src/prover/isabelle/pure/term-ord.ts +1 -7
  142. package/src/prover/isabelle/pure/term.ts +4 -47
  143. package/src/prover/isabelle/pure/thm.ts +26 -48
  144. package/src/prover/isabelle/pure/type.ts +1 -16
  145. package/src/prover/isabelle/pure/unify.ts +19 -31
  146. package/src/prover/isabelle/pure/variable.ts +2 -8
  147. package/src/prover/isabelle/tla/classical-setup.ts +17 -25
  148. package/src/prover/isabelle/tla/context.ts +65 -26
  149. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  150. package/src/prover/isabelle/tla/logic.ts +53 -32
  151. package/src/prover/isabelle/tla/simpdata.ts +45 -44
  152. package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
  153. package/src/prover/ocaml.ts +4 -7
  154. package/src/prover/prep/action.ts +33 -66
  155. package/src/prover/prep/enabled-axioms.ts +22 -20
  156. package/src/prover/prep/fingerprint.ts +2 -21
  157. package/src/prover/prep/level-comparison.ts +8 -12
  158. package/src/prover/prep/md5.ts +26 -31
  159. package/src/prover/prep/methods.ts +189 -86
  160. package/src/prover/prep/normalize.ts +42 -37
  161. package/src/prover/prove-worker.ts +0 -2
  162. package/src/prover/prove.ts +398 -133
  163. package/src/prover/ptl/decide.ts +96 -56
  164. package/src/prover/ptl/encode.ts +15 -38
  165. package/src/prover/ptl/sat.ts +24 -32
  166. package/src/prover/ptl/tableau.ts +40 -28
  167. package/src/prover/smt/arithmetic.ts +310 -0
  168. package/src/prover/smt/axioms.ts +12 -15
  169. package/src/prover/smt/context.ts +60 -32
  170. package/src/prover/smt/data.ts +517 -401
  171. package/src/prover/smt/encode.ts +155 -85
  172. package/src/prover/smt/extensionality.ts +5 -13
  173. package/src/prover/smt/flatten.ts +7 -28
  174. package/src/prover/smt/format.ts +33 -14
  175. package/src/prover/smt/instances.ts +7 -11
  176. package/src/prover/smt/layout.ts +91 -0
  177. package/src/prover/smt/rewrite.ts +1021 -658
  178. package/src/prover/smt/simplify.ts +441 -0
  179. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  180. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  181. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  182. package/src/prover/smt/solver/act-cache.ts +0 -16
  183. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  184. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  185. package/src/prover/smt/solver/aig.ts +889 -0
  186. package/src/prover/smt/solver/arith-rewriter.ts +626 -56
  187. package/src/prover/smt/solver/arith-terms.ts +121 -0
  188. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  189. package/src/prover/smt/solver/array-rewriter.ts +319 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +241 -99
  192. package/src/prover/smt/solver/ast-lt.ts +165 -21
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1480 -184
  195. package/src/prover/smt/solver/auf-solver.ts +30 -56
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  199. package/src/prover/smt/solver/bound-manager.ts +196 -0
  200. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  201. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  202. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  203. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  204. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  205. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  206. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  207. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  208. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  209. package/src/prover/smt/solver/card2bv.ts +127 -0
  210. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  211. package/src/prover/smt/solver/cg-table.ts +39 -42
  212. package/src/prover/smt/solver/check-logic.ts +330 -0
  213. package/src/prover/smt/solver/clause.ts +0 -27
  214. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  215. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  216. package/src/prover/smt/solver/context.ts +600 -187
  217. package/src/prover/smt/solver/ctx-simplify.ts +34 -52
  218. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  219. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  220. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  221. package/src/prover/smt/solver/demodulator.ts +786 -0
  222. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  223. package/src/prover/smt/solver/der.ts +39 -30
  224. package/src/prover/smt/solver/diff-neq.ts +205 -0
  225. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  226. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  227. package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
  228. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  229. package/src/prover/smt/solver/e-matching.ts +9 -41
  230. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  231. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  232. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  233. package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
  234. package/src/prover/smt/solver/enode.ts +100 -23
  235. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  236. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  237. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  238. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  239. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  240. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  241. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  242. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  243. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  244. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  245. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  246. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  247. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  248. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  249. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  250. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  251. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  252. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  253. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  254. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  255. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  256. package/src/prover/smt/solver/expr-ref.ts +0 -5
  257. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  258. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  259. package/src/prover/smt/solver/factor.ts +163 -0
  260. package/src/prover/smt/solver/fd-solver.ts +734 -0
  261. package/src/prover/smt/solver/fingerprints.ts +15 -26
  262. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  263. package/src/prover/smt/solver/flat-literals.ts +0 -9
  264. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  265. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  266. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  267. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  268. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  269. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  270. package/src/prover/smt/solver/goal.ts +179 -28
  271. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  272. package/src/prover/smt/solver/guard-set.ts +219 -0
  273. package/src/prover/smt/solver/hash.ts +0 -9
  274. package/src/prover/smt/solver/hashtable.ts +30 -23
  275. package/src/prover/smt/solver/inf-eps.ts +63 -0
  276. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  277. package/src/prover/smt/solver/internalizer.ts +113 -133
  278. package/src/prover/smt/solver/lackr.ts +381 -0
  279. package/src/prover/smt/solver/lbool.ts +0 -2
  280. package/src/prover/smt/solver/lia2card.ts +268 -0
  281. package/src/prover/smt/solver/lia2pb.ts +154 -0
  282. package/src/prover/smt/solver/literal.ts +0 -4
  283. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  284. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  285. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  286. package/src/prover/smt/solver/lp/containers.ts +18 -31
  287. package/src/prover/smt/solver/lp/core-solver.ts +35 -37
  288. package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
  289. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  290. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  291. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  292. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  293. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  294. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  295. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  296. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  297. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  298. package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
  299. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  300. package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
  301. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  302. package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
  303. package/src/prover/smt/solver/lp/nex.ts +2 -7
  304. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  305. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  306. package/src/prover/smt/solver/lp/nla-core.ts +92 -136
  307. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  308. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  309. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  310. package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
  311. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  312. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  313. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  314. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  315. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  316. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  317. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  318. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  319. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  320. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  321. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  322. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  323. package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
  324. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  325. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
  326. package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
  327. package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
  328. package/src/prover/smt/solver/lp/pdd.ts +730 -358
  329. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  330. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  331. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  332. package/src/prover/smt/solver/macro-finder.ts +530 -0
  333. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  334. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  335. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  336. package/src/prover/smt/solver/max-cliques.ts +105 -0
  337. package/src/prover/smt/solver/maxcore.ts +310 -0
  338. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  339. package/src/prover/smt/solver/maxlex.ts +115 -0
  340. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  341. package/src/prover/smt/solver/maxsmt.ts +92 -0
  342. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  343. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  344. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  345. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  346. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  347. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  348. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  349. package/src/prover/smt/solver/model-checker.ts +20 -63
  350. package/src/prover/smt/solver/model-evaluator.ts +192 -40
  351. package/src/prover/smt/solver/model-finder.ts +14 -32
  352. package/src/prover/smt/solver/model-generator.ts +104 -46
  353. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  354. package/src/prover/smt/solver/model-printer.ts +214 -0
  355. package/src/prover/smt/solver/mpf.ts +709 -0
  356. package/src/prover/smt/solver/mus.ts +50 -0
  357. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  358. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  359. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  360. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  361. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  362. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  363. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  364. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  365. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  366. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  367. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  368. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  369. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  370. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  371. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  372. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  373. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  374. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  375. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  376. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  377. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  378. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  379. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  380. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  381. package/src/prover/smt/solver/nlqsat.ts +484 -0
  382. package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
  383. package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
  384. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  385. package/src/prover/smt/solver/nlsat/explain.ts +429 -275
  386. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  387. package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
  388. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  389. package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
  390. package/src/prover/smt/solver/nlsat/solver.ts +297 -156
  391. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  392. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  393. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  394. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
  395. package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
  396. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  397. package/src/prover/smt/solver/nnf.ts +112 -61
  398. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  399. package/src/prover/smt/solver/occf.ts +97 -0
  400. package/src/prover/smt/solver/opt-context.ts +801 -0
  401. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  402. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  403. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  404. package/src/prover/smt/solver/opt-solver.ts +312 -0
  405. package/src/prover/smt/solver/opt-value.ts +55 -0
  406. package/src/prover/smt/solver/optsmt.ts +692 -0
  407. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  408. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  409. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  410. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  411. package/src/prover/smt/solver/poly-rewriter.ts +261 -79
  412. package/src/prover/smt/solver/probes.ts +577 -0
  413. package/src/prover/smt/solver/propagate-values.ts +37 -30
  414. package/src/prover/smt/solver/proto-model.ts +650 -66
  415. package/src/prover/smt/solver/pull-quant.ts +28 -23
  416. package/src/prover/smt/solver/purify-arith.ts +632 -0
  417. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  418. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  419. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  420. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  421. package/src/prover/smt/solver/qe-lite.ts +41 -51
  422. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  423. package/src/prover/smt/solver/qe.ts +1499 -0
  424. package/src/prover/smt/solver/qel.ts +25 -0
  425. package/src/prover/smt/solver/qi-queue.ts +0 -16
  426. package/src/prover/smt/solver/qsat.ts +829 -0
  427. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  428. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  429. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  430. package/src/prover/smt/solver/quantifier-manager.ts +22 -32
  431. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  432. package/src/prover/smt/solver/random-gen.ts +0 -2
  433. package/src/prover/smt/solver/rational.ts +45 -8
  434. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  435. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  436. package/src/prover/smt/solver/reduce-args.ts +225 -0
  437. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  438. package/src/prover/smt/solver/ref-vector.ts +0 -6
  439. package/src/prover/smt/solver/relevancy.ts +2 -16
  440. package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
  441. package/src/prover/smt/solver/rewriter.ts +507 -144
  442. package/src/prover/smt/solver/rlimit.ts +46 -24
  443. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  444. package/src/prover/smt/solver/sat/big.ts +177 -0
  445. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  446. package/src/prover/smt/solver/sat/clause.ts +203 -0
  447. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  448. package/src/prover/smt/solver/sat/config.ts +122 -0
  449. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  450. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  451. package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
  452. package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
  453. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  454. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  455. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  456. package/src/prover/smt/solver/sat/probing.ts +170 -0
  457. package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
  458. package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
  459. package/src/prover/smt/solver/sat/scc.ts +142 -0
  460. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  461. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  462. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  463. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  464. package/src/prover/smt/solver/search-tree.ts +284 -0
  465. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  466. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  467. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  468. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  469. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  470. package/src/prover/smt/solver/seq-factory.ts +89 -0
  471. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  472. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  473. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  474. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  475. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  476. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  477. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  478. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  479. package/src/prover/smt/solver/seq-subset.ts +165 -0
  480. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  481. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  482. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  483. package/src/prover/smt/solver/smt-logics.ts +66 -0
  484. package/src/prover/smt/solver/smt-setup.ts +589 -0
  485. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  486. package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
  487. package/src/prover/smt/solver/smtlib-script.ts +2134 -0
  488. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  489. package/src/prover/smt/solver/solver.ts +129 -38
  490. package/src/prover/smt/solver/sort.ts +1 -5
  491. package/src/prover/smt/solver/static-features.ts +314 -0
  492. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  493. package/src/prover/smt/solver/tactic.ts +2141 -0
  494. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  495. package/src/prover/smt/solver/theory-array.ts +1240 -0
  496. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  497. package/src/prover/smt/solver/theory-char.ts +355 -0
  498. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  499. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  500. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  501. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  502. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  503. package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
  504. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
  505. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  506. package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
  507. package/src/prover/smt/solver/theory-lra-state.ts +7 -28
  508. package/src/prover/smt/solver/theory-lra.ts +189 -9
  509. package/src/prover/smt/solver/theory-pb.ts +951 -0
  510. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  511. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  512. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  513. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  514. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  515. package/src/prover/smt/solver/theory-seq.ts +961 -0
  516. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  517. package/src/prover/smt/solver/theory.ts +189 -0
  518. package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
  519. package/src/prover/smt/solver/var-subst.ts +37 -39
  520. package/src/prover/smt/table.ts +3 -10
  521. package/src/prover/smt/types.ts +146 -0
  522. package/src/prover/tlapm/cache.ts +74 -48
  523. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  524. package/src/prover/tlapm/tlapm.ts +21 -20
  525. package/src/prover/tlapm-library.ts +3208 -0
  526. package/src/prover/verdict.ts +9 -2
  527. package/src/prover/zenon/check/check.ts +1 -11
  528. package/src/prover/zenon/check/definitions.ts +5 -15
  529. package/src/prover/zenon/check/equality.ts +0 -8
  530. package/src/prover/zenon/check/functions.ts +0 -4
  531. package/src/prover/zenon/check/keys.ts +0 -7
  532. package/src/prover/zenon/check/propositional.ts +0 -3
  533. package/src/prover/zenon/check/records.ts +1 -6
  534. package/src/prover/zenon/check/relations.ts +2 -14
  535. package/src/prover/zenon/check/rewrites.ts +2 -21
  536. package/src/prover/zenon/check/sets.ts +40 -61
  537. package/src/prover/zenon/check/terms.ts +1 -19
  538. package/src/prover/zenon/check/tla.ts +0 -6
  539. package/src/prover/zenon/decide.ts +10 -19
  540. package/src/prover/zenon/encode.ts +0 -9
  541. package/src/prover/zenon/eqrel.ts +2 -15
  542. package/src/prover/zenon/equality-rules.ts +24 -6
  543. package/src/prover/zenon/expr.ts +29 -28
  544. package/src/prover/zenon/index-table.ts +33 -61
  545. package/src/prover/zenon/isar-case.ts +9 -21
  546. package/src/prover/zenon/isar.ts +37 -67
  547. package/src/prover/zenon/limits.ts +0 -4
  548. package/src/prover/zenon/llproof.ts +2 -22
  549. package/src/prover/zenon/mltoll.ts +66 -106
  550. package/src/prover/zenon/node.ts +20 -15
  551. package/src/prover/zenon/ocaml.ts +1 -17
  552. package/src/prover/zenon/parse.ts +9 -13
  553. package/src/prover/zenon/phrase.ts +2 -14
  554. package/src/prover/zenon/proof.ts +0 -11
  555. package/src/prover/zenon/propositional-rules.ts +0 -7
  556. package/src/prover/zenon/rules.ts +3 -8
  557. package/src/prover/zenon/search.ts +11 -35
  558. package/src/prover/zenon/tla/functions.ts +59 -33
  559. package/src/prover/zenon/tla/llproof.ts +67 -78
  560. package/src/prover/zenon/tla/records.ts +57 -35
  561. package/src/prover/zenon/tla/rewrites.ts +12 -21
  562. package/src/prover/zenon/tla/sets.ts +88 -59
  563. package/src/prover/zenon/tla/terms.ts +0 -8
  564. package/src/prover/zenon/tla/tla.ts +66 -66
  565. package/src/randomization.ts +81 -35
  566. package/src/resolve.ts +1132 -430
  567. package/src/runtime.ts +33 -23
  568. package/src/sany/builtins.ts +11 -14
  569. package/src/sany/generation.ts +383 -0
  570. package/src/sany/generator-def-entries.ts +210 -0
  571. package/src/sany/generator-definitions.ts +688 -0
  572. package/src/sany/generator-expressions.ts +1108 -0
  573. package/src/sany/generator-proofs.ts +665 -0
  574. package/src/sany/generator.ts +192 -2764
  575. package/src/sany/levels.ts +5 -35
  576. package/src/sany/lexer.ts +61 -80
  577. package/src/sany/linter.ts +0 -10
  578. package/src/sany/modules.ts +5 -7
  579. package/src/sany/nodes.ts +6 -44
  580. package/src/sany/parse-error.ts +39 -117
  581. package/src/sany/report.ts +32 -69
  582. package/src/sany/selectors.ts +60 -82
  583. package/src/sany/source.ts +1 -17
  584. package/src/sany/xml.ts +37 -120
  585. package/src/search.ts +913 -227
  586. package/src/simulate.ts +765 -0
  587. package/src/spec-description.ts +198 -104
  588. package/src/standard-definitions.ts +4 -4
  589. package/src/standard-modules.ts +302 -99
  590. package/src/state-graph.ts +52 -33
  591. package/src/subexpressions.ts +578 -166
  592. package/src/substitution-levels.ts +7 -7
  593. package/src/successors.ts +296 -105
  594. package/src/symmetry.ts +37 -28
  595. package/src/tableau.ts +29 -26
  596. package/src/tlc/fingerprint.ts +267 -79
  597. package/src/tlc/jar-data.ts +122 -6
  598. package/src/tlc/messages.ts +127 -56
  599. package/src/tlc/order.ts +53 -72
  600. package/src/tlc/random.ts +38 -49
  601. package/src/tlc/replay.ts +579 -230
  602. package/src/tlc/summary.ts +64 -60
  603. package/src/tlc/tlc-operators.ts +83 -47
  604. package/src/tlc/tlcext-operators.ts +205 -127
  605. package/src/tlc/trace-spec.ts +235 -0
  606. package/src/tlc/value-stream.ts +139 -0
  607. package/src/tlc/version.ts +1 -4
  608. package/src/trace-liveness.ts +529 -0
  609. package/src/transfer.ts +22 -25
  610. package/src/typed-tier.ts +6556 -0
  611. package/src/typescript/actions.ts +10 -25
  612. package/src/typescript/collections.ts +34 -35
  613. package/src/typescript/compile.ts +1 -8
  614. package/src/typescript/context.ts +0 -12
  615. package/src/typescript/emit.ts +0 -1
  616. package/src/typescript/expressions.ts +0 -12
  617. package/src/typescript/formula.ts +9 -15
  618. package/src/typescript/functions.ts +6 -17
  619. package/src/typescript/model.ts +14 -16
  620. package/src/typescript/names.ts +0 -2
  621. package/src/typescript/program.ts +0 -3
  622. package/src/typescript/properties.ts +6 -8
  623. package/src/typescript/scope.ts +0 -5
  624. package/src/typescript/steps.ts +20 -28
  625. package/src/typescript/types.ts +3 -10
  626. package/src/values.ts +917 -522
  627. package/src/worker.ts +7 -8
  628. package/src/prover/isabelle/isar/statement.ts +0 -57
  629. package/src/prover/smt/solver/z3-license.txt +0 -10
  630. package/src/prover/tlaps-module.ts +0 -510
  631. package/src/prover/zenon/LICENSE +0 -32
@@ -1,4 +1,4 @@
1
- import { TlaEvaluationError, TlaModuleError } from "./errors";
1
+ import { TlaEvaluationError, TlaModuleError, TlaSetBoundError } from "./errors";
2
2
  import {
3
3
  createModuleArgumentError,
4
4
  createOverflowError,
@@ -9,46 +9,60 @@ import {
9
9
  defineHigherOrderOperator,
10
10
  defineOperator,
11
11
  getBoolean,
12
- getNumber,
13
12
  getOperator,
14
- getSet,
13
+ getThunk,
15
14
  getJavaSignature,
16
15
  getJavaInteger,
17
16
  getValue,
18
17
  isOutOfRange,
19
18
  overrideWithJava,
20
19
  } from "./builtins";
21
- import type { Builtin, BuiltinArgument } from "./evaluate";
20
+ import type { Builtin, BuiltinArgument, Context } from "./evaluate";
21
+ import { prettyPrint } from "./pretty-print";
22
22
  import type { CheckerRuntime } from "./runtime";
23
23
  import { createBagsOperators } from "./bags";
24
- import { createJsonOperators, type FileSystem } from "./json";
25
- import { createRandomizationOperators } from "./randomization";
24
+ import { createIoUtilsOperators, createJsonOperators, type FileSystem } from "./json";
25
+ import { createTlcTraceOperators } from "./tlc/value-stream";
26
+ import { createRandomizationOperators, createRandomSubsetSet } from "./randomization";
26
27
  import { createPossibleOperators, createTlcExtOperators } from "./tlc/tlcext-operators";
27
28
  import { createTlcOperators } from "./tlc/tlc-operators";
28
29
  import { TLC_JAVA_METHODS } from "./tlc/jar-data";
29
30
  import {
31
+ addBoundedElement,
32
+ ANY_SET,
33
+ createUnsortedCopy,
34
+ forEachElement,
35
+ isBeyondSetBound,
30
36
  createSet,
31
- describeKind,
37
+ createSortedSet,
38
+ compareValues,
32
39
  createTuple,
33
40
  getSortedDifference,
34
41
  formatValue,
35
42
  getCardinality,
36
43
  getDomain,
44
+ getFunctionClass,
37
45
  getSortedIntersection,
46
+ someStreamedElement,
38
47
  isElementOf,
39
48
  getSequenceElements,
40
49
  isEmptySet,
41
50
  isEnumerable,
42
51
  isFiniteSet,
43
52
  isFunctionValue,
53
+ isOverriddenSet,
44
54
  computeLikeTlcOnFailure,
45
55
  isReducibleSet,
56
+ markNormalized,
46
57
  markStreamedSet,
47
58
  isSetValue,
48
59
  toFiniteSet,
49
60
  getSortedUnion,
61
+ getValueKey,
62
+ getWrittenElements,
50
63
  isEqualLikeTlc,
51
64
  createEnumeratedSet,
65
+ createNormalizedSet,
52
66
  EMPTY_SET,
53
67
  isEnumeratedSet,
54
68
  type IntervalValue,
@@ -57,21 +71,18 @@ import {
57
71
  type SetValue,
58
72
  type Value,
59
73
  rankString,
74
+ getMaximumSetSize,
75
+ getSetBoundMessage,
60
76
  } from "./values";
61
77
  import type { TlcVersion } from "./tlc/version";
62
-
63
- interface StandardModule {
64
- extends: string[];
65
- operators: Builtin[];
66
- }
78
+ import { getSanyStandardModules } from "./sany/modules";
67
79
 
68
80
  const isSubsetOf = (left: Value[], right: Value) =>
69
81
  left.every((element) => isElementOf(element, right));
70
82
 
71
83
  const BOOLEAN_SET = createSet([false, true]);
84
+ markNormalized(BOOLEAN_SET);
72
85
 
73
- // Merging the sets pairwise in a balanced tree compares each element about log2 of their count
74
- // times.
75
86
  const getBalancedUnion = (sets: SetValue[], start: number, end: number): SetValue => {
76
87
  if (end - start === 1) return sets[start];
77
88
  const middle = (start + end) >> 1;
@@ -84,26 +95,84 @@ type ReducibleSet = SetValue | MixedSetValue | IntervalValue;
84
95
 
85
96
  const isMixedSet = (value: Value) => typeof value === "object" && value.kind === "MixedSet";
86
97
 
87
- // TLC combines a set enumeration or an interval with another set element by element, testing each
88
- // element for membership in the other set.
98
+ const isNormalizedReducible = (set: ReducibleSet) =>
99
+ set.kind === "Interval" || (set.kind === "Set" && set.isNormalized);
100
+
89
101
  const combineReducible = (
90
102
  operator: SetOperationValue["operator"],
91
103
  set: ReducibleSet,
92
104
  other: Value,
93
105
  ): Value => {
94
- const elements = set.kind === "Interval" ? toFiniteSet(set).elements : set.elements;
106
+ if (set.kind === "Interval") getCardinality(set);
107
+ const elements = set.kind === "Interval" ? set : getWrittenElements(set);
95
108
  if (operator !== "\\cup") {
96
109
  const isKept = operator === "\\cap";
97
- return createEnumeratedSet(
98
- elements.filter((element) => isElementOf(element, other) === isKept),
99
- );
110
+ const kept: Value[] = [];
111
+ forEachElement(elements, (element) => {
112
+ if (isElementOf(element, other) === isKept) addBoundedElement(kept, element);
113
+ });
114
+ return isNormalizedReducible(set) ? createNormalizedSet(kept) : createEnumeratedSet(kept);
100
115
  }
101
- if (elements.length === 0) return other;
116
+ if (isEmptySet(set)) return other;
102
117
  if (!isReducibleSet(other)) {
103
118
  return markStreamedSet({ kind: "SetOperation", operator, left: set, right: other });
104
119
  }
105
- const added = toFiniteSet(other).elements.filter((element) => !isElementOf(element, set));
106
- return createEnumeratedSet([...elements, ...added]);
120
+ const union: Value[] = [];
121
+ forEachElement(elements, (element) => addBoundedElement(union, element));
122
+ forEachElement(other.kind === "Interval" ? other : toFiniteSet(other).elements, (element) => {
123
+ if (!isElementOf(element, set)) addBoundedElement(union, element);
124
+ });
125
+ return createEnumeratedSet(union);
126
+ };
127
+
128
+ const isIntervalInSortedSet = (interval: IntervalValue, set: SetValue) => {
129
+ const elements = set.elements;
130
+ let low = 0;
131
+ let high = elements.length;
132
+ while (low < high) {
133
+ const middle = (low + high) >> 1;
134
+ const probe = elements[middle];
135
+ if (typeof probe !== "number") return undefined;
136
+ if (probe < interval.low) low = middle + 1;
137
+ else high = middle;
138
+ }
139
+ for (let element = interval.low; element <= interval.high; element++, low++) {
140
+ if (low === elements.length) return false;
141
+ const probe = elements[low];
142
+ if (probe !== element) return typeof probe === "number" ? false : undefined;
143
+ }
144
+ return true;
145
+ };
146
+
147
+ const isIntervalSubset = (left: IntervalValue, right: Value) => {
148
+ const isWithin =
149
+ typeof right === "object" &&
150
+ right.kind === "Interval" &&
151
+ right.low <= left.low &&
152
+ right.high >= left.high;
153
+ if (isWithin) return true;
154
+ const isContained =
155
+ typeof right === "object" && right.kind === "Set"
156
+ ? isIntervalInSortedSet(left, right)
157
+ : undefined;
158
+ if (isContained !== undefined) return isContained;
159
+ for (let element = left.low; element <= left.high; element++) {
160
+ if (!isElementOf(element, right)) return false;
161
+ }
162
+ return true;
163
+ };
164
+
165
+ const defineShortCircuit = (
166
+ name: string,
167
+ compute: (left: boolean, right: () => boolean) => boolean,
168
+ ): Builtin => {
169
+ const getArgument = (args: BuiltinArgument[], index: number) =>
170
+ getBoolean([getThunk(args, index, name)()], 0, name);
171
+ return {
172
+ ...defineOperator(name, 2, (args) => compute(getArgument(args, 0), () => getArgument(args, 1))),
173
+ evaluateBinary: undefined,
174
+ isLazy: true,
175
+ };
107
176
  };
108
177
 
109
178
  export const CORE_OPERATORS: Builtin[] = [
@@ -115,9 +184,9 @@ export const CORE_OPERATORS: Builtin[] = [
115
184
  defineBinary("#", (left, right) => !isEqualLikeTlc(left, right)),
116
185
  defineOperator("~", 1, (args) => !getBoolean(args, 0, "~")),
117
186
  defineOperator("<=>", 2, (args) => getBoolean(args, 0, "<=>") === getBoolean(args, 1, "<=>")),
118
- defineOperator("/\\", 2, (args) => getBoolean(args, 0, "/\\") && getBoolean(args, 1, "/\\")),
119
- defineOperator("\\/", 2, (args) => getBoolean(args, 0, "\\/") || getBoolean(args, 1, "\\/")),
120
- defineOperator("=>", 2, (args) => !getBoolean(args, 0, "=>") || getBoolean(args, 1, "=>")),
187
+ defineShortCircuit("/\\", (left, right) => left && right()),
188
+ defineShortCircuit("\\/", (left, right) => left || right()),
189
+ defineShortCircuit("=>", (left, right) => !left || right()),
121
190
  defineOperator("\\in", 2, (args) =>
122
191
  isElementOf(getValue(args, 0, "\\in"), getValue(args, 1, "\\in")),
123
192
  ),
@@ -126,10 +195,11 @@ export const CORE_OPERATORS: Builtin[] = [
126
195
  2,
127
196
  (args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
128
197
  ),
129
- defineOperator("\\subseteq", 2, (args) => {
130
- const left = getSet(args, 0, "\\subseteq");
131
- // TLC tests each element of the left set for membership in the right value.
132
- const right = getValue(args, 1, "\\subseteq");
198
+ defineBinary("\\subseteq", (left, right) => {
199
+ if (typeof left === "object" && left.kind === "Interval") return isIntervalSubset(left, right);
200
+ if (!isSetValue(left)) {
201
+ throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
202
+ }
133
203
  const isPowerSets =
134
204
  typeof left === "object" &&
135
205
  left.kind === "Subset" &&
@@ -137,19 +207,26 @@ export const CORE_OPERATORS: Builtin[] = [
137
207
  right.kind === "Subset" &&
138
208
  isEnumerable(left.base);
139
209
  if (isPowerSets) return isSubsetOf(toFiniteSet(left.base).elements, right.base);
140
- return isSubsetOf(toFiniteSet(left).elements, right);
210
+ return !someStreamedElement(left, (element) => !isElementOf(element, right));
141
211
  }),
142
- // TLC defers the set operations of values that aren't sets to the enumeration or the membership
143
- // tests of the result.
144
212
  ...SET_OPERATORS.map((operator) =>
145
213
  defineOperator(operator, 2, (args) => {
146
214
  const left = getValue(args, 0, operator);
147
215
  const right = getValue(args, 1, operator);
216
+ const isFilteredByInterval =
217
+ operator !== "\\cup" &&
218
+ typeof right === "object" &&
219
+ right.kind === "Interval" &&
220
+ typeof left === "object" &&
221
+ left.kind !== "Interval";
148
222
  if (
149
223
  isReducibleSet(left) &&
150
224
  isReducibleSet(right) &&
151
225
  !isMixedSet(left) &&
152
- !isMixedSet(right)
226
+ !isMixedSet(right) &&
227
+ !isFilteredByInterval &&
228
+ !isBeyondSetBound(left) &&
229
+ !isBeyondSetBound(right)
153
230
  ) {
154
231
  if (operator === "\\cup" && isEmptySet(left)) return right;
155
232
  const merge =
@@ -158,9 +235,34 @@ export const CORE_OPERATORS: Builtin[] = [
158
235
  : operator === "\\cap"
159
236
  ? getSortedIntersection
160
237
  : getSortedDifference;
161
- // The merge compares the elements, which TLC tests for membership one by one instead.
162
238
  return computeLikeTlcOnFailure(
163
- (finiteLeft, finiteRight) => merge(toFiniteSet(finiteLeft), toFiniteSet(finiteRight)),
239
+ (finiteLeft, finiteRight) => {
240
+ const leftSet = toFiniteSet(finiteLeft);
241
+ const rightSet = toFiniteSet(finiteRight);
242
+ const merged = merge(leftSet, rightSet);
243
+ if (operator === "\\cup") {
244
+ const written = getWrittenElements(leftSet);
245
+ const added = getSortedDifference(rightSet, leftSet).elements;
246
+ const isSorted =
247
+ written === leftSet.elements &&
248
+ (added.length === 0 || compareValues(written[written.length - 1], added[0]) < 0);
249
+ if (written.length + added.length > getMaximumSetSize()) {
250
+ throw new TlaSetBoundError(getSetBoundMessage());
251
+ }
252
+ if (isSorted && !leftSet.isNormalized) return merged;
253
+ const union = merged === leftSet ? createSortedSet(merged.elements) : merged;
254
+ if (!isSorted) union.writtenElements = [...written, ...added];
255
+ return union;
256
+ }
257
+ if (merged === finiteLeft) return merged;
258
+ merged.isNormalized = isNormalizedReducible(finiteLeft);
259
+ if (leftSet.writtenElements && !leftSet.isNormalized) {
260
+ merged.writtenElements = leftSet.writtenElements.filter((element) =>
261
+ isElementOf(element, merged),
262
+ );
263
+ }
264
+ return merged;
265
+ },
164
266
  (reducibleLeft, reducibleRight) =>
165
267
  combineReducible(operator, reducibleLeft, reducibleRight),
166
268
  left,
@@ -175,21 +277,29 @@ export const CORE_OPERATORS: Builtin[] = [
175
277
  ),
176
278
  defineOperator("SUBSET", 1, (args) => ({ kind: "Subset", base: getValue(args, 0, "SUBSET") })),
177
279
  defineOperator("UNION", 1, (args) => {
178
- const outer = getSet(args, 0, "UNION");
179
- const sets = isEnumeratedSet(outer) ? outer.elements.filter(isEnumeratedSet) : [];
180
- if (!isEnumeratedSet(outer) || sets.length !== outer.elements.length) {
280
+ const outer = getValue(args, 0, "UNION");
281
+ const written = isEnumeratedSet(outer) ? getWrittenElements(outer) : [];
282
+ const sets = written.filter(isEnumeratedSet);
283
+ if (!isEnumeratedSet(outer) || sets.length !== written.length) {
181
284
  return markStreamedSet({ kind: "Union", base: outer });
182
285
  }
183
- if (isMixedSet(outer) || sets.some(isMixedSet)) {
286
+ const added = sets.flatMap(getWrittenElements);
287
+ const getUnionLikeTlc = () => {
184
288
  const union: MixedSetValue = { kind: "MixedSet", elements: [] };
185
- sets.forEach((set) =>
186
- set.elements.forEach((member) => {
187
- if (!isElementOf(member, union)) union.elements.push(member);
188
- }),
189
- );
289
+ added.forEach((member) => {
290
+ if (!isElementOf(member, union)) addBoundedElement(union.elements, member);
291
+ });
190
292
  return createEnumeratedSet(union.elements);
191
- }
192
- return sets.length === 0 ? EMPTY_SET : getBalancedUnion(sets.map(toFiniteSet), 0, sets.length);
293
+ };
294
+ if (isMixedSet(outer) || sets.some(isMixedSet)) return getUnionLikeTlc();
295
+ if (sets.length === 0) return EMPTY_SET;
296
+ return computeLikeTlcOnFailure(
297
+ (finiteSets: SetValue[]) =>
298
+ createUnsortedCopy(getBalancedUnion(finiteSets, 0, finiteSets.length), added),
299
+ getUnionLikeTlc,
300
+ sets.map(toFiniteSet),
301
+ undefined,
302
+ );
193
303
  }),
194
304
  defineOperator("DOMAIN", 1, (args) => {
195
305
  const value = getValue(args, 0, "DOMAIN");
@@ -202,8 +312,6 @@ export const CORE_OPERATORS: Builtin[] = [
202
312
 
203
313
  const NEG_SIGNATURE = getJavaSignature("Integers", "Neg", "IntValue", 1);
204
314
 
205
- // TLC overrides the arithmetic of Naturals with the Java methods of tlc2.module.Naturals, or with
206
- // those of tlc2.module.Integers when the spec loads Integers, and names the method in an error.
207
315
  const createArithmeticOperators = (module: string) => {
208
316
  const dotDotSignature = getJavaSignature(module, "DotDot", "IntervalValue", 2);
209
317
  return [
@@ -221,12 +329,6 @@ const createArithmeticOperators = (module: string) => {
221
329
  }),
222
330
  defineArithmetic(module, "\\div", "Divide", (left, right) => {
223
331
  if (right === 0) throw new TlaModuleError("The second argument of \\div is 0.");
224
- // tlc2.module.Naturals#Divide floors only a quotient Java truncates below 0, and lets
225
- // -2147483648 \div -1 overflow.
226
- if (module === "Naturals") {
227
- const truncated = Math.trunc(left / right) | 0;
228
- return truncated < 0 && Math.imul(truncated, right) !== left ? truncated - 1 : truncated;
229
- }
230
332
  const quotient = Math.floor(left / right);
231
333
  if (isOutOfRange(quotient)) throw createOverflowError(`${left} \\div ${right}`);
232
334
  return quotient;
@@ -239,11 +341,11 @@ const createArithmeticOperators = (module: string) => {
239
341
  }
240
342
  return ((left % right) + right) % right;
241
343
  }),
242
- defineOperator("..", 2, (args) => ({
243
- kind: "Interval",
244
- low: getJavaInteger(getValue(args, 0, ".."), dotDotSignature),
245
- high: getJavaInteger(getValue(args, 1, ".."), dotDotSignature),
246
- })),
344
+ defineBinary("..", (low, high) => {
345
+ // TLC's MethodHandle casts the last argument first.
346
+ const highNumber = getJavaInteger(high, dotDotSignature);
347
+ return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high: highNumber };
348
+ }),
247
349
  ];
248
350
  };
249
351
 
@@ -251,28 +353,46 @@ const NATURALS_ARITHMETIC = createArithmeticOperators("Naturals");
251
353
 
252
354
  const INTEGERS_ARITHMETIC = createArithmeticOperators("Integers");
253
355
 
254
- // The operators of Naturals that TLC overrides with the methods of tlc2.module.Integers when it
255
- // loads Integers for its trace exploration spec, by the operator each replaces.
256
356
  export const getTraceSpecArithmetic = (builtin: Builtin) => {
257
357
  const index = NATURALS_ARITHMETIC.indexOf(builtin);
258
358
  return index === -1 ? undefined : INTEGERS_ARITHMETIC[index];
259
359
  };
260
360
 
361
+ // Naturals#GEQ names itself > in its errors, and Integers#GT returns a BoolValue.
362
+ const createComparisonOperators = (module: string) => {
363
+ const getSignature = (method: string, result = "tlc2.value.IBoolValue") =>
364
+ `public static ${result} tlc2.module.${module}.${method}(tlc2.value.impl.Value,tlc2.value.impl.Value)`;
365
+ const isIntegers = module === "Integers";
366
+ return [
367
+ overrideWithJava(
368
+ defineComparison("<", (left, right) => left < right),
369
+ getSignature("LT"),
370
+ ),
371
+ overrideWithJava(
372
+ defineComparison(">", (left, right) => left > right),
373
+ isIntegers ? getSignature("GT", "tlc2.value.impl.BoolValue") : getSignature("GT"),
374
+ ),
375
+ overrideWithJava(
376
+ defineComparison("<=", (left, right) => left <= right),
377
+ getSignature("LE"),
378
+ ),
379
+ overrideWithJava(
380
+ defineComparison(">=", (left, right) => left >= right, isIntegers ? ">=" : ">"),
381
+ getSignature("GEQ"),
382
+ ),
383
+ ];
384
+ };
385
+
261
386
  const NATURALS_OPERATORS = [
262
387
  defineConstant("Nat", { kind: "InfiniteSet", name: "Nat" }),
263
388
  ...NATURALS_ARITHMETIC,
264
- defineComparison("<", (left, right) => left < right),
265
- defineComparison(">", (left, right) => left > right),
266
- defineComparison("<=", (left, right) => left <= right),
267
- // tlc2.module.Naturals#GEQ names itself > in its errors. Only a spec that extends Integers gets
268
- // the GEQ of tlc2.module.Integers, not one that loads Integers for its trace exploration spec.
269
- defineComparison(">=", (left, right) => left >= right, ">"),
389
+ ...createComparisonOperators("Naturals"),
270
390
  ];
271
391
 
272
392
  const INTEGERS_OPERATORS = [
273
393
  defineConstant("Int", { kind: "InfiniteSet", name: "Int" }),
274
394
  ...INTEGERS_ARITHMETIC,
275
- defineComparison(">=", (left, right) => left >= right),
395
+ ...createComparisonOperators("Integers"),
276
396
  defineOperator("-.", 1, (args) => {
277
397
  const value = getJavaInteger(getValue(args, 0, "-"), NEG_SIGNATURE);
278
398
  if (isOutOfRange(-value)) throw createOverflowError(`-${value}`);
@@ -283,7 +403,7 @@ const INTEGERS_OPERATORS = [
283
403
  const getSequenceArgument = (args: BuiltinArgument[], index: number, message: string) => {
284
404
  const value = getValue(args, index, message);
285
405
  const elements = getSequenceElements(value);
286
- if (!elements) throw new TlaModuleError(`${message}\n${formatValue(value)}`);
406
+ if (!elements) throw new TlaModuleError(`${message}\n${prettyPrint(formatValue(value))}`);
287
407
  return elements;
288
408
  };
289
409
 
@@ -292,6 +412,14 @@ const getSequenceOrString = (args: BuiltinArgument[], index: number, message: st
292
412
  return typeof value === "string" ? value : getSequenceArgument(args, index, message);
293
413
  };
294
414
 
415
+ const getSubSeqIndex = (args: BuiltinArgument[], index: number, position: string) => {
416
+ const value = getValue(args, index, "SubSeq");
417
+ if (typeof value !== "number") {
418
+ throw createModuleArgumentError(position, "SubSeq", "natural number", value);
419
+ }
420
+ return value;
421
+ };
422
+
295
423
  const sliceSequence = (sequence: string | Value[], start: number, end?: number) =>
296
424
  typeof sequence === "string"
297
425
  ? rankString(sequence.slice(start, end))
@@ -324,12 +452,19 @@ const createSequencesOperators = (version: TlcVersion) =>
324
452
  const left = getSequenceOrString(args, 0, getEvaluatingMessage("s \\o t", "sequence"));
325
453
  if (typeof left !== "string") {
326
454
  const right = getSequenceArgument(args, 1, getEvaluatingMessage("t \\o s", "sequence"));
455
+ const kept =
456
+ left.length === 0
457
+ ? getValue(args, 1, "\\o")
458
+ : right.length === 0
459
+ ? getValue(args, 0, "\\o")
460
+ : undefined;
461
+ if (kept !== undefined && getFunctionClass(kept) === "tuple") return kept;
327
462
  return createTuple([...left, ...right]);
328
463
  }
329
464
  const right = getValue(args, 1, "\\o");
330
465
  if (typeof right !== "string") {
331
466
  throw new TlaModuleError(
332
- `${getEvaluatingMessage("t \\o s", "string")}\n${formatValue(right)}`,
467
+ `${getEvaluatingMessage("t \\o s", "string")}\n${prettyPrint(formatValue(right))}`,
333
468
  );
334
469
  }
335
470
  return rankString(left + right);
@@ -358,8 +493,8 @@ const createSequencesOperators = (version: TlcVersion) =>
358
493
  }),
359
494
  defineOperator("SubSeq", 3, (args) => {
360
495
  const sequence = getSequenceOrString(args, 0, getSequenceMessage("first ", "SubSeq"));
361
- const start = getNumber(args, 1, "SubSeq");
362
- const end = getNumber(args, 2, "SubSeq");
496
+ const start = getSubSeqIndex(args, 1, "second");
497
+ const end = getSubSeqIndex(args, 2, "third");
363
498
  if (start > end) return sliceSequence(sequence, 0, 0);
364
499
  const outOfDomain =
365
500
  start < 1 || start > sequence.length
@@ -369,7 +504,7 @@ const createSequencesOperators = (version: TlcVersion) =>
369
504
  : undefined;
370
505
  if (outOfDomain) {
371
506
  throw new TlaModuleError(
372
- `The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${formatValue(getValue(args, 0, "SubSeq"))}\n, but instead it is\n${outOfDomain.value}`,
507
+ `The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${prettyPrint(formatValue(getValue(args, 0, "SubSeq")))}\n, but instead it is\n${outOfDomain.value}`,
373
508
  );
374
509
  }
375
510
  return sliceSequence(sequence, start - 1, end);
@@ -381,7 +516,9 @@ const createSequencesOperators = (version: TlcVersion) =>
381
516
  (element) => {
382
517
  const result = test.call([element]);
383
518
  if (typeof result !== "boolean") {
384
- throw createModuleArgumentError("second", "SelectSeq", "operator", result);
519
+ throw new TlaModuleError(
520
+ `The second argument of SelectSeq should be a boolean-valued operator, but instead it is:\n<Operator ${test.name}>`,
521
+ );
385
522
  }
386
523
  return result;
387
524
  },
@@ -392,16 +529,7 @@ const createSequencesOperators = (version: TlcVersion) =>
392
529
 
393
530
  const createFiniteSetsOperators = (version: TlcVersion) =>
394
531
  withJavaMethods("FiniteSets", [
395
- defineOperator("IsFiniteSet", 1, (args) => {
396
- const value = getValue(args, 0, "IsFiniteSet");
397
- if (isSetValue(value)) return isFiniteSet(value);
398
- if (typeof value === "object" && value.kind === "Function") return true;
399
- throw new TlaEvaluationError(
400
- typeof value === "object" && value.kind === "LazyFunction"
401
- ? `Attempted to check if the function:\n${formatValue(value)}\nis a finite set.`
402
- : `Attempted to check if the ${describeKind(value)} ${formatValue(value)} is a finite set.`,
403
- );
404
- }),
532
+ defineOperator("IsFiniteSet", 1, (args) => isFiniteSet(getValue(args, 0, "IsFiniteSet"))),
405
533
  defineOperator("Cardinality", 1, (args) => {
406
534
  const set = getValue(args, 0, "Cardinality");
407
535
  if (
@@ -409,14 +537,87 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
409
537
  (typeof set === "object" && (set.kind === "InfiniteSet" || set.kind === "SequenceSet"))
410
538
  ) {
411
539
  throw new TlaModuleError(
412
- `Attempted to compute cardinality of the value\n${formatValue(set)}`,
540
+ `Attempted to compute cardinality of the value\n${prettyPrint(formatValue(set))}`,
413
541
  );
414
542
  }
415
543
  return getCardinality(set, version);
416
544
  }),
417
545
  ]);
418
546
 
419
- // The modules that each standard module loads through EXTENDS and LOCAL INSTANCE in TLC.
547
+ const TRANSITIVE_CLOSURE_OPERATORS = [
548
+ overrideWithJava(
549
+ defineOperator("Warshall", 1, (args) => {
550
+ const relation = getValue(args, 0, "Warshall");
551
+ if (!isSetValue(relation) || isOverriddenSet(relation)) {
552
+ throw new TlaModuleError(
553
+ `Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${prettyPrint(formatValue(relation))}`,
554
+ );
555
+ }
556
+ // TLC sizes the relation, which normalizes it.
557
+ getCardinality(relation);
558
+ const nodes: Value[] = [];
559
+ const nodeIndices = new Map<string, number>();
560
+ const getNodeIndex = (node: Value) => {
561
+ const key = getValueKey(node);
562
+ const index = nodeIndices.get(key) ?? nodes.length;
563
+ if (index === nodes.length) {
564
+ nodeIndices.set(key, index);
565
+ nodes.push(node);
566
+ }
567
+ return index;
568
+ };
569
+ const edges = toFiniteSet(relation).elements.map((edge) => {
570
+ const ends = getSequenceElements(edge);
571
+ if (ends?.length !== 2) {
572
+ throw new TlaModuleError(
573
+ `Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${prettyPrint(formatValue(edge))}`,
574
+ );
575
+ }
576
+ return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];
577
+ });
578
+ const matrix = nodes.map(() => nodes.map(() => false));
579
+ edges.forEach((edge) => {
580
+ matrix[edge[0]][edge[1]] = true;
581
+ });
582
+ for (let middle = 0; middle < nodes.length; middle++) {
583
+ for (let from = 0; from < nodes.length; from++) {
584
+ if (!matrix[from][middle]) continue;
585
+ for (let to = 0; to < nodes.length; to++) {
586
+ if (matrix[middle][to]) matrix[from][to] = true;
587
+ }
588
+ }
589
+ }
590
+ return createEnumeratedSet(
591
+ nodes.flatMap((from, fromIndex) =>
592
+ nodes.flatMap((to, toIndex) =>
593
+ matrix[fromIndex][toIndex] ? [createTuple([from, to])] : [],
594
+ ),
595
+ ),
596
+ );
597
+ }),
598
+ "public static tlc2.value.impl.Value tlc2.module.TransitiveClosure.Warshall(tlc2.value.impl.Value)",
599
+ ),
600
+ ];
601
+
602
+ export const getJavaOverrides = (
603
+ name: string,
604
+ print: (text: string) => void,
605
+ runtime: CheckerRuntime,
606
+ files: FileSystem,
607
+ builtins: ReadonlyMap<string, Builtin>,
608
+ evaluateReplaced: (name: string, args: BuiltinArgument[], context: Context | undefined) => Value,
609
+ ) => {
610
+ if (name === "TransitiveClosure") return TRANSITIVE_CLOSURE_OPERATORS;
611
+ if (name === "AnySet") return [defineConstant("ANY", ANY_SET)];
612
+ if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
613
+ if (name === "_TLCTrace") return createTlcTraceOperators(files);
614
+ if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
615
+ const operators = getStandardOperators(name, print, runtime, files, builtins);
616
+ return name === "Randomization" && operators
617
+ ? [...operators, createRandomSubsetSet(runtime)]
618
+ : operators;
619
+ };
620
+
420
621
  export const STANDARD_DEPENDENCIES = new Map([
421
622
  ["Integers", ["Naturals"]],
422
623
  ["Sequences", ["Naturals"]],
@@ -429,34 +630,36 @@ export const STANDARD_DEPENDENCIES = new Map([
429
630
  ["TLCExt", ["TLC", "Integers", "Naturals", "Sequences", "FiniteSets"]],
430
631
  ]);
431
632
 
432
- export const getStandardModule = (
633
+ export const STANDARD_EXTENDS = new Map([["Integers", ["Naturals"]]]);
634
+
635
+ export const getStandardOperators = (
433
636
  name: string,
434
637
  print: (text: string) => void,
435
638
  runtime: CheckerRuntime,
436
639
  files: FileSystem,
437
640
  builtins: ReadonlyMap<string, Builtin>,
438
- ): StandardModule | undefined => {
641
+ ): Builtin[] | undefined => {
439
642
  switch (name) {
440
643
  case "Naturals":
441
- return { extends: [], operators: NATURALS_OPERATORS };
644
+ return NATURALS_OPERATORS;
442
645
  case "Integers":
443
- return { extends: ["Naturals"], operators: INTEGERS_OPERATORS };
646
+ return INTEGERS_OPERATORS;
444
647
  case "Sequences":
445
- return { extends: [], operators: createSequencesOperators(runtime.version) };
648
+ return createSequencesOperators(runtime.version);
446
649
  case "FiniteSets":
447
- return { extends: [], operators: createFiniteSetsOperators(runtime.version) };
650
+ return createFiniteSetsOperators(runtime.version);
448
651
  case "TLC":
449
- return { extends: [], operators: withJavaMethods("TLC", createTlcOperators(print, runtime)) };
652
+ return withJavaMethods("TLC", createTlcOperators(print, runtime));
450
653
  case "Randomization":
451
- return { extends: [], operators: createRandomizationOperators(runtime) };
654
+ return createRandomizationOperators(runtime);
452
655
  case "_Possible":
453
- return { extends: [], operators: createPossibleOperators(print, runtime) };
656
+ return createPossibleOperators(print, runtime);
454
657
  case "Json":
455
- return { extends: [], operators: createJsonOperators(files) };
658
+ return createJsonOperators(files);
456
659
  case "Bags":
457
- return { extends: [], operators: createBagsOperators(builtins) };
660
+ return withJavaMethods("Bags", createBagsOperators(builtins));
458
661
  case "TLCExt":
459
- return { extends: [], operators: createTlcExtOperators(print, runtime) };
662
+ return withJavaMethods("TLCExt", createTlcExtOperators(print, runtime));
460
663
  default:
461
664
  return undefined;
462
665
  }