tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32

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 (382) hide show
  1. package/README.md +32 -6
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +27 -27
  5. package/dist/deciders.js +34 -34
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +12 -14
  8. package/dist/index.d.ts +12 -14
  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 +516 -25
  15. package/dist/prove.js +518 -27
  16. package/dist/run.cjs +45 -0
  17. package/dist/run.js +45 -0
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +76 -86
  21. package/dist/transfer.js +73 -83
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +1 -1
  25. package/src/ast.ts +2 -2
  26. package/src/bags.ts +22 -23
  27. package/src/builtins.ts +16 -8
  28. package/src/check.ts +131 -1154
  29. package/src/{cli-options.ts → cli/options.ts} +54 -9
  30. package/src/cli/run.ts +63 -0
  31. package/src/cli/shared.ts +106 -0
  32. package/src/cli/tlapm.ts +374 -0
  33. package/src/{run-cli.ts → cli/tlc.ts} +112 -761
  34. package/src/cli/xml-exporter.ts +221 -0
  35. package/src/cli.ts +1 -1
  36. package/src/codegen.ts +17 -15
  37. package/src/config.ts +5 -5
  38. package/src/dependencies.ts +4 -6
  39. package/src/environment.ts +55 -60
  40. package/src/errors.ts +12 -36
  41. package/src/evaluate.ts +81 -101
  42. package/src/exit-codes.ts +1 -1
  43. package/src/fingerprints.ts +3 -3
  44. package/src/index.ts +2 -2
  45. package/src/instances.ts +56 -46
  46. package/src/java-overrides.ts +79 -41
  47. package/src/json.ts +31 -36
  48. package/src/levels.ts +10 -13
  49. package/src/{live-check.ts → liveness-checker.ts} +169 -142
  50. package/src/liveness.ts +38 -34
  51. package/src/obligations/action.ts +58 -105
  52. package/src/obligations/{anon.ts → anonymize.ts} +44 -52
  53. package/src/obligations/equality.ts +260 -0
  54. package/src/obligations/expression.ts +42 -530
  55. package/src/obligations/format.ts +7 -8
  56. package/src/obligations/generate.ts +93 -783
  57. package/src/obligations/index.ts +23 -23
  58. package/src/obligations/levels.ts +38 -44
  59. package/src/obligations/module.ts +106 -729
  60. package/src/obligations/normalize.ts +554 -0
  61. package/src/obligations/operators.ts +176 -0
  62. package/src/obligations/pragma.ts +35 -29
  63. package/src/obligations/printer.ts +98 -209
  64. package/src/obligations/proof.ts +0 -1
  65. package/src/obligations/regroup.ts +100 -0
  66. package/src/obligations/simplify.ts +668 -0
  67. package/src/obligations/source.ts +92 -192
  68. package/src/obligations/{deref.ts → subexpression.ts} +82 -113
  69. package/src/obligations/substitution.ts +261 -0
  70. package/src/obligations/temporal.ts +32 -30
  71. package/src/obligations/tuples.ts +37 -53
  72. package/src/parallel-worker.ts +37 -33
  73. package/src/parallel.ts +30 -24
  74. package/src/parser.ts +67 -74
  75. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  76. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  77. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  78. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  79. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  80. package/src/{prove → prover}/decide-pool.ts +14 -19
  81. package/src/{prove → prover}/deciders.ts +7 -1
  82. package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
  83. package/src/{prove → prover}/isabelle/decide.ts +3 -6
  84. package/src/{prove → prover}/isabelle/encode.ts +106 -138
  85. package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
  86. package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
  87. package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
  88. package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
  89. package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
  90. package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
  91. package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
  92. package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
  93. package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
  94. package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
  95. package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
  96. package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
  97. package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
  98. package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
  99. package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
  100. package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
  101. package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
  102. package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
  103. package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
  104. package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
  105. package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
  106. package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
  107. package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
  108. package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
  109. package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
  110. package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
  111. package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
  112. package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
  113. package/src/{prove → prover}/ocaml.ts +1 -1
  114. package/src/{prove → prover}/prep/action.ts +54 -66
  115. package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
  116. package/src/{prove → prover}/prep/fingerprint.ts +3 -3
  117. package/src/{prove → prover}/prep/level-comparison.ts +15 -38
  118. package/src/{prove → prover}/prep/md5.ts +2 -9
  119. package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
  120. package/src/prover/prep/normalize.ts +309 -0
  121. package/src/{prove → prover}/prove-worker.ts +4 -11
  122. package/src/prover/prove.ts +492 -0
  123. package/src/{prove → prover}/ptl/encode.ts +19 -31
  124. package/src/{prove → prover}/smt/axioms.ts +78 -79
  125. package/src/{prove → prover}/smt/data.ts +16 -45
  126. package/src/{prove → prover}/smt/encode.ts +134 -28
  127. package/src/{prove → prover}/smt/extensionality.ts +14 -12
  128. package/src/{prove → prover}/smt/flatten.ts +3 -18
  129. package/src/{prove → prover}/smt/format.ts +14 -3
  130. package/src/{prove → prover}/smt/instances.ts +4 -5
  131. package/src/{prove → prover}/smt/rewrite.ts +41 -59
  132. package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
  133. package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
  134. package/src/{prove → prover}/smt/solver/enode.ts +1 -1
  135. package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
  136. package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
  137. package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
  138. package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
  139. package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
  140. package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
  141. package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
  142. package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
  143. package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
  144. package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
  145. package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
  146. package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
  147. package/src/{prove → prover}/smt/solver/solver.ts +2 -2
  148. package/src/prover/tlapm/cache.ts +236 -0
  149. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  150. package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
  151. package/src/prover/verdict.ts +13 -0
  152. package/src/{prove → prover}/zenon/decide.ts +5 -11
  153. package/src/{prove → prover}/zenon/encode.ts +40 -106
  154. package/src/{prove → prover}/zenon/eqrel.ts +1 -1
  155. package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
  156. package/src/{prove → prover}/zenon/expr.ts +2 -2
  157. package/src/{prove → prover}/zenon/index-table.ts +1 -1
  158. package/src/{prove → prover}/zenon/isar.ts +1 -1
  159. package/src/{prove → prover}/zenon/llproof.ts +1 -1
  160. package/src/{prove → prover}/zenon/mltoll.ts +1 -1
  161. package/src/{prove → prover}/zenon/node.ts +1 -1
  162. package/src/{prove → prover}/zenon/search.ts +1 -1
  163. package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
  164. package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
  165. package/src/randomization.ts +19 -24
  166. package/src/resolve.ts +15 -22
  167. package/src/runtime.ts +8 -8
  168. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  169. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  170. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  171. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  172. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  173. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  174. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  175. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  176. package/src/{sany-report.ts → sany/report.ts} +16 -17
  177. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  178. package/src/{sany-source.ts → sany/source.ts} +6 -7
  179. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  180. package/src/search.ts +969 -0
  181. package/src/spec-description.ts +26 -20
  182. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  183. package/src/standard-modules.ts +16 -20
  184. package/src/state-graph.ts +9 -8
  185. package/src/substitution-levels.ts +2 -2
  186. package/src/successors.ts +16 -19
  187. package/src/symmetry.ts +1 -1
  188. package/src/tableau.ts +6 -7
  189. package/src/tlc/fingerprint.ts +214 -0
  190. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  191. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  192. package/src/{tlc-random.ts → tlc/random.ts} +3 -213
  193. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  194. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  195. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  196. package/src/transfer.ts +32 -32
  197. package/src/values.ts +72 -67
  198. package/src/worker.ts +1 -4
  199. package/dist/run-cli.cjs +0 -38
  200. package/dist/run-cli.js +0 -38
  201. package/src/canonical.ts +0 -40
  202. package/src/obligations/ctx.ts +0 -64
  203. package/src/prove/prep/defs.ts +0 -27
  204. package/src/prove/prep/elab.ts +0 -156
  205. package/src/prove/prep/enabled.ts +0 -43
  206. package/src/prove/prep/flatten.ts +0 -70
  207. package/src/prove/prep/trivial.ts +0 -22
  208. package/src/prove/prove.ts +0 -417
  209. package/src/prove/smt/axiomatize.ts +0 -69
  210. package/src/prove/smt/simplify.ts +0 -57
  211. package/src/prove/verdict.ts +0 -13
  212. package/src/standard-ranges.ts +0 -116
  213. package/src/value-sources.ts +0 -29
  214. /package/src/{prove → prover}/isabelle/LICENSE +0 -0
  215. /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
  216. /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
  217. /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
  218. /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
  219. /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
  220. /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
  221. /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
  222. /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
  223. /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
  224. /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
  225. /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
  226. /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
  227. /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
  228. /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
  229. /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
  230. /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
  231. /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
  232. /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
  233. /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
  234. /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
  235. /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
  236. /package/src/{prove → prover}/ptl/decide.ts +0 -0
  237. /package/src/{prove → prover}/ptl/sat.ts +0 -0
  238. /package/src/{prove → prover}/ptl/tableau.ts +0 -0
  239. /package/src/{prove → prover}/smt/context.ts +0 -0
  240. /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
  241. /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
  242. /package/src/{prove → prover}/smt/solver/array.ts +0 -0
  243. /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
  244. /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
  245. /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
  246. /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
  247. /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
  248. /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
  249. /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
  250. /package/src/{prove → prover}/smt/solver/context.ts +0 -0
  251. /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
  252. /package/src/{prove → prover}/smt/solver/der.ts +0 -0
  253. /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
  254. /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
  255. /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
  256. /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
  257. /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
  258. /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
  259. /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
  260. /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
  261. /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
  262. /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
  263. /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
  264. /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
  265. /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
  266. /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
  267. /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
  268. /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
  269. /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
  270. /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
  271. /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
  272. /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
  273. /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
  274. /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
  275. /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
  276. /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
  277. /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
  278. /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
  279. /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
  280. /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
  281. /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
  282. /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
  283. /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
  284. /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
  285. /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
  286. /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
  287. /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
  288. /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
  289. /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
  290. /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
  291. /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
  292. /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
  293. /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
  294. /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
  295. /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
  296. /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
  297. /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
  298. /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
  299. /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
  300. /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
  301. /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
  302. /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
  303. /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
  304. /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
  305. /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
  306. /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
  307. /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
  308. /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
  309. /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
  310. /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
  311. /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
  312. /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
  313. /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
  314. /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
  315. /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
  316. /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
  317. /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
  318. /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
  319. /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
  320. /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
  321. /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
  322. /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
  323. /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
  324. /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
  325. /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
  326. /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
  327. /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
  328. /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
  329. /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
  330. /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
  331. /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
  332. /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
  333. /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
  334. /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
  335. /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
  336. /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
  337. /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
  338. /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
  339. /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
  340. /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
  341. /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
  342. /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
  343. /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
  344. /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
  345. /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
  346. /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
  347. /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
  348. /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
  349. /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
  350. /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
  351. /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
  352. /package/src/{prove → prover}/smt/table.ts +0 -0
  353. /package/src/{prove → prover}/tlaps-module.ts +0 -0
  354. /package/src/{prove → prover}/zenon/LICENSE +0 -0
  355. /package/src/{prove → prover}/zenon/check/check.ts +0 -0
  356. /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
  357. /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
  358. /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
  359. /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
  360. /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
  361. /package/src/{prove → prover}/zenon/check/records.ts +0 -0
  362. /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
  363. /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
  364. /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
  365. /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
  366. /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
  367. /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
  368. /package/src/{prove → prover}/zenon/limits.ts +0 -0
  369. /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
  370. /package/src/{prove → prover}/zenon/parse.ts +0 -0
  371. /package/src/{prove → prover}/zenon/phrase.ts +0 -0
  372. /package/src/{prove → prover}/zenon/proof.ts +0 -0
  373. /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
  374. /package/src/{prove → prover}/zenon/rules.ts +0 -0
  375. /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
  376. /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
  377. /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
  378. /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
  379. /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
  380. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  381. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
  382. /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/parser.ts CHANGED
@@ -24,7 +24,7 @@ import type {
24
24
  } from "./ast";
25
25
  import { createSanyError, formatRange, TlaSyntaxError } from "./errors";
26
26
  import { getNumeralValue, readAtAsIdentifier, tokenize, type Token } from "./lexer";
27
- import { getSanyParseError } from "./sany-parse-error";
27
+ import { getSanyParseError } from "./sany/parse-error";
28
28
 
29
29
  interface Precedence {
30
30
  low: number;
@@ -197,39 +197,6 @@ const OPERATOR_ARGUMENTS = new Set([
197
197
  ...POSTFIX_OPERATORS,
198
198
  ]);
199
199
 
200
- // A SANY InfixExpr or PostfixExpr.
201
- const isOperatorExpression = (expression: Expression) =>
202
- expression.kind === "Prime" ||
203
- expression.kind === "Product" ||
204
- ((expression.kind === "And" || expression.kind === "Or") && !expression.isBulleted) ||
205
- (expression.kind === "Apply" &&
206
- (expression.args.length === 2
207
- ? INFIX_OPERATORS.has(expression.operator)
208
- : POSTFIX_OPERATORS.has(expression.operator)));
209
-
210
- const isOperatorName = (text: string) =>
211
- INFIX_OPERATORS.has(text) || POSTFIX_OPERATORS.has(text) || text === "-.";
212
-
213
- const getOperatorApplication = (
214
- operator: string,
215
- argument: Expression,
216
- location: SourceLocation,
217
- ): Expression => {
218
- switch (operator) {
219
- case "ENABLED":
220
- return { kind: "Enabled", expression: argument, location };
221
- case "UNCHANGED":
222
- return { kind: "Unchanged", expression: argument, location };
223
- case "[]":
224
- return { kind: "Always", expression: argument, location };
225
- case "<>":
226
- return { kind: "Eventually", expression: argument, location };
227
- case "'":
228
- return { kind: "Prime", expression: argument, location };
229
- default:
230
- return { kind: "Apply", operator, args: [argument], location };
231
- }
232
- };
233
200
  const SELECTOR_SYMBOLS = new Set(["<<", ">>", ":", "@", "("]);
234
201
 
235
202
  const UNIT_KEYWORDS = new Set([
@@ -330,6 +297,40 @@ const BUILTIN_CONSTANTS = new Set(["TRUE", "FALSE", "BOOLEAN", "STRING"]);
330
297
 
331
298
  const NO_OFFSIDE = -1;
332
299
 
300
+ // A SANY InfixExpr or PostfixExpr.
301
+ const isOperatorExpression = (expression: Expression) =>
302
+ expression.kind === "Prime" ||
303
+ expression.kind === "Product" ||
304
+ ((expression.kind === "And" || expression.kind === "Or") && !expression.isBulleted) ||
305
+ (expression.kind === "Apply" &&
306
+ (expression.args.length === 2
307
+ ? INFIX_OPERATORS.has(expression.operator)
308
+ : POSTFIX_OPERATORS.has(expression.operator)));
309
+
310
+ const isOperatorName = (text: string) =>
311
+ INFIX_OPERATORS.has(text) || POSTFIX_OPERATORS.has(text) || text === "-.";
312
+
313
+ const getOperatorApplication = (
314
+ operator: string,
315
+ argument: Expression,
316
+ location: SourceLocation,
317
+ ): Expression => {
318
+ switch (operator) {
319
+ case "ENABLED":
320
+ return { kind: "Enabled", expression: argument, location };
321
+ case "UNCHANGED":
322
+ return { kind: "Unchanged", expression: argument, location };
323
+ case "[]":
324
+ return { kind: "Always", expression: argument, location };
325
+ case "<>":
326
+ return { kind: "Eventually", expression: argument, location };
327
+ case "'":
328
+ return { kind: "Prime", expression: argument, location };
329
+ default:
330
+ return { kind: "Apply", operator, args: [argument], location };
331
+ }
332
+ };
333
+
333
334
  // MonolithSpecExtractor.module: a module that no file defines can follow the root module in the
334
335
  // root module's file, from its ---- MODULE line to the next ==== line.
335
336
  export const extractModule = (source: string, name: string) => {
@@ -403,7 +404,7 @@ const parse = (source: string, mode: ParseMode): Module => {
403
404
  return token.column <= offsideColumn ? { ...token, kind: "End" as const, text: "" } : token;
404
405
  };
405
406
 
406
- const describe = (token: Token) =>
407
+ const describeToken = (token: Token) =>
407
408
  token.kind === "End" ? "end of input" : JSON.stringify(token.text);
408
409
 
409
410
  const unitStart = { index: 0 };
@@ -503,14 +504,14 @@ const parse = (source: string, mode: ParseMode): Module => {
503
504
 
504
505
  const expect = (text: string) => {
505
506
  if (!isAt(text))
506
- throw createUnexpected(`Expected ${JSON.stringify(text)} but found ${describe(peek())}`);
507
+ throw createUnexpected(`Expected ${JSON.stringify(text)} but found ${describeToken(peek())}`);
507
508
  return advance();
508
509
  };
509
510
 
510
511
  const expectIdentifier = () => {
511
512
  const token = peek();
512
513
  if (token.kind !== "Identifier") {
513
- throw createUnexpected(`Expected an identifier but found ${describe(token)}`);
514
+ throw createUnexpected(`Expected an identifier but found ${describeToken(token)}`);
514
515
  }
515
516
  if (isTlapmKeyword(token)) throw createUnexpected(`Unexpected keyword ${token.text}`);
516
517
  cursor.index++;
@@ -626,7 +627,7 @@ const parse = (source: string, mode: ParseMode): Module => {
626
627
  );
627
628
  }
628
629
  if (isAt("<<") || isAt("(")) return parsePrimary();
629
- throw createUnexpected(`Expected a subscript but found ${describe(token)}`);
630
+ throw createUnexpected(`Expected a subscript but found ${describeToken(token)}`);
630
631
  };
631
632
 
632
633
  const isDefinitionAhead = (operator: Token) => {
@@ -808,7 +809,7 @@ const parse = (source: string, mode: ParseMode): Module => {
808
809
  while (isAt(".") || isAt("[")) {
809
810
  if (accept(".")) {
810
811
  if (!isFieldName(peek()))
811
- throw createUnexpected(`Expected a field name but found ${describe(peek())}`);
812
+ throw createUnexpected(`Expected a field name but found ${describeToken(peek())}`);
812
813
  path.push({ kind: "Field", name: advance().text });
813
814
  continue;
814
815
  }
@@ -1037,26 +1038,16 @@ const parse = (source: string, mode: ParseMode): Module => {
1037
1038
  ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1038
1039
  : qualifiedArgs.length === 0
1039
1040
  ? { kind: "Identifier", name: operator, selectorRanges, location }
1040
- : argumentCounts.slice(0, -1).some((count) => count > 0)
1041
- ? {
1042
- kind: "Apply",
1043
- operator,
1044
- args: qualifiedArgs,
1045
- argumentCounts,
1046
- argumentsRange,
1047
- selectorRanges,
1048
- argumentRanges,
1049
- location,
1050
- }
1051
- : {
1052
- kind: "Apply",
1053
- operator,
1054
- args: qualifiedArgs,
1055
- argumentsRange,
1056
- selectorRanges,
1057
- argumentRanges,
1058
- location,
1059
- };
1041
+ : {
1042
+ kind: "Apply",
1043
+ operator,
1044
+ args: qualifiedArgs,
1045
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1046
+ argumentsRange,
1047
+ selectorRanges,
1048
+ argumentRanges,
1049
+ location,
1050
+ };
1060
1051
  }
1061
1052
  // SANY reads an infix or postfix operator as a primary expression, with or without arguments.
1062
1053
  if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
@@ -1143,7 +1134,7 @@ const parse = (source: string, mode: ParseMode): Module => {
1143
1134
  };
1144
1135
  }
1145
1136
  }
1146
- throw createUnexpected(`Unexpected ${describe(token)}`, token);
1137
+ throw createUnexpected(`Unexpected ${describeToken(token)}`, token);
1147
1138
  };
1148
1139
 
1149
1140
  // SANY rejects the operator after a prefix operator's operand unless it binds looser than the
@@ -1636,7 +1627,7 @@ const parse = (source: string, mode: ParseMode): Module => {
1636
1627
  const part = peek();
1637
1628
  const isName = part.kind === "Identifier" && !isTlapmKeyword(part);
1638
1629
  if (!isName && part.kind !== "Operator") {
1639
- throw createUnexpected(`Expected a definition name but found ${describe(part)}`, part);
1630
+ throw createUnexpected(`Expected a definition name but found ${describeToken(part)}`, part);
1640
1631
  }
1641
1632
  cursor.index++;
1642
1633
  return part.text;
@@ -1700,7 +1691,7 @@ const parse = (source: string, mode: ParseMode): Module => {
1700
1691
  const isNew = accept("NEW");
1701
1692
  const level = peek().kind === "Keyword" ? NEW_SYMBOL_LEVELS.get(peek().text) : undefined;
1702
1693
  if (!isNew && level === undefined) {
1703
- throw createUnexpected(`Expected a declaration but found ${describe(peek())}`);
1694
+ throw createUnexpected(`Expected a declaration but found ${describeToken(peek())}`);
1704
1695
  }
1705
1696
  if (level !== undefined) advance();
1706
1697
  if (level === "Variable") {
@@ -1823,7 +1814,7 @@ const parse = (source: string, mode: ParseMode): Module => {
1823
1814
  const parseStepStart = (isQed: boolean) => {
1824
1815
  const step = peek();
1825
1816
  if (step.kind !== "Step") {
1826
- throw createUnexpected(`Expected a step number but found ${describe(step)}`, step);
1817
+ throw createUnexpected(`Expected a step number but found ${describeToken(step)}`, step);
1827
1818
  }
1828
1819
  if (!isCorrectLevel(step)) {
1829
1820
  throw createError(`${isQed ? "QED step" : "step"}'s number has bad level`, step);
@@ -1935,20 +1926,22 @@ const parse = (source: string, mode: ParseMode): Module => {
1935
1926
 
1936
1927
  const parseAssumption = (): Assumption => {
1937
1928
  const start = cursor.index;
1938
- return withRange(parseAssumptionUnit(), start);
1939
- };
1940
-
1941
- const parseAssumptionUnit = (): Assumption => {
1942
1929
  const keyword = advance();
1943
- const location = getLocation(keyword);
1944
- const isAxiom = keyword.text === "AXIOM";
1945
- if (peek().kind === "Identifier" && isAt("==", 1)) {
1946
- const name = expectIdentifier();
1930
+ const isNamed = peek().kind === "Identifier" && isAt("==", 1);
1931
+ const name = isNamed ? expectIdentifier() : undefined;
1932
+ if (name !== undefined) {
1947
1933
  factNames.add(name);
1948
1934
  advance();
1949
- return { name, expression: parseExpression(), isAxiom, location };
1950
1935
  }
1951
- return { name: undefined, expression: parseExpression(), isAxiom, location };
1936
+ return withRange(
1937
+ {
1938
+ name,
1939
+ expression: parseExpression(),
1940
+ isAxiom: keyword.text === "AXIOM",
1941
+ location: getLocation(keyword),
1942
+ },
1943
+ start,
1944
+ );
1952
1945
  };
1953
1946
 
1954
1947
  const parseModuleBody = (): Module => {
@@ -2051,7 +2044,7 @@ const parse = (source: string, mode: ParseMode): Module => {
2051
2044
  case "HIDE": {
2052
2045
  // SANY's module body takes a USE only when ONLY doesn't follow it.
2053
2046
  if (isAt("USE") && isAt("ONLY", 1)) {
2054
- throw createUnexpected(`Expected a module unit but found ${describe(token)}`);
2047
+ throw createUnexpected(`Expected a module unit but found ${describeToken(token)}`);
2055
2048
  }
2056
2049
  const use = parseUseOrHide();
2057
2050
  module.uses.push(use);
@@ -1,5 +1,5 @@
1
- import { PcalBugError, PcalError, PcalRuntimeError } from "./errors";
2
- import type { TlcVersion } from "./tlc-version";
1
+ import { PcalBugError, PcalError, PcalRuntimeError } from "../errors";
2
+ import type { TlcVersion } from "../tlc/version";
3
3
 
4
4
  // TLAToken's types.
5
5
  export const PCAL_TOKEN = { builtin: 1, number: 2, string: 3, ident: 4, added: 5 } as const;
@@ -28,18 +28,11 @@ interface PcalCoord {
28
28
  // resets, so options one module sets carry over to the modules SANY validates after it.
29
29
  export interface PcalParams {
30
30
  labelFlag: boolean;
31
- reportLabelsFlag: boolean;
32
31
  labelRoot: string;
33
32
  fairnessOption: string;
34
- fairAlgorithm: boolean;
35
33
  checkTermination: boolean;
36
- noOld: boolean;
37
- nocfg: boolean;
38
- noDoneDisjunct: boolean;
39
34
  specOption: boolean;
40
35
  myspecOption: boolean;
41
- specFile: string;
42
- optionsInFile: boolean;
43
36
  inputVersionNumber: number;
44
37
  }
45
38
 
@@ -48,18 +41,11 @@ export const PCAL_VERSION_WEIGHT = 1903;
48
41
 
49
42
  export const createPcalParams = (): PcalParams => ({
50
43
  labelFlag: false,
51
- reportLabelsFlag: false,
52
44
  labelRoot: "Lbl_",
53
45
  fairnessOption: "",
54
- fairAlgorithm: false,
55
46
  checkTermination: false,
56
- noOld: false,
57
- nocfg: false,
58
- noDoneDisjunct: false,
59
47
  specOption: false,
60
48
  myspecOption: false,
61
- specFile: "",
62
- optionsInFile: false,
63
49
  inputVersionNumber: PCAL_VERSION_WEIGHT,
64
50
  });
65
51
 
@@ -315,7 +301,6 @@ export type PcalNode =
315
301
  | PcalClause
316
302
  | PcalMacro;
317
303
 
318
- // The fields every AST object starts with.
319
304
  export const createPcalBase = (): PcalBase => ({
320
305
  col: 0,
321
306
  line: 0,
@@ -1,4 +1,4 @@
1
- import { PcalError, PcalRuntimeError, PcalBugError } from "./errors";
1
+ import { PcalError, PcalRuntimeError, PcalBugError } from "../errors";
2
2
  import {
3
3
  clonePcalExpr,
4
4
  createNormalizedPcalExpr,
@@ -34,7 +34,7 @@ import {
34
34
  type PcalWith,
35
35
  createPcalExpr,
36
36
  createPcalToken,
37
- } from "./pcal-ast";
37
+ } from "./ast";
38
38
  import {
39
39
  createPcalTokenizerState,
40
40
  getPcalAlgorithmToken,
@@ -42,7 +42,7 @@ import {
42
42
  tokenizePcalExpr,
43
43
  type PcalCharReader,
44
44
  type PcalTokenizerState,
45
- } from "./pcal-tokenize";
45
+ } from "./tokenize";
46
46
 
47
47
  // The translator's state that its Java code keeps in static fields, which SANY never resets
48
48
  // between the modules it validates: the options, the tokenizer's state, ParseAlgorithm's
@@ -84,7 +84,6 @@ interface PcalParserState {
84
84
  hasDefaultInitialization: boolean;
85
85
  currentProcedure: string | undefined;
86
86
  procedures: PcalProcedure[];
87
- pSyntax: boolean;
88
87
  cSyntax: boolean;
89
88
  plusLabels: string[];
90
89
  minusLabels: string[];
@@ -92,13 +91,11 @@ interface PcalParserState {
92
91
  gotoUsed: boolean;
93
92
  gotoDoneUsed: boolean;
94
93
  omitPC: boolean;
95
- omitStutteringWhenDone: boolean;
96
94
  }
97
95
 
98
96
  interface PcalParseResult {
99
97
  ast: PcalAlgorithm;
100
98
  omitPC: boolean;
101
- omitStutteringWhenDone: boolean;
102
99
  hasDefaultInitialization: boolean;
103
100
  }
104
101
 
@@ -142,7 +139,6 @@ export const parsePcalAlgorithm = (
142
139
  hasDefaultInitialization: false,
143
140
  currentProcedure: undefined,
144
141
  procedures: [],
145
- pSyntax: false,
146
142
  cSyntax: false,
147
143
  plusLabels: [],
148
144
  minusLabels: [],
@@ -150,7 +146,6 @@ export const parsePcalAlgorithm = (
150
146
  gotoUsed: false,
151
147
  gotoDoneUsed: false,
152
148
  omitPC: params.inputVersionNumber >= 1500,
153
- omitStutteringWhenDone: params.inputVersionNumber >= 1500,
154
149
  };
155
150
 
156
151
  // ParseAlgorithm.ParsingError.
@@ -255,7 +250,7 @@ export const parsePcalAlgorithm = (
255
250
 
256
251
  const gobbleCommaOrSemicolon = () => gobbleThis(peekAtAlgToken(1) === "," ? "," : ";");
257
252
 
258
- const gobbleBeginOrLeftBrace = () => gobbleThis(state.pSyntax ? "begin" : "{");
253
+ const gobbleBeginOrLeftBrace = () => gobbleThis(state.cSyntax ? "{" : "begin");
259
254
 
260
255
  const gobbleEndOrRightBrace = (name: string) => {
261
256
  if (state.cSyntax) {
@@ -362,7 +357,7 @@ export const parsePcalAlgorithm = (
362
357
  const getStmtSeq = (): PcalStmt[] => {
363
358
  const result: PcalStmt[] = [];
364
359
  const isEnd = (token: string) =>
365
- (state.pSyntax && ["end", "else", "elsif", "or"].includes(token)) ||
360
+ (!state.cSyntax && ["end", "else", "elsif", "or"].includes(token)) ||
366
361
  (state.cSyntax && token === "}");
367
362
  while (!isEnd(peekAtAlgToken(1))) result.push(...getCStmt());
368
363
  if (state.cSyntax && result.length === 0) throwParsingError("Empty statement list");
@@ -467,9 +462,9 @@ export const parsePcalAlgorithm = (
467
462
  const test = getExpr();
468
463
  if (state.cSyntax) gobbleThis(")");
469
464
  if (test.tokens.length === 0) throwParsingError("Empty while test at ");
470
- if (state.pSyntax) gobbleThis("do");
471
- const unlabDo = state.pSyntax ? getStmtSeq() : getCStmt();
472
- if (state.pSyntax) {
465
+ if (!state.cSyntax) gobbleThis("do");
466
+ const unlabDo = state.cSyntax ? getCStmt() : getStmtSeq();
467
+ if (!state.cSyntax) {
473
468
  gobbleThis("end");
474
469
  gobbleThis("while");
475
470
  gobbleThis(";");
@@ -495,18 +490,18 @@ export const parsePcalAlgorithm = (
495
490
  result.test = getExpr();
496
491
  if (state.cSyntax) gobbleThis(")");
497
492
  if (result.test.tokens.length === 0) throwParsingError("Empty if test at ");
498
- if (state.pSyntax) gobbleThis("then");
499
- result.unlabThen = state.pSyntax ? getStmtSeq() : getCStmt();
493
+ if (!state.cSyntax) gobbleThis("then");
494
+ result.unlabThen = state.cSyntax ? getCStmt() : getStmtSeq();
500
495
  const next = peekAtAlgToken(1);
501
496
  if (next === "else") {
502
497
  mustGobbleThis("else");
503
- result.unlabElse = state.pSyntax ? getStmtSeq() : getCStmt();
498
+ result.unlabElse = state.cSyntax ? getCStmt() : getStmtSeq();
504
499
  }
505
- if (state.pSyntax && next === "elsif") result.unlabElse = [getIf(depth + 1)];
506
- if (state.pSyntax && !["else", "elsif", "end"].includes(next)) {
500
+ if (!state.cSyntax && next === "elsif") result.unlabElse = [getIf(depth + 1)];
501
+ if (!state.cSyntax && !["else", "elsif", "end"].includes(next)) {
507
502
  throwParsingError('Expecting "else", "elsif", or "end"');
508
503
  }
509
- if (state.pSyntax && depth === 0) {
504
+ if (!state.cSyntax && depth === 0) {
510
505
  gobbleThis("end");
511
506
  gobbleThis("if");
512
507
  gobbleThis(";");
@@ -532,7 +527,7 @@ export const parsePcalAlgorithm = (
532
527
  const clause: PcalClause = {
533
528
  ...createPcalBase(),
534
529
  kind: "Clause",
535
- unlabOr: state.pSyntax ? getStmtSeq() : getCStmt(),
530
+ unlabOr: state.cSyntax ? getCStmt() : getStmtSeq(),
536
531
  labOr: [],
537
532
  };
538
533
  if (clause.unlabOr.length === 0) {
@@ -542,7 +537,7 @@ export const parsePcalAlgorithm = (
542
537
  if (peekAtAlgToken(1) !== "or") break;
543
538
  mustGobbleThis("or");
544
539
  }
545
- if (state.pSyntax) {
540
+ if (!state.cSyntax) {
546
541
  mustGobbleThis("end");
547
542
  gobbleThis("either");
548
543
  gobbleThis(";");
@@ -569,9 +564,9 @@ export const parsePcalAlgorithm = (
569
564
  };
570
565
  result.isEq = gobbleEqualOrIf();
571
566
  result.exp = getExpr();
572
- if (state.pSyntax || peekAtAlgToken(1) !== ")") gobbleCommaOrSemicolon();
567
+ if (!state.cSyntax || peekAtAlgToken(1) !== ")") gobbleCommaOrSemicolon();
573
568
  if (result.exp.tokens.length === 0) throwParsingError("Empty with expression at ");
574
- const isBlockBody = state.pSyntax && peekAtAlgToken(1) === "do";
569
+ const isBlockBody = !state.cSyntax && peekAtAlgToken(1) === "do";
575
570
  const isBraceBody = state.cSyntax && peekAtAlgToken(1) === ")";
576
571
  if (isBlockBody) gobbleThis("do");
577
572
  if (isBraceBody) mustGobbleThis(")");
@@ -1337,17 +1332,16 @@ export const parsePcalAlgorithm = (
1337
1332
  // lets the translation omit pc.
1338
1333
  const checkBody = (body: PcalStmt[]) => {
1339
1334
  if (body.length === 0) return;
1340
- const clear = () => {
1335
+ const keepPC = () => {
1341
1336
  state.omitPC = false;
1342
- state.omitStutteringWhenDone = false;
1343
1337
  };
1344
1338
  const labeled = body[0];
1345
- if (body.length > 1 || labeled.kind !== "LabeledStmt") return clear();
1339
+ if (body.length > 1 || labeled.kind !== "LabeledStmt") return keepPC();
1346
1340
  if (labeled.stmts.length === 0) return;
1347
1341
  const whileStmt = labeled.stmts[0];
1348
- if (labeled.stmts.length > 1 || whileStmt.kind !== "While") return clear();
1342
+ if (labeled.stmts.length > 1 || whileStmt.kind !== "While") return keepPC();
1349
1343
  if (!isOneTokenPcalExpr(whileStmt.test) || whileStmt.test.tokens[0][0].string !== "TRUE") {
1350
- return clear();
1344
+ return keepPC();
1351
1345
  }
1352
1346
  if (whileStmt.labDo.length > 0) state.omitPC = false;
1353
1347
  const hasLabeled = whileStmt.unlabDo.some((stmt) =>
@@ -1365,22 +1359,6 @@ export const parsePcalAlgorithm = (
1365
1359
  throw new PcalError([header, ...state.addedLabelsLocs].join("\n "));
1366
1360
  };
1367
1361
 
1368
- // ParseAlgorithm.ReportLabels.
1369
- const reportLabels = () => {
1370
- if (!params.reportLabelsFlag) {
1371
- session.log("Labels added.");
1372
- return;
1373
- }
1374
- session.log(
1375
- state.addedLabels.length > 1
1376
- ? "The following labels were added:"
1377
- : "The following label was added:",
1378
- );
1379
- state.addedLabels.forEach((label, index) =>
1380
- session.log(` ${label} at ${state.addedLabelsLocs[index]}`),
1381
- );
1382
- };
1383
-
1384
1362
  const fixProcedures = (macros: PcalMacro[]) =>
1385
1363
  state.procedures.forEach((procedure) => {
1386
1364
  state.currentProcedure = procedure.name;
@@ -1391,11 +1369,9 @@ export const parsePcalAlgorithm = (
1391
1369
  const parse = (): PcalAlgorithm => {
1392
1370
  if (isFairAlgorithm) {
1393
1371
  if (getAlgToken() !== "algorithm") throwParsingError("`--fair' not followed by `algorithm'");
1394
- params.fairAlgorithm = true;
1395
1372
  }
1396
1373
  const name = getAlgToken();
1397
1374
  state.cSyntax = peekAtAlgToken(1) === "{";
1398
- state.pSyntax = !state.cSyntax;
1399
1375
  if (state.cSyntax) mustGobbleThis("{");
1400
1376
  const decls =
1401
1377
  peekAtAlgToken(1) === "variable" || peekAtAlgToken(1) === "variables" ? getVarDecls() : [];
@@ -1435,24 +1411,17 @@ export const parsePcalAlgorithm = (
1435
1411
  }
1436
1412
  gobbleEndOrRightBrace("algorithm");
1437
1413
  checkForDuplicateMacros(macros);
1438
- const omitsStutteringWhenDone = procs.map((proc) => {
1414
+ procs.forEach((proc) => {
1439
1415
  expandMacrosInStmtSeq(proc.body, macros);
1440
1416
  proc.body = makeLabeledStmtSeq(proc.body);
1441
- state.omitStutteringWhenDone = true;
1442
1417
  checkBody(proc.body);
1443
- return state.omitStutteringWhenDone;
1444
1418
  });
1445
- state.omitStutteringWhenDone = omitsStutteringWhenDone.includes(true);
1446
1419
  fixProcedures(macros);
1447
1420
  if (state.addedLabels.length > 0) {
1448
1421
  if (!params.labelFlag) throwAddedLabels();
1449
- reportLabels();
1450
- }
1451
- if (state.gotoDoneUsed) {
1452
- state.omitPC = false;
1453
- state.omitStutteringWhenDone = false;
1422
+ session.log("Labels added.");
1454
1423
  }
1455
- if (state.gotoUsed) state.omitPC = false;
1424
+ if (state.gotoDoneUsed || state.gotoUsed) state.omitPC = false;
1456
1425
  return {
1457
1426
  ...createPcalBase(),
1458
1427
  kind: "Multiprocess",
@@ -1486,14 +1455,10 @@ export const parsePcalAlgorithm = (
1486
1455
  const labeledBody = makeLabeledStmtSeq(body);
1487
1456
  if (state.addedLabels.length > 0) {
1488
1457
  if (state.hasLabel && !params.labelFlag) throwAddedLabels();
1489
- reportLabels();
1490
- }
1491
- if (state.gotoUsed) state.omitPC = false;
1492
- if (!state.gotoDoneUsed) checkBody(labeledBody);
1493
- if (state.gotoDoneUsed) {
1494
- state.omitPC = false;
1495
- state.omitStutteringWhenDone = false;
1458
+ session.log("Labels added.");
1496
1459
  }
1460
+ if (state.gotoUsed || state.gotoDoneUsed) state.omitPC = false;
1461
+ checkBody(labeledBody);
1497
1462
  return {
1498
1463
  ...createPcalBase(),
1499
1464
  kind: "Uniprocess",
@@ -1513,7 +1478,6 @@ export const parsePcalAlgorithm = (
1513
1478
  return {
1514
1479
  ast,
1515
1480
  omitPC: state.omitPC,
1516
- omitStutteringWhenDone: state.omitStutteringWhenDone,
1517
1481
  hasDefaultInitialization: state.hasDefaultInitialization,
1518
1482
  };
1519
1483
  } catch (error) {
@@ -1,56 +1,31 @@
1
- import { PcalError, PcalBugError } from "./errors";
2
- import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./pcal-ast";
1
+ import { PcalError, PcalBugError } from "../errors";
2
+ import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./ast";
3
3
 
4
- // PcalCharReader: reads the algorithm's characters from the lines between a start and an end
5
- // position, returning "\n" at the end of each line and "\t" at the end of the input. Columns count
6
- // code points, and getColumnNumber counts tabs as reaching the next multiple of 8.
4
+ // PcalCharReader: reads the algorithm's characters from a start position to the end of the lines,
5
+ // returning "\n" at the end of each line and "\t" at the end of the input. Columns count code
6
+ // points. The lines come without tabs, as trans.removeTabs replaced them.
7
7
  export interface PcalCharReader {
8
8
  lines: string[];
9
9
  currentLine: string[] | undefined;
10
10
  line: number;
11
11
  column: number;
12
12
  vcolumn: number;
13
- lastLine: number;
14
- lastColumn: number;
15
- isTabToSpaces: boolean;
16
13
  }
17
14
 
18
15
  export const createPcalCharReader = (
19
16
  lines: string[],
20
17
  firstLine: number,
21
18
  firstColumn: number,
22
- lastLine: number,
23
- lastColumn: number,
24
19
  ): PcalCharReader => ({
25
20
  lines,
26
21
  currentLine: firstLine < lines.length ? Array.from(lines[firstLine]) : undefined,
27
22
  line: firstLine,
28
23
  column: firstColumn,
29
- vcolumn:
30
- firstLine < lines.length
31
- ? Array.from(lines[firstLine].slice(0, firstColumn)).reduce(
32
- (vcolumn, char) => (char === "\t" ? (Math.floor(vcolumn / 8) + 1) * 8 : vcolumn + 1),
33
- 0,
34
- )
35
- : 0,
36
- lastLine,
37
- lastColumn,
38
- isTabToSpaces: false,
24
+ vcolumn: firstLine < lines.length ? Array.from(lines[firstLine].slice(0, firstColumn)).length : 0,
39
25
  });
40
26
 
41
27
  const getNextPcalChar = (reader: PcalCharReader) => {
42
28
  if (reader.currentLine === undefined) return "\t";
43
- if (reader.isTabToSpaces) {
44
- reader.vcolumn += 1;
45
- if (reader.vcolumn % 8 === 0) reader.isTabToSpaces = false;
46
- return " ";
47
- }
48
- if (
49
- reader.line > reader.lastLine ||
50
- (reader.line === reader.lastLine && reader.column >= reader.lastColumn)
51
- ) {
52
- return "\t";
53
- }
54
29
  if (reader.currentLine.length === reader.column) {
55
30
  reader.line += 1;
56
31
  reader.column = 0;
@@ -62,9 +37,7 @@ const getNextPcalChar = (reader: PcalCharReader) => {
62
37
  const char = reader.currentLine[reader.column];
63
38
  reader.column += 1;
64
39
  reader.vcolumn += 1;
65
- if (char !== "\t") return char;
66
- if (reader.vcolumn % 8 !== 0) reader.isTabToSpaces = true;
67
- return " ";
40
+ return char;
68
41
  };
69
42
 
70
43
  const backspacePcalReader = (reader: PcalCharReader) => {
@@ -77,11 +50,9 @@ const backspacePcalReader = (reader: PcalCharReader) => {
77
50
  throw new PcalBugError("PcalCharReader.backspace trying to move past beginning of reader");
78
51
  }
79
52
  reader.line -= 1;
80
- const currentLine = Array.from(reader.lines[reader.line]);
81
- reader.currentLine = currentLine;
82
- reader.column = 0;
83
- reader.vcolumn = 0;
84
- while (reader.column < currentLine.length - 1) getNextPcalChar(reader);
53
+ reader.currentLine = Array.from(reader.lines[reader.line]);
54
+ reader.column = Math.max(reader.currentLine.length - 1, 0);
55
+ reader.vcolumn = reader.column;
85
56
  };
86
57
 
87
58
  // PcalCharReader.peek: the rest of the line from the next character that is not white space, with