tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479

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 (587) hide show
  1. package/README.md +2 -1
  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 +41 -37
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +21 -4
  8. package/dist/index.d.ts +21 -4
  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 +2681 -425
  15. package/dist/prove.js +2681 -425
  16. package/dist/run.cjs +41 -42
  17. package/dist/run.js +41 -42
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +97 -89
  21. package/dist/transfer.js +97 -89
  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 +72 -39
  26. package/src/bags.ts +50 -29
  27. package/src/builtins.ts +8 -16
  28. package/src/check-failure.ts +118 -0
  29. package/src/check-trace.ts +321 -0
  30. package/src/check.ts +828 -770
  31. package/src/cli/options.ts +6 -31
  32. package/src/cli/runtime-invariants.ts +20 -56
  33. package/src/cli/shared.ts +1 -1
  34. package/src/cli/tlapm.ts +433 -70
  35. package/src/cli/tlc-arguments.ts +224 -212
  36. package/src/cli/tlc-output.ts +701 -0
  37. package/src/cli/tlc-usage.ts +1 -2
  38. package/src/cli/tlc.ts +65 -712
  39. package/src/cli/xml-exporter.ts +23 -33
  40. package/src/codegen.ts +28 -20
  41. package/src/coverage.ts +255 -20
  42. package/src/dependencies.ts +96 -27
  43. package/src/dfid.ts +115 -50
  44. package/src/environment-config.ts +315 -0
  45. package/src/environment.ts +175 -373
  46. package/src/errors.ts +40 -5
  47. package/src/evaluate.ts +429 -139
  48. package/src/exit-codes.ts +28 -12
  49. package/src/fingerprints.ts +65 -1
  50. package/src/instances.ts +178 -17
  51. package/src/java-hash.ts +14 -0
  52. package/src/java-overrides.ts +2 -2
  53. package/src/json.ts +4 -7
  54. package/src/levels.ts +708 -272
  55. package/src/lexer.ts +17 -5
  56. package/src/liveness-checker.ts +707 -249
  57. package/src/liveness.ts +148 -95
  58. package/src/obligations/action.ts +14 -17
  59. package/src/obligations/anonymize.ts +37 -16
  60. package/src/obligations/enabled-axioms.ts +218 -0
  61. package/src/obligations/equality.ts +1 -3
  62. package/src/obligations/expression.ts +36 -8
  63. package/src/obligations/format.ts +0 -2
  64. package/src/obligations/generate.ts +66 -54
  65. package/src/obligations/index.ts +39 -9
  66. package/src/obligations/levels.ts +24 -11
  67. package/src/obligations/module.ts +28 -41
  68. package/src/obligations/normalize.ts +27 -18
  69. package/src/obligations/operators.ts +0 -2
  70. package/src/obligations/pragma.ts +53 -16
  71. package/src/obligations/printer.ts +48 -18
  72. package/src/obligations/proof.ts +3 -2
  73. package/src/obligations/regroup.ts +0 -2
  74. package/src/obligations/simplify.ts +55 -50
  75. package/src/obligations/source.ts +120 -74
  76. package/src/obligations/subexpression.ts +45 -18
  77. package/src/obligations/substitution.ts +1 -3
  78. package/src/obligations/temporal.ts +5 -7
  79. package/src/obligations/tuples.ts +0 -2
  80. package/src/parallel-worker.ts +17 -31
  81. package/src/parallel.ts +29 -47
  82. package/src/parser.ts +757 -326
  83. package/src/pretty-print.ts +1 -1
  84. package/src/prover/decide-pool.ts +3 -3
  85. package/src/prover/deciders.ts +12 -9
  86. package/src/prover/isabelle/decide.ts +3 -25
  87. package/src/prover/isabelle/encode.ts +72 -42
  88. package/src/prover/isabelle/isar/attrib.ts +250 -0
  89. package/src/prover/isabelle/isar/context.ts +335 -0
  90. package/src/prover/isabelle/isar/induct.ts +382 -0
  91. package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
  92. package/src/prover/isabelle/isar/method.ts +509 -212
  93. package/src/prover/isabelle/isar/proof.ts +570 -14
  94. package/src/prover/isabelle/isar/rule-cases.ts +226 -0
  95. package/src/prover/isabelle/isar/theory.ts +487 -76
  96. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  97. package/src/prover/isabelle/isar/type-check.ts +89 -14
  98. package/src/prover/isabelle/provers/blast/blast.ts +7 -65
  99. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  100. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  101. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  102. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  103. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  104. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  105. package/src/prover/isabelle/provers/classical.ts +45 -20
  106. package/src/prover/isabelle/provers/hypsubst.ts +19 -30
  107. package/src/prover/isabelle/pure/bicompose.ts +9 -27
  108. package/src/prover/isabelle/pure/consts.ts +0 -2
  109. package/src/prover/isabelle/pure/conv.ts +2 -10
  110. package/src/prover/isabelle/pure/drule.ts +72 -6
  111. package/src/prover/isabelle/pure/envir.ts +0 -2
  112. package/src/prover/isabelle/pure/goal.ts +1 -3
  113. package/src/prover/isabelle/pure/logic.ts +1 -3
  114. package/src/prover/isabelle/pure/name.ts +0 -2
  115. package/src/prover/isabelle/pure/net.ts +0 -2
  116. package/src/prover/isabelle/pure/object-logic.ts +13 -7
  117. package/src/prover/isabelle/pure/pattern.ts +0 -2
  118. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
  119. package/src/prover/isabelle/pure/rewriter.ts +9 -20
  120. package/src/prover/isabelle/pure/search.ts +0 -2
  121. package/src/prover/isabelle/pure/seq.ts +0 -2
  122. package/src/prover/isabelle/pure/simplifier.ts +26 -7
  123. package/src/prover/isabelle/pure/table.ts +2 -3
  124. package/src/prover/isabelle/pure/tactic.ts +0 -2
  125. package/src/prover/isabelle/pure/tactical.ts +42 -37
  126. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  127. package/src/prover/isabelle/pure/term.ts +3 -5
  128. package/src/prover/isabelle/pure/thm.ts +14 -13
  129. package/src/prover/isabelle/pure/type.ts +0 -2
  130. package/src/prover/isabelle/pure/unify.ts +0 -2
  131. package/src/prover/isabelle/pure/variable.ts +0 -2
  132. package/src/prover/isabelle/tla/classical-setup.ts +18 -16
  133. package/src/prover/isabelle/tla/context.ts +58 -11
  134. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  135. package/src/prover/isabelle/tla/logic.ts +49 -21
  136. package/src/prover/isabelle/tla/simpdata.ts +1 -12
  137. package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
  138. package/src/prover/ocaml.ts +4 -1
  139. package/src/prover/prep/action.ts +30 -31
  140. package/src/prover/prep/enabled-axioms.ts +11 -2
  141. package/src/prover/prep/fingerprint.ts +2 -5
  142. package/src/prover/prep/md5.ts +26 -29
  143. package/src/prover/prep/methods.ts +181 -51
  144. package/src/prover/prep/normalize.ts +38 -9
  145. package/src/prover/prove.ts +395 -94
  146. package/src/prover/ptl/decide.ts +95 -50
  147. package/src/prover/ptl/encode.ts +2 -3
  148. package/src/prover/ptl/tableau.ts +28 -2
  149. package/src/prover/smt/arithmetic.ts +310 -0
  150. package/src/prover/smt/axioms.ts +12 -8
  151. package/src/prover/smt/context.ts +43 -8
  152. package/src/prover/smt/data.ts +498 -379
  153. package/src/prover/smt/encode.ts +148 -57
  154. package/src/prover/smt/extensionality.ts +5 -3
  155. package/src/prover/smt/flatten.ts +4 -6
  156. package/src/prover/smt/format.ts +28 -4
  157. package/src/prover/smt/instances.ts +7 -1
  158. package/src/prover/smt/layout.ts +91 -0
  159. package/src/prover/smt/rewrite.ts +1016 -618
  160. package/src/prover/smt/simplify.ts +441 -0
  161. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -0
  162. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  163. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  164. package/src/prover/smt/solver/act-cache.ts +0 -1
  165. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  166. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  167. package/src/prover/smt/solver/aig.ts +889 -0
  168. package/src/prover/smt/solver/arith-rewriter.ts +624 -9
  169. package/src/prover/smt/solver/arith-terms.ts +121 -0
  170. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  171. package/src/prover/smt/solver/array-rewriter.ts +319 -0
  172. package/src/prover/smt/solver/asserted-formulas.ts +240 -56
  173. package/src/prover/smt/solver/ast-lt.ts +165 -11
  174. package/src/prover/smt/solver/ast-util.ts +160 -2
  175. package/src/prover/smt/solver/ast.ts +1483 -45
  176. package/src/prover/smt/solver/auf-solver.ts +25 -18
  177. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  178. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  179. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  180. package/src/prover/smt/solver/bound-manager.ts +196 -0
  181. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  182. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  183. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  184. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  185. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  186. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  187. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  188. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  189. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  190. package/src/prover/smt/solver/card2bv.ts +127 -0
  191. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  192. package/src/prover/smt/solver/cg-table.ts +39 -25
  193. package/src/prover/smt/solver/check-logic.ts +330 -0
  194. package/src/prover/smt/solver/clause.ts +0 -1
  195. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  196. package/src/prover/smt/solver/conflict-resolution.ts +78 -2
  197. package/src/prover/smt/solver/context.ts +598 -128
  198. package/src/prover/smt/solver/ctx-simplify.ts +29 -14
  199. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  200. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  201. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  202. package/src/prover/smt/solver/demodulator.ts +786 -0
  203. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  204. package/src/prover/smt/solver/der.ts +38 -10
  205. package/src/prover/smt/solver/diff-neq.ts +207 -0
  206. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  207. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  208. package/src/prover/smt/solver/dt2bv-tactic.ts +298 -0
  209. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  210. package/src/prover/smt/solver/e-matching.ts +7 -8
  211. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  212. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  213. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  214. package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
  215. package/src/prover/smt/solver/enode.ts +100 -3
  216. package/src/prover/smt/solver/eq2bv-tactic.ts +227 -0
  217. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  218. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  219. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  220. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  221. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  222. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  223. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  224. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  225. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  226. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  227. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  228. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  229. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  230. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  231. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  232. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  233. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  234. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  235. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  236. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  237. package/src/prover/smt/solver/expr-ref.ts +0 -1
  238. package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
  239. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  240. package/src/prover/smt/solver/factor.ts +163 -0
  241. package/src/prover/smt/solver/fd-solver.ts +734 -0
  242. package/src/prover/smt/solver/fingerprints.ts +15 -15
  243. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  244. package/src/prover/smt/solver/flat-literals.ts +0 -1
  245. package/src/prover/smt/solver/fm-tactic.ts +886 -0
  246. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  247. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  248. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  249. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  250. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  251. package/src/prover/smt/solver/goal.ts +178 -15
  252. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  253. package/src/prover/smt/solver/guard-set.ts +219 -0
  254. package/src/prover/smt/solver/hash.ts +0 -1
  255. package/src/prover/smt/solver/hashtable.ts +34 -16
  256. package/src/prover/smt/solver/inf-eps.ts +63 -0
  257. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  258. package/src/prover/smt/solver/internalizer.ts +111 -39
  259. package/src/prover/smt/solver/lackr.ts +381 -0
  260. package/src/prover/smt/solver/lbool.ts +0 -1
  261. package/src/prover/smt/solver/lia2card.ts +268 -0
  262. package/src/prover/smt/solver/lia2pb.ts +154 -0
  263. package/src/prover/smt/solver/literal.ts +0 -1
  264. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  265. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  266. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  267. package/src/prover/smt/solver/lp/containers.ts +7 -2
  268. package/src/prover/smt/solver/lp/core-solver.ts +30 -11
  269. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  270. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  271. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  272. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
  273. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  274. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  275. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
  276. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  277. package/src/prover/smt/solver/lp/int-cube.ts +3 -4
  278. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  279. package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
  280. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  281. package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
  282. package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
  283. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  284. package/src/prover/smt/solver/lp/nex.ts +2 -2
  285. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  286. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  287. package/src/prover/smt/solver/lp/nla-core.ts +68 -17
  288. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  289. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  290. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  291. package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
  292. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  293. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  294. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  295. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  296. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  297. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  298. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  299. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  300. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  301. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  302. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  303. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  304. package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
  305. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  306. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  307. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  308. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  309. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  310. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  311. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  312. package/src/prover/smt/solver/lp/union-find.ts +7 -2
  313. package/src/prover/smt/solver/macro-finder.ts +530 -0
  314. package/src/prover/smt/solver/mam-compiler.ts +122 -90
  315. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  316. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  317. package/src/prover/smt/solver/max-cliques.ts +105 -0
  318. package/src/prover/smt/solver/maxcore.ts +310 -0
  319. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
  320. package/src/prover/smt/solver/maxlex.ts +115 -0
  321. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  322. package/src/prover/smt/solver/maxsmt.ts +92 -0
  323. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  324. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  325. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  326. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  327. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  328. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  329. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  330. package/src/prover/smt/solver/model-checker.ts +19 -28
  331. package/src/prover/smt/solver/model-evaluator.ts +190 -12
  332. package/src/prover/smt/solver/model-finder.ts +12 -18
  333. package/src/prover/smt/solver/model-generator.ts +104 -35
  334. package/src/prover/smt/solver/model-macro-solver.ts +49 -46
  335. package/src/prover/smt/solver/model-printer.ts +214 -0
  336. package/src/prover/smt/solver/mpf.ts +709 -0
  337. package/src/prover/smt/solver/mus.ts +50 -0
  338. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  339. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  340. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  341. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  342. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  343. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  344. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  345. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  346. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  347. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  348. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  349. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  350. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  351. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  352. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  353. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  354. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  355. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  356. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  357. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  358. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  359. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  360. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  361. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  362. package/src/prover/smt/solver/nlqsat.ts +485 -0
  363. package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
  364. package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
  365. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  366. package/src/prover/smt/solver/nlsat/explain.ts +427 -229
  367. package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
  368. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
  369. package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
  370. package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
  371. package/src/prover/smt/solver/nlsat/solver.ts +293 -92
  372. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  373. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  374. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  375. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
  376. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  377. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  378. package/src/prover/smt/solver/nnf.ts +110 -24
  379. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  380. package/src/prover/smt/solver/occf.ts +97 -0
  381. package/src/prover/smt/solver/opt-context.ts +801 -0
  382. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  383. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  384. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  385. package/src/prover/smt/solver/opt-solver.ts +312 -0
  386. package/src/prover/smt/solver/opt-value.ts +55 -0
  387. package/src/prover/smt/solver/optsmt.ts +692 -0
  388. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  389. package/src/prover/smt/solver/pattern-inference.ts +19 -11
  390. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  391. package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
  392. package/src/prover/smt/solver/poly-rewriter.ts +259 -57
  393. package/src/prover/smt/solver/probes.ts +577 -0
  394. package/src/prover/smt/solver/propagate-values.ts +37 -21
  395. package/src/prover/smt/solver/proto-model.ts +648 -19
  396. package/src/prover/smt/solver/pull-quant.ts +28 -12
  397. package/src/prover/smt/solver/purify-arith.ts +634 -0
  398. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  399. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  400. package/src/prover/smt/solver/qe-lite-der.ts +2 -3
  401. package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
  402. package/src/prover/smt/solver/qe-lite.ts +39 -19
  403. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  404. package/src/prover/smt/solver/qe.ts +1499 -0
  405. package/src/prover/smt/solver/qel.ts +25 -0
  406. package/src/prover/smt/solver/qi-queue.ts +0 -1
  407. package/src/prover/smt/solver/qsat.ts +829 -0
  408. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  409. package/src/prover/smt/solver/quant-tactics.ts +16 -56
  410. package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
  411. package/src/prover/smt/solver/quantifier-manager.ts +22 -25
  412. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  413. package/src/prover/smt/solver/random-gen.ts +0 -1
  414. package/src/prover/smt/solver/rational.ts +45 -1
  415. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  416. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  417. package/src/prover/smt/solver/reduce-args.ts +225 -0
  418. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  419. package/src/prover/smt/solver/ref-vector.ts +0 -1
  420. package/src/prover/smt/solver/relevancy.ts +1 -2
  421. package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
  422. package/src/prover/smt/solver/rewriter.ts +505 -60
  423. package/src/prover/smt/solver/rlimit.ts +45 -5
  424. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  425. package/src/prover/smt/solver/sat/big.ts +177 -0
  426. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  427. package/src/prover/smt/solver/sat/clause.ts +203 -0
  428. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  429. package/src/prover/smt/solver/sat/config.ts +122 -0
  430. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  431. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  432. package/src/prover/smt/solver/sat/goal2sat.ts +589 -0
  433. package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
  434. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  435. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  436. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  437. package/src/prover/smt/solver/sat/probing.ts +170 -0
  438. package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
  439. package/src/prover/smt/solver/sat/sat2goal.ts +190 -0
  440. package/src/prover/smt/solver/sat/scc.ts +142 -0
  441. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  442. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  443. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  444. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  445. package/src/prover/smt/solver/search-tree.ts +284 -0
  446. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  447. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  448. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  449. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  450. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  451. package/src/prover/smt/solver/seq-factory.ts +89 -0
  452. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  453. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  454. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  455. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  456. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  457. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  458. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  459. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  460. package/src/prover/smt/solver/seq-subset.ts +165 -0
  461. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  462. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  463. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  464. package/src/prover/smt/solver/smt-logics.ts +66 -0
  465. package/src/prover/smt/solver/smt-setup.ts +589 -0
  466. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  467. package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
  468. package/src/prover/smt/solver/smtlib-script.ts +2136 -0
  469. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  470. package/src/prover/smt/solver/solver.ts +128 -23
  471. package/src/prover/smt/solver/static-features.ts +314 -0
  472. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  473. package/src/prover/smt/solver/tactic.ts +2176 -0
  474. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  475. package/src/prover/smt/solver/theory-array.ts +1240 -0
  476. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  477. package/src/prover/smt/solver/theory-char.ts +355 -0
  478. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  479. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  480. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  481. package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
  482. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
  483. package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
  484. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
  485. package/src/prover/smt/solver/theory-lra-model.ts +20 -35
  486. package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
  487. package/src/prover/smt/solver/theory-lra-state.ts +7 -23
  488. package/src/prover/smt/solver/theory-lra.ts +189 -2
  489. package/src/prover/smt/solver/theory-pb.ts +951 -0
  490. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  491. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  492. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  493. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  494. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  495. package/src/prover/smt/solver/theory-seq.ts +961 -0
  496. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  497. package/src/prover/smt/solver/theory.ts +189 -0
  498. package/src/prover/smt/solver/tseitin-cnf.ts +495 -0
  499. package/src/prover/smt/solver/var-subst.ts +36 -14
  500. package/src/prover/smt/table.ts +3 -2
  501. package/src/prover/smt/types.ts +146 -0
  502. package/src/prover/tlapm/cache.ts +57 -26
  503. package/src/prover/tlapm/tlapm.ts +15 -9
  504. package/src/prover/tlapm-library.ts +3208 -0
  505. package/src/prover/verdict.ts +9 -0
  506. package/src/prover/zenon/check/check.ts +1 -2
  507. package/src/prover/zenon/check/records.ts +1 -1
  508. package/src/prover/zenon/check/relations.ts +2 -1
  509. package/src/prover/zenon/check/rewrites.ts +2 -15
  510. package/src/prover/zenon/check/sets.ts +40 -58
  511. package/src/prover/zenon/check/terms.ts +1 -2
  512. package/src/prover/zenon/decide.ts +10 -7
  513. package/src/prover/zenon/encode.ts +0 -2
  514. package/src/prover/zenon/eqrel.ts +2 -2
  515. package/src/prover/zenon/equality-rules.ts +24 -2
  516. package/src/prover/zenon/expr.ts +28 -2
  517. package/src/prover/zenon/index-table.ts +16 -23
  518. package/src/prover/zenon/isar-case.ts +1 -3
  519. package/src/prover/zenon/isar.ts +37 -39
  520. package/src/prover/zenon/llproof.ts +2 -13
  521. package/src/prover/zenon/mltoll.ts +12 -30
  522. package/src/prover/zenon/node.ts +20 -5
  523. package/src/prover/zenon/parse.ts +9 -8
  524. package/src/prover/zenon/phrase.ts +1 -3
  525. package/src/prover/zenon/proof.ts +0 -2
  526. package/src/prover/zenon/propositional-rules.ts +0 -2
  527. package/src/prover/zenon/rules.ts +2 -3
  528. package/src/prover/zenon/search.ts +11 -19
  529. package/src/prover/zenon/tla/functions.ts +2 -4
  530. package/src/prover/zenon/tla/llproof.ts +9 -13
  531. package/src/prover/zenon/tla/records.ts +1 -8
  532. package/src/prover/zenon/tla/rewrites.ts +0 -2
  533. package/src/prover/zenon/tla/sets.ts +22 -22
  534. package/src/prover/zenon/tla/terms.ts +0 -2
  535. package/src/prover/zenon/tla/tla.ts +7 -8
  536. package/src/resolve.ts +1327 -328
  537. package/src/runtime.ts +25 -2
  538. package/src/sany/builtins.ts +10 -10
  539. package/src/sany/generation.ts +384 -0
  540. package/src/sany/generator-def-entries.ts +297 -0
  541. package/src/sany/generator-definitions.ts +688 -0
  542. package/src/sany/generator-expressions.ts +1123 -0
  543. package/src/sany/generator-proofs.ts +668 -0
  544. package/src/sany/generator.ts +161 -2625
  545. package/src/sany/levels.ts +0 -2
  546. package/src/sany/lexer.ts +32 -23
  547. package/src/sany/linter.ts +0 -2
  548. package/src/sany/modules.ts +4 -2
  549. package/src/sany/nodes.ts +3 -4
  550. package/src/sany/report.ts +3 -6
  551. package/src/sany/selectors.ts +46 -44
  552. package/src/sany/xml.ts +25 -58
  553. package/src/search.ts +513 -165
  554. package/src/simulate.ts +340 -251
  555. package/src/spec-description.ts +48 -55
  556. package/src/standard-definitions.ts +5 -0
  557. package/src/standard-modules.ts +72 -54
  558. package/src/state-graph.ts +0 -2
  559. package/src/subexpressions.ts +564 -138
  560. package/src/substitution-levels.ts +5 -4
  561. package/src/successors.ts +56 -28
  562. package/src/symmetry.ts +4 -3
  563. package/src/tableau.ts +2 -2
  564. package/src/tlc/fingerprint.ts +81 -9
  565. package/src/tlc/jar-data.ts +10 -0
  566. package/src/tlc/messages.ts +23 -18
  567. package/src/tlc/order.ts +14 -3
  568. package/src/tlc/random.ts +6 -5
  569. package/src/tlc/replay.ts +152 -58
  570. package/src/tlc/summary.ts +29 -14
  571. package/src/tlc/tlc-operators.ts +12 -11
  572. package/src/tlc/tlcext-operators.ts +87 -26
  573. package/src/tlc/trace-spec.ts +27 -60
  574. package/src/trace-liveness.ts +529 -0
  575. package/src/typed-tier.ts +6556 -0
  576. package/src/typescript/actions.ts +2 -4
  577. package/src/typescript/collections.ts +34 -20
  578. package/src/typescript/compile.ts +1 -3
  579. package/src/typescript/formula.ts +5 -3
  580. package/src/typescript/model.ts +4 -5
  581. package/src/typescript/steps.ts +20 -18
  582. package/src/typescript/types.ts +2 -2
  583. package/src/values.ts +208 -227
  584. package/src/prover/isabelle/isar/statement.ts +0 -52
  585. package/src/prover/smt/solver/z3-license.txt +0 -10
  586. package/src/prover/tlaps-module.ts +0 -510
  587. package/src/prover/zenon/LICENSE +0 -32
package/src/bags.ts CHANGED
@@ -4,7 +4,6 @@ import {
4
4
  defineConstant,
5
5
  defineHigherOrderOperator,
6
6
  defineOperator,
7
- getJavaClassName,
8
7
  getKindString,
9
8
  getOperator,
10
9
  getValue,
@@ -12,6 +11,7 @@ import {
12
11
  } from "./builtins";
13
12
  import { TlaEvaluationError, TlaModuleError } from "./errors";
14
13
  import type { Builtin, BuiltinArgument } from "./evaluate";
14
+ import { prettyPrint } from "./pretty-print";
15
15
  import {
16
16
  createEnumeratedSet,
17
17
  createFunction,
@@ -31,7 +31,7 @@ import {
31
31
 
32
32
  const createWrongValueError = (name: string, expected: string, value: Value) =>
33
33
  new TlaModuleError(
34
- `Applying ${name} to the following value,\nwhich is not ${expected}:\n${formatValue(value)}`,
34
+ `Applying ${name} to the following value,\nwhich is not ${expected}:\n${prettyPrint(formatValue(value))}`,
35
35
  );
36
36
 
37
37
  const toFunction = (value: Value) => (isFunctionValue(value) ? toFiniteFunction(value) : undefined);
@@ -45,6 +45,7 @@ const getFunction = (args: BuiltinArgument[], index: number, name: string) => {
45
45
  return functionValue;
46
46
  };
47
47
 
48
+ // Deviation from TLC: Bags#BagIn and Bags#CopiesIn read the null that toFcnRcd gives for a value that isn't a function and leak a NullPointerException, where tla-ts reports the argument as not a bag.
48
49
  const getCount = (args: BuiltinArgument[], name: string) => {
49
50
  const bag = getValue(args, 1, name);
50
51
  const functionValue = toFunction(bag);
@@ -55,6 +56,7 @@ const getCount = (args: BuiltinArgument[], name: string) => {
55
56
  return count;
56
57
  };
57
58
 
59
+ // Deviation from TLC: Bags#BagCup passes the null that toFcnRcd gives for a value that isn't a function to IsABag and leaks a NullPointerException, where tla-ts reports the argument as not a bag.
58
60
  const getAddedBag = (
59
61
  args: BuiltinArgument[],
60
62
  functions: (FunctionValue | undefined)[],
@@ -85,34 +87,44 @@ const findCount = (functionValue: FunctionValue, element: Value) => {
85
87
  return position === -1 ? undefined : functionValue.range[position];
86
88
  };
87
89
 
88
- const toCount = (value: Value) => {
90
+ // Deviation from TLC: Bags.java casts a count to IntValue and leaks the ClassCastException, where tla-ts reports the argument as not a bag.
91
+ const toCount = (value: Value, createError: () => TlaModuleError) => {
89
92
  if (typeof value === "number") return value;
90
- const javaClass = `tlc2.value.impl.${getJavaClassName(value)}`;
91
- throw new TlaEvaluationError(
92
- `class ${javaClass} cannot be cast to class tlc2.value.impl.IntValue (${javaClass} and tlc2.value.impl.IntValue are in unnamed module of loader 'app')`,
93
- );
93
+ throw createError();
94
94
  };
95
95
 
96
- const addCounts = (left: Value, right: Value) => {
97
- const sum = toCount(left) + toCount(right);
96
+ const addCounts = (left: Value, right: Value, createError: () => TlaModuleError) => {
97
+ const sum = toCount(left, createError) + toCount(right, createError);
98
98
  if (isOutOfRange(sum)) throw createOverflowError(`${left}+${right}`);
99
99
  return sum;
100
100
  };
101
101
 
102
- // Deviation from TLC: Bags.java subtracts counts as Java ints, which wrap; this overflows like -.
103
- const subtractCounts = (functionValue: FunctionValue, index: number, other: FunctionValue) => {
104
- const count = toCount(functionValue.range[index]);
102
+ // Deviation from TLC: Bags#BagDiff subtracts counts as Java ints that wrap, where tla-ts reports the overflow as - does.
103
+ const subtractCounts = (
104
+ functionValue: FunctionValue,
105
+ index: number,
106
+ other: FunctionValue,
107
+ createLeftError: () => TlaModuleError,
108
+ createRightError: () => TlaModuleError,
109
+ ) => {
110
+ const count = toCount(functionValue.range[index], createLeftError);
105
111
  const removed = findCount(other, functionValue.domain[index]);
106
112
  if (removed === undefined) return count;
107
- const difference = count - toCount(removed);
113
+ const difference = count - toCount(removed, createRightError);
108
114
  if (isOutOfRange(difference)) throw createOverflowError(`${count}-${removed}`);
109
115
  return difference;
110
116
  };
111
117
 
112
118
  // BagCup looks up a key of its second bag only among the keys of its first.
113
- const addToBag = (pairs: [Value, Value][], key: Value, count: Value, end = pairs.length) => {
119
+ const addToBag = (
120
+ pairs: [Value, Value][],
121
+ key: Value,
122
+ count: Value,
123
+ createError: () => TlaModuleError,
124
+ end = pairs.length,
125
+ ) => {
114
126
  const existing = pairs.slice(0, end).find((pair) => isEqualLikeTlc(key, pair[0]));
115
- if (existing) existing[1] = addCounts(existing[1], count);
127
+ if (existing) existing[1] = addCounts(existing[1], count, createError);
116
128
  else pairs.push([key, count]);
117
129
  };
118
130
 
@@ -130,11 +142,10 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
130
142
  defineOperator("BagCardinality", 1, (args) => {
131
143
  const bag = getValue(args, 0, "BagCardinality");
132
144
  const functionValue = getFunction(args, 0, "BagCardinality");
145
+ const createError = () => createWrongValueError("BagCardinality", "a bag", bag);
133
146
  return functionValue.range.reduce<number>((total, count) => {
134
- if (typeof count !== "number" || count <= 0) {
135
- throw createWrongValueError("BagCardinality", "a bag", bag);
136
- }
137
- return addCounts(total, count);
147
+ if (typeof count !== "number" || count <= 0) throw createError();
148
+ return addCounts(total, count, createError);
138
149
  }, 0);
139
150
  }),
140
151
  defineOperator("BagIn", 2, (args) => {
@@ -147,8 +158,10 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
147
158
  const left = getAddedBag(args, functions, 0);
148
159
  const right = getAddedBag(args, functions, 1);
149
160
  const pairs = getPairs(left);
161
+ const createError = () =>
162
+ createModuleArgumentError("second", "(+)", "bag", getValue(args, 1, "(+)"));
150
163
  right.domain.forEach((key, index) =>
151
- addToBag(pairs, key, right.range[index], left.domain.length),
164
+ addToBag(pairs, key, right.range[index], createError, left.domain.length),
152
165
  );
153
166
  return createFunction(pairs);
154
167
  }),
@@ -159,9 +172,11 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
159
172
  const right = toFunction(rightValue);
160
173
  if (!left) throw createModuleArgumentError("first", "(-)", "bag", leftValue);
161
174
  if (!right) throw createModuleArgumentError("second", "(-)", "bag", rightValue);
175
+ const createLeftError = () => createModuleArgumentError("first", "(-)", "bag", leftValue);
176
+ const createRightError = () => createModuleArgumentError("second", "(-)", "bag", rightValue);
162
177
  return createFunction(
163
178
  left.domain.flatMap((key, index): [Value, Value][] => {
164
- const count = subtractCounts(left, index, right);
179
+ const count = subtractCounts(left, index, right, createLeftError, createRightError);
165
180
  return count > 0 ? [[key, count]] : [];
166
181
  }),
167
182
  );
@@ -172,20 +187,20 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
172
187
  createWrongValueError("BagUnion", "a finite enumerable set", set),
173
188
  );
174
189
  if (elements.length < 2) return elements[0] ?? EMPTY_BAG;
190
+ const createUnionError = () =>
191
+ new TlaModuleError(
192
+ `Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${prettyPrint(formatValue(set))}`,
193
+ );
175
194
  const getBag = (element: Value) => {
176
195
  const functionValue = toFunction(element);
177
- if (!functionValue) {
178
- throw new TlaModuleError(
179
- `Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${formatValue(set)}`,
180
- );
181
- }
196
+ if (!functionValue) throw createUnionError();
182
197
  return functionValue;
183
198
  };
184
199
  const pairs = getPairs(getBag(elements[0]));
185
200
  elements.slice(1).forEach((element) => {
186
201
  const functionValue = getBag(element);
187
202
  functionValue.domain.forEach((key, index) =>
188
- addToBag(pairs, key, functionValue.range[index]),
203
+ addToBag(pairs, key, functionValue.range[index], createUnionError),
189
204
  );
190
205
  });
191
206
  return createFunction(pairs);
@@ -197,9 +212,14 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
197
212
  const right = toFunction(rightValue);
198
213
  if (!left) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, leftValue);
199
214
  if (!right) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, rightValue);
215
+ const createLeftError = () => createWrongValueError("\\sqsubseteq", "a bag", leftValue);
216
+ const createRightError = () => createWrongValueError("\\sqsubseteq", "a bag", rightValue);
200
217
  return left.domain.every((key, index) => {
201
218
  const count = findCount(right, key);
202
- return toCount(left.range[index]) <= (count === undefined ? 0 : toCount(count));
219
+ return (
220
+ toCount(left.range[index], createLeftError) <=
221
+ (count === undefined ? 0 : toCount(count, createRightError))
222
+ );
203
223
  });
204
224
  }),
205
225
  defineHigherOrderOperator("BagOfAll", 2, (args) => {
@@ -210,8 +230,9 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
210
230
  throw createModuleArgumentError("second", "BagOfAll", "function with a finite domain", value);
211
231
  }
212
232
  const pairs: [Value, Value][] = [];
233
+ const createError = () => createModuleArgumentError("second", "BagOfAll", "bag", value);
213
234
  functionValue.domain.forEach((key, index) =>
214
- addToBag(pairs, operator.call([key]), functionValue.range[index]),
235
+ addToBag(pairs, operator.call([key]), functionValue.range[index], createError),
215
236
  );
216
237
  return createFunction(pairs);
217
238
  }),
package/src/builtins.ts CHANGED
@@ -1,10 +1,6 @@
1
- import {
2
- TlaEndOfInputError,
3
- TlaEvaluationError,
4
- TlaModuleError,
5
- TlaNullPointerError,
6
- } from "./errors";
1
+ import { TlaEndOfInputError, TlaEvaluationError, TlaModuleError } from "./errors";
7
2
  import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
3
+ import { prettyPrint } from "./pretty-print";
8
4
  import {
9
5
  formatValue,
10
6
  getFunctionClass,
@@ -56,13 +52,13 @@ export const createModuleArgumentError = (
56
52
  value: Value,
57
53
  ) =>
58
54
  new TlaModuleError(
59
- `The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${formatValue(value)}`,
55
+ `The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${prettyPrint(formatValue(value))}`,
60
56
  );
61
57
 
62
58
  export const toEnumeratedSet = (value: Value, name: string, reported = value) => {
63
59
  if (!isSetValue(value) || isOverriddenSet(value)) {
64
60
  throw new TlaModuleError(
65
- `Applying ${name} to the following value,\nwhich is not a finite set:\n${formatValue(reported)}`,
61
+ `Applying ${name} to the following value,\nwhich is not a finite set:\n${prettyPrint(formatValue(reported))}`,
66
62
  );
67
63
  }
68
64
  return toFiniteSet(value);
@@ -224,11 +220,10 @@ export const getJavaClassName = (value: Value) => {
224
220
 
225
221
  export const getKindString = (value: Value) => KIND_STRINGS[getJavaClassName(value)];
226
222
 
227
- const getJavaOverrideMessage = (signature: string, message: string) =>
228
- `Attempted to apply the operator overridden by the Java method\n${signature},\nbut it produced the following error:\n${message}`;
229
-
230
223
  const createJavaOverrideError = (signature: string, message: string) =>
231
- new TlaEvaluationError(getJavaOverrideMessage(signature, message));
224
+ new TlaEvaluationError(
225
+ `Attempted to apply the operator overridden by the Java method\n${signature},\nbut it produced the following error:\n${message}`,
226
+ );
232
227
 
233
228
  export const overrideWithJava = (builtin: Builtin, signature: string): Builtin => {
234
229
  const reportAsJavaFailure =
@@ -246,9 +241,6 @@ export const overrideWithJava = (builtin: Builtin, signature: string): Builtin =
246
241
  const isWrapped =
247
242
  builtin.isLazy === true || !(error instanceof TlaModuleError) || isFingerprinted;
248
243
  if (!isWrapped) throw error;
249
- if (builtin.isLazy !== true && error instanceof TlaNullPointerError) {
250
- throw new TlaModuleError(getJavaOverrideMessage(signature, error.message));
251
- }
252
244
  throw createJavaOverrideError(signature, error.message);
253
245
  }
254
246
  };
@@ -299,7 +291,7 @@ export const defineArithmetic = (
299
291
  const getIntegerArgument = (value: Value, position: string, name: string) => {
300
292
  if (typeof value !== "number") {
301
293
  throw new TlaModuleError(
302
- `The ${position} argument of ${name} should be an integer, but instead it is:\n${formatValue(value)}`,
294
+ `The ${position} argument of ${name} should be an integer, but instead it is:\n${prettyPrint(formatValue(value))}`,
303
295
  );
304
296
  }
305
297
  return value;
@@ -0,0 +1,118 @@
1
+ import type { Expression } from "./ast";
2
+ import { getErrorExitCode, isStackOverflow, TlaEvaluationError, TlaModuleError } from "./errors";
3
+ import {
4
+ createTracingEnvironment,
5
+ type CallStack,
6
+ type Environment,
7
+ type FingerprintFailure,
8
+ } from "./evaluate";
9
+ import { EXIT_STATUS, getExitCode, getMessageExitStatus } from "./exit-codes";
10
+ import type { TraceFailure } from "./check";
11
+ import { getCodedMessage, isEvalException } from "./tlc/messages";
12
+ import { getFingerprintError, getHeldValues, markFingerprinted, type Value } from "./values";
13
+
14
+ export interface ReplayFailure {
15
+ callStack: Expression[];
16
+ fingerprint: FingerprintFailure | undefined;
17
+ replayError?: TlaEvaluationError;
18
+ }
19
+
20
+ export interface FailureOptions {
21
+ /** What TLC was doing: "behavior-graph" is a failed next state whose call stack comes from adding the state to the behavior graph, "liveness" a failed liveness check. */
22
+ phase?: "initial" | "next" | "behavior-graph" | "liveness";
23
+ initialState?: Value[];
24
+ outDegrees?: number[];
25
+ callStack?: Expression[];
26
+ fingerprint?: FingerprintFailure;
27
+ replayError?: TlaEvaluationError;
28
+ traceFailure?: TraceFailure;
29
+ }
30
+
31
+ const getInitialExitCode = (error: TlaEvaluationError) => {
32
+ const coded = getCodedMessage(error.message);
33
+ return (
34
+ getExitCode(error) ??
35
+ (coded && !isEvalException(error) ? getMessageExitStatus(coded.code) : EXIT_STATUS.error)
36
+ );
37
+ };
38
+
39
+ const getReplayExitCode = (error: TlaEvaluationError): number => {
40
+ const inner = error.cause;
41
+ if (inner instanceof TlaEvaluationError) return getReplayExitCode(inner);
42
+ return error instanceof TlaModuleError ? error.exitCode : EXIT_STATUS.specEvaluationFailure;
43
+ };
44
+
45
+ const getCodeExitCode = (error: TlaEvaluationError) =>
46
+ getExitCode(error) ?? (error instanceof TlaModuleError ? error.exitCode : EXIT_STATUS.error);
47
+
48
+ export const getFailureExitCode = (
49
+ error: TlaEvaluationError,
50
+ failureOptions: FailureOptions,
51
+ is174: boolean,
52
+ ) => {
53
+ const isReplayed = failureOptions.callStack !== undefined;
54
+ switch (failureOptions.phase) {
55
+ case "initial":
56
+ if (isReplayed) return EXIT_STATUS.specEvaluationFailure;
57
+ return is174 ? EXIT_STATUS.success : getInitialExitCode(error);
58
+ case "behavior-graph":
59
+ return getCodeExitCode(error);
60
+ case "liveness":
61
+ return error instanceof TlaModuleError ? error.exitCode : getErrorExitCode(error);
62
+ default:
63
+ if (!isReplayed && failureOptions.phase === "next" && !is174) return getCodeExitCode(error);
64
+ if (!isReplayed) return getErrorExitCode(error);
65
+ return failureOptions.fingerprint
66
+ ? EXIT_STATUS.specEvaluationFailure
67
+ : getReplayExitCode(failureOptions.replayError ?? error);
68
+ }
69
+ };
70
+
71
+ export const getReplayFailure = (
72
+ environment: Environment,
73
+ replay: (tracing: Environment) => void,
74
+ ): ReplayFailure | undefined => {
75
+ const tracing = createTracingEnvironment(environment);
76
+ const callStack = tracing.callStack;
77
+ try {
78
+ replay(tracing);
79
+ return undefined;
80
+ } catch (error) {
81
+ if (isStackOverflow(error)) return { callStack: [], fingerprint: undefined };
82
+ if (!(error instanceof TlaEvaluationError) || !callStack) return undefined;
83
+ return {
84
+ callStack: callStack.expressions,
85
+ fingerprint: callStack.fingerprint,
86
+ replayError: error,
87
+ };
88
+ }
89
+ };
90
+
91
+ const findFailedSources = (value: Value, sources: CallStack["sources"]): Expression[] => {
92
+ if (typeof value !== "object") return [];
93
+ const source = sources.get(value);
94
+ const failed = getHeldValues(value).find((held) => getFingerprintError(held) !== undefined);
95
+ return [
96
+ ...(source ? [source] : []),
97
+ ...(failed === undefined ? [] : findFailedSources(failed, sources)),
98
+ ];
99
+ };
100
+
101
+ export const fingerprintReplayed = (
102
+ state: Value[],
103
+ fingerprintState: Value[],
104
+ callStack: CallStack | undefined,
105
+ ) => {
106
+ for (const value of fingerprintState) {
107
+ const error = getFingerprintError(value);
108
+ if (!error) continue;
109
+ const sources = callStack ? findFailedSources(value, callStack.sources) : [];
110
+ if (callStack && sources.length > 0) {
111
+ callStack.expressions.length = 0;
112
+ callStack.isFrozen = true;
113
+ callStack.fingerprint = { sources, reason: error.message };
114
+ }
115
+ throw error;
116
+ }
117
+ state.forEach(markFingerprinted);
118
+ };
@@ -0,0 +1,321 @@
1
+ import type { CheckOptions, OutputLine, TraceStep } from "./check";
2
+ import type { ModelConfig } from "./config";
3
+ import { TlaEvaluationError } from "./errors";
4
+ import { isImpure, type Environment, type State } from "./evaluate";
5
+ import { getStateHash, isSameState } from "./fingerprints";
6
+ import type { Search } from "./search";
7
+ import { getActionLabel, type SpecAction } from "./spec-description";
8
+ import { getSuccessors, type Successor } from "./successors";
9
+ import { createModelValue, getFingerprintError, isSameValue, type Value } from "./values";
10
+
11
+ export interface Behavior {
12
+ trace: TraceStep[];
13
+ traceOutput?: OutputLine[];
14
+ }
15
+
16
+ interface TraceOptions {
17
+ loopStart?: number;
18
+ known?: number;
19
+ incomplete?: State;
20
+ isPrintedOnly?: boolean;
21
+ }
22
+
23
+ interface RebuiltState {
24
+ state: Value[];
25
+ level: number;
26
+ }
27
+
28
+ export interface SearchPosition {
29
+ index: number;
30
+ isExpanding: boolean;
31
+ candidate: Value[] | undefined;
32
+ candidateLevel: number;
33
+ livenessSource: number;
34
+ rebuilt: RebuiltState | undefined;
35
+ }
36
+
37
+ export interface TracedStep {
38
+ state: Record<string, Value>;
39
+ action: SpecAction | undefined;
40
+ alias?: Record<string, Value>;
41
+ }
42
+
43
+ interface TraceContext {
44
+ config: ModelConfig;
45
+ options: CheckOptions;
46
+ environment: Environment;
47
+ search: Search;
48
+ nextActions: SpecAction[];
49
+ current: SearchPosition;
50
+ states: Value[][];
51
+ fingerprintStates: Value[][];
52
+ parents: number[];
53
+ actions: (string | undefined)[];
54
+ depths: number[];
55
+ tracedSteps: WeakMap<TraceStep, TracedStep>;
56
+ captureOutput: <Result>(rebuild: () => Result) => { result: Result; lines: OutputLine[] };
57
+ getInitialStates: () => Value[][];
58
+ getUncoveredInitialStates: () => Value[][];
59
+ findSuccessorAction: (
60
+ state: Value[],
61
+ isMatch: (successor: Successor) => boolean,
62
+ ) => SpecAction | undefined;
63
+ }
64
+
65
+ const INITIAL_RECOVERY_FAILURE = "Failed to recover the initial state from its fingerprint.";
66
+ export const NEXT_RECOVERY_FAILURE = "Failed to recover the next state from its fingerprint.";
67
+
68
+ export const createTraceBuilder = (context: TraceContext) => {
69
+ const config = context.config;
70
+ const options = context.options;
71
+ const environment = context.environment;
72
+ const runtime = environment.runtime;
73
+ const search = context.search;
74
+ const current = context.current;
75
+ const states = context.states;
76
+ const depths = context.depths;
77
+ const captureOutput = context.captureOutput;
78
+ const is174 = runtime.version === "1.7.4";
79
+ const isReducing = config.view !== undefined || config.symmetry !== undefined;
80
+ const getFingerprintState = search.getFingerprintState;
81
+ const toRecord = search.toRecord;
82
+
83
+ const getAliasState = (
84
+ alias: string,
85
+ state: State,
86
+ successor: State,
87
+ level: number,
88
+ getBehavior: () => Value[][],
89
+ ) => {
90
+ const searchLevel = runtime.getLevel;
91
+ const searchBehavior = runtime.getBehavior;
92
+ runtime.getLevel = () => level;
93
+ runtime.getBehavior = getBehavior;
94
+ try {
95
+ return search.evaluateAlias(alias, state, successor, options.isTool ?? false);
96
+ } finally {
97
+ runtime.getLevel = searchLevel;
98
+ runtime.getBehavior = searchBehavior;
99
+ }
100
+ };
101
+ const rebuildFrom = (state: Value[], level: number) => {
102
+ current.rebuilt = { state, level };
103
+ runtime.reseedRandom();
104
+ };
105
+ // TLC's TLCStateMut#equals compares the variables in turn, and a lazy value fails as it reaches it.
106
+ const isEqualState = (state: Value[], successor: Value[]) =>
107
+ state.every((value, position) => {
108
+ const error = getFingerprintError(value);
109
+ if (error) throw error;
110
+ return isSameValue(value, successor[position]);
111
+ });
112
+ const findStepAction = (
113
+ index: number,
114
+ previous: Value[],
115
+ state: Value[],
116
+ isHeld: boolean,
117
+ isDrawnOn = false,
118
+ ) => {
119
+ const expanding = { ...current };
120
+ Object.assign(current, { index, isExpanding: true, candidate: undefined });
121
+ const key = isHeld ? state : getFingerprintState(state);
122
+ const isMatch = (successor: Successor) =>
123
+ isHeld
124
+ ? isEqualState(key, successor.state)
125
+ : isSameState(getFingerprintState(successor.state), key);
126
+ try {
127
+ current.rebuilt = { state: previous, level: depths[index] };
128
+ const drawn = isDrawnOn ? context.findSuccessorAction(previous, isMatch) : undefined;
129
+ if (drawn) return drawn;
130
+ // Deviation from TLC: when TLCTrace#printTrace and Worker#doPostCondition draw on and miss the step, printTrace leaks a NullPointerException and doPostCondition skips the postcondition.
131
+ rebuildFrom(previous, depths[index]);
132
+ return context.findSuccessorAction(previous, isMatch);
133
+ } finally {
134
+ Object.assign(current, expanding);
135
+ }
136
+ };
137
+ const toTrace = (
138
+ steps: Successor[],
139
+ path: number[],
140
+ traceOptions: TraceOptions = {},
141
+ ): Behavior => {
142
+ const alias = config.alias;
143
+ const known = traceOptions.known ?? 1;
144
+ const loopStart = traceOptions.loopStart;
145
+ const rebuilt = is174 && loopStart !== undefined ? loopStart + 1 : steps.length - known;
146
+ const isRebuiltAgain = known > 0 && !is174 && !traceOptions.isPrintedOnly && steps.length > 1;
147
+ const initialOutput =
148
+ known === 0 || (steps.length > 1 && (rebuilt > 0 || is174))
149
+ ? runtime.runWithNewRandom(() => captureOutput(context.getInitialStates).lines)
150
+ : [];
151
+ const last = steps.length - 1;
152
+ const findPositionAction = (position: number, isDrawnOn = false) =>
153
+ position === 0 || steps[position].action === "Stuttering"
154
+ ? { result: undefined, lines: [] }
155
+ : captureOutput(() =>
156
+ findStepAction(
157
+ path[position - 1],
158
+ steps[position - 1].state,
159
+ steps[position].state,
160
+ known === 2 && position === last,
161
+ isDrawnOn,
162
+ ),
163
+ );
164
+ // TLC's TLCStateRandom reseeds only for another state, so TLC rebuilds the step to a known successor drawing on from where the search stopped, unless it rebuilt a step before it.
165
+ const stepActions = steps.map((_step, position) =>
166
+ findPositionAction(position, known === 2 && position === last && last === 1 && !is174),
167
+ );
168
+ const outputs = stepActions.map((step) => step.lines);
169
+ const traceOutput = isRebuiltAgain
170
+ ? [
171
+ ...runtime.runWithNewRandom(() => [
172
+ captureOutput(context.getInitialStates).lines,
173
+ ...steps
174
+ .slice(1, last)
175
+ .map((_step, position) => findPositionAction(position + 1).lines),
176
+ ]),
177
+ findPositionAction(last, known === 2).lines,
178
+ ].flat()
179
+ : [];
180
+ const prefixOutput = rebuilt > 0 ? [initialOutput, ...outputs.slice(1, rebuilt)].flat() : [];
181
+ return {
182
+ trace: steps.map((step, position) => {
183
+ const action = stepActions[position].result;
184
+ const traceStep: TraceStep = {
185
+ action: step.action,
186
+ label: action && getActionLabel(action, options.version),
187
+ state:
188
+ alias === undefined
189
+ ? toRecord(step.state)
190
+ : getAliasState(
191
+ alias,
192
+ step.state,
193
+ steps[position + 1]?.state ??
194
+ traceOptions.incomplete ??
195
+ steps[loopStart ?? position].state,
196
+ position + 1,
197
+ () => steps.slice(0, position + 1).map((inner) => inner.state),
198
+ ),
199
+ output: position === 0 ? prefixOutput : position < rebuilt ? [] : outputs[position],
200
+ };
201
+ if (alias !== undefined || action) {
202
+ context.tracedSteps.set(traceStep, { state: toRecord(step.state), action });
203
+ }
204
+ return traceStep;
205
+ }),
206
+ traceOutput,
207
+ };
208
+ };
209
+ const findTraceSuccessor = (state: Value[], isMatch: (successor: Successor) => boolean) =>
210
+ captureOutput(() => {
211
+ for (const action of context.nextActions) {
212
+ const successor = getSuccessors(action.expression, state, environment, action.scope).find(
213
+ isMatch,
214
+ );
215
+ if (successor) return { ...successor, action: successor.action ?? action.name };
216
+ }
217
+ return undefined;
218
+ }).result;
219
+ // TLC's Tool#getState fingerprints each state it rebuilds, which sorts its records in place.
220
+ const hasFingerprint = (state: Value[], index: number) => {
221
+ const fingerprintState = getFingerprintState(state);
222
+ const stored = context.fingerprintStates[index];
223
+ return (
224
+ getStateHash(fingerprintState) === getStateHash(stored) &&
225
+ isSameState(fingerprintState, stored)
226
+ );
227
+ };
228
+ const findSuccessorWithFingerprint = (state: Value[], source: number, target: number) => {
229
+ const rebuilt = current.rebuilt;
230
+ rebuildFrom(state, depths[source]);
231
+ const successor = findTraceSuccessor(state, (candidate) =>
232
+ hasFingerprint(candidate.state, target),
233
+ );
234
+ current.rebuilt = rebuilt;
235
+ return successor;
236
+ };
237
+ const getPathStates = (path: number[], nextFailure: string) => {
238
+ const initial = captureOutput(() =>
239
+ isReducing || isImpure(environment)
240
+ ? context.getUncoveredInitialStates().find((state) => hasFingerprint(state, path[0]))
241
+ : states[path[0]],
242
+ ).result;
243
+ if (!initial) throw new TlaEvaluationError(INITIAL_RECOVERY_FAILURE);
244
+ const steps: Successor[] = [{ state: initial, action: undefined }];
245
+ for (let position = 1; position < path.length; position++) {
246
+ const previous = steps[position - 1].state;
247
+ if (path[position - 1] === path[position]) {
248
+ steps.push({ state: previous, action: "Stuttering" });
249
+ continue;
250
+ }
251
+ const successor = findSuccessorWithFingerprint(previous, path[position - 1], path[position]);
252
+ if (!successor) throw new TlaEvaluationError(nextFailure);
253
+ steps.push(successor);
254
+ }
255
+ return steps;
256
+ };
257
+ const getTrace = (index: number, lastSuccessor?: Successor, traceOptions: TraceOptions = {}) => {
258
+ const path: number[] = [];
259
+ for (let position = index; position !== -1; position = context.parents[position]) {
260
+ path.unshift(position);
261
+ }
262
+ const steps =
263
+ isReducing && path.length > 1
264
+ ? getPathStates(path, INITIAL_RECOVERY_FAILURE)
265
+ : path.map((position) => ({
266
+ state: states[position],
267
+ action: context.actions[position],
268
+ }));
269
+ if (!lastSuccessor) return toTrace(steps, path, traceOptions);
270
+ return toTrace([...steps, lastSuccessor], path, { ...traceOptions, known: 2 });
271
+ };
272
+ // TLCTrace#printTrace applies the alias to every state but an initial one it prints without a successor.
273
+ const getStateTrace = (index: number, traceOptions: TraceOptions = {}): Behavior => {
274
+ if (context.parents[index] !== -1) return getTrace(index, undefined, traceOptions);
275
+ const traceOutput =
276
+ is174 || traceOptions.isPrintedOnly ? [] : captureOutput(context.getInitialStates).lines;
277
+ const state = states[index];
278
+ if (traceOptions.incomplete !== undefined) {
279
+ return {
280
+ trace: toTrace([{ state, action: undefined }], [index], traceOptions).trace,
281
+ traceOutput,
282
+ };
283
+ }
284
+ const step = { action: undefined, label: undefined, state: toRecord(state) };
285
+ const alias = config.alias;
286
+ if (alias !== undefined) {
287
+ context.tracedSteps.set(step, {
288
+ state: step.state,
289
+ action: undefined,
290
+ alias: getAliasState(alias, state, state, 1, () => [state]),
291
+ });
292
+ }
293
+ return { trace: [step], traceOutput };
294
+ };
295
+ const getIncompleteStep = (
296
+ incomplete: State,
297
+ level: number,
298
+ step: Omit<TraceStep, "state">,
299
+ action: SpecAction | undefined,
300
+ ): TraceStep => {
301
+ const state = toRecord(incomplete.map((value) => value ?? createModelValue("null")));
302
+ const alias = config.alias;
303
+ const traceStep = {
304
+ ...step,
305
+ state:
306
+ alias === undefined ? state : getAliasState(alias, incomplete, incomplete, level, () => []),
307
+ };
308
+ context.tracedSteps.set(traceStep, { state, action });
309
+ return traceStep;
310
+ };
311
+ const getPathSteps = (path: number[]) => getPathStates(path, NEXT_RECOVERY_FAILURE);
312
+ return {
313
+ toTrace,
314
+ findStepAction,
315
+ findSuccessorWithFingerprint,
316
+ getTrace,
317
+ getStateTrace,
318
+ getIncompleteStep,
319
+ getPathSteps,
320
+ };
321
+ };