tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/pcal/translate.ts
CHANGED
|
@@ -31,7 +31,6 @@ import {
|
|
|
31
31
|
type PcalWhile,
|
|
32
32
|
} from "./ast";
|
|
33
33
|
|
|
34
|
-
// PcalSymTab's symbol types, which index PCAL_SYMBOL_TYPE_NAMES.
|
|
35
34
|
const PCAL_SYMBOL = {
|
|
36
35
|
global: 0,
|
|
37
36
|
label: 1,
|
|
@@ -69,7 +68,6 @@ interface PcalSymbol {
|
|
|
69
68
|
useThis: string;
|
|
70
69
|
}
|
|
71
70
|
|
|
72
|
-
// PcalSymTab.ProcedureEntry. initialPC is the first label, which a body with no statements lacks.
|
|
73
71
|
interface PcalProcedureEntry {
|
|
74
72
|
name: string;
|
|
75
73
|
params: PcalPVarDecl[];
|
|
@@ -84,8 +82,6 @@ interface PcalSymbolTable {
|
|
|
84
82
|
errorReport: string;
|
|
85
83
|
}
|
|
86
84
|
|
|
87
|
-
// A Return or CallReturn outside a procedure has no from, and PcalSymTab.FindSym never matches a
|
|
88
|
-
// null id.
|
|
89
85
|
const findSymbol = (
|
|
90
86
|
table: PcalSymbolTable,
|
|
91
87
|
type: number,
|
|
@@ -99,7 +95,6 @@ const findSymbol = (
|
|
|
99
95
|
const findSymbolInContext = (table: PcalSymbolTable, id: string, context: string) =>
|
|
100
96
|
table.symbols.find((symbol) => symbol.id === id && symbol.context === context);
|
|
101
97
|
|
|
102
|
-
// PcalSymTab.FindProc returns the number of procedures when it finds none.
|
|
103
98
|
const findProcedureIndex = (table: PcalSymbolTable, name: string) => {
|
|
104
99
|
const index = table.procedures.findIndex((procedure) => procedure.name === name);
|
|
105
100
|
return index === -1 ? table.procedures.length : index;
|
|
@@ -128,8 +123,6 @@ const useThisVar = (table: PcalSymbolTable, id: string, context: string) => {
|
|
|
128
123
|
return PCAL_VARIABLE_SYMBOLS.has(symbol.type) ? symbol.useThis : id;
|
|
129
124
|
};
|
|
130
125
|
|
|
131
|
-
// The PcalSymTab constructor: collects the algorithm's variables, labels, procedures and processes,
|
|
132
|
-
// reporting every redefinition at once.
|
|
133
126
|
const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
134
127
|
const table: PcalSymbolTable = {
|
|
135
128
|
symbols: [],
|
|
@@ -249,12 +242,10 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
249
242
|
return table;
|
|
250
243
|
};
|
|
251
244
|
|
|
252
|
-
// PcalSymTab.Disambiguate: renames each symbol whose name another symbol already uses, by
|
|
253
|
-
// appending "_", then the letters of its context, then its type. Returns whether it renamed any.
|
|
254
245
|
const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
255
246
|
const isAmbiguous = (id: string) =>
|
|
256
247
|
table.symbols.filter((symbol) => symbol.useThis === id).length > 1;
|
|
257
|
-
|
|
248
|
+
let isRenamed = false;
|
|
258
249
|
for (let type = 0; type <= PCAL_SYMBOL_TYPE_COUNT; type += 1) {
|
|
259
250
|
table.symbols.forEach((symbol) => {
|
|
260
251
|
if (symbol.type !== type) return;
|
|
@@ -263,13 +254,12 @@ const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
|
263
254
|
symbol.useThis +=
|
|
264
255
|
suffixLength === 1 ? "_" : (symbol.context[suffixLength - 2] ?? String(type));
|
|
265
256
|
}
|
|
266
|
-
if (symbol.id !== symbol.useThis)
|
|
257
|
+
if (symbol.id !== symbol.useThis) isRenamed = true;
|
|
267
258
|
});
|
|
268
259
|
}
|
|
269
|
-
return
|
|
260
|
+
return isRenamed;
|
|
270
261
|
};
|
|
271
262
|
|
|
272
|
-
// PcalSymTab.CheckForDefaultInitValue.
|
|
273
263
|
const checkForDefaultInitValue = (table: PcalSymbolTable) => {
|
|
274
264
|
const uses = table.symbols
|
|
275
265
|
.filter((symbol) => symbol.id === "defaultInitValue")
|
|
@@ -279,8 +269,6 @@ const checkForDefaultInitValue = (table: PcalSymbolTable) => {
|
|
|
279
269
|
}
|
|
280
270
|
};
|
|
281
271
|
|
|
282
|
-
// PcalFixIDs.Fix: replaces every identifier with the name PcalSymTab.Disambiguate chose for it, and
|
|
283
|
-
// closes each process's set of called procedures over the procedures they call.
|
|
284
272
|
const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: string) => void) => {
|
|
285
273
|
const fixExpr = (expr: PcalExpr, context: string) => {
|
|
286
274
|
const names: string[] = [];
|
|
@@ -291,7 +279,7 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
291
279
|
const useMe = useThisVar(table, token.string, context);
|
|
292
280
|
if (names.includes(token.string) || useMe === token.string) return;
|
|
293
281
|
names.push(token.string);
|
|
294
|
-
replacements.push(createNormalizedPcalExpr([[
|
|
282
|
+
replacements.push(createNormalizedPcalExpr([[createIdentToken(useMe)]]));
|
|
295
283
|
}),
|
|
296
284
|
);
|
|
297
285
|
if (replacements.length > 0) substitutePcalExpr(expr, replacements, names, false);
|
|
@@ -425,15 +413,13 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
425
413
|
process.name = useThis(table, PCAL_SYMBOL.process, process.name, "");
|
|
426
414
|
};
|
|
427
415
|
|
|
428
|
-
// PcalFixIDs.FixMultiprocess: a process calling an unknown procedure stops the fixing of the
|
|
429
|
-
// remaining processes with an error message, but not the translation.
|
|
430
416
|
const fixMultiprocess = (procedures: PcalProcedure[], processes: PcalProcess[]) => {
|
|
431
417
|
procedures.forEach(fixProcedure);
|
|
432
418
|
const procedureNames = procedures.map((procedure) => procedure.name);
|
|
433
419
|
const isCalled = procedures.map((procedure) =>
|
|
434
420
|
procedureNames.map((name) => procedure.proceduresCalled.includes(name)),
|
|
435
421
|
);
|
|
436
|
-
procedureNames.forEach((
|
|
422
|
+
procedureNames.forEach((_name, middle) =>
|
|
437
423
|
isCalled.forEach((row) =>
|
|
438
424
|
row.forEach((isPath, end) => {
|
|
439
425
|
row[end] = isPath || (row[middle] && isCalled[middle][end]);
|
|
@@ -442,13 +428,12 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
442
428
|
);
|
|
443
429
|
procedures.forEach((procedure, index) => {
|
|
444
430
|
procedure.proceduresCalled = procedureNames.filter(
|
|
445
|
-
(
|
|
431
|
+
(_name, calleeIndex) => isCalled[index][calleeIndex],
|
|
446
432
|
);
|
|
447
433
|
});
|
|
448
434
|
for (const process of processes) {
|
|
449
435
|
fixProcess(process);
|
|
450
436
|
const called = process.proceduresCalled;
|
|
451
|
-
// Callees appended below are themselves visited, as the Java loop rereads the size.
|
|
452
437
|
for (let calledIndex = 0; calledIndex < called.length; calledIndex += 1) {
|
|
453
438
|
const procedureIndex = procedureNames.indexOf(called[calledIndex]);
|
|
454
439
|
if (procedureIndex === -1) {
|
|
@@ -473,13 +458,11 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
473
458
|
}
|
|
474
459
|
};
|
|
475
460
|
|
|
476
|
-
|
|
477
|
-
const
|
|
478
|
-
const
|
|
479
|
-
const
|
|
480
|
-
const identToken = (string: string) => createPcalToken(string, 0, PCAL_TOKEN.ident);
|
|
461
|
+
const createStringToken = (string: string) => createPcalToken(string, 0, PCAL_TOKEN.string);
|
|
462
|
+
const createAddedToken = (string: string) => createPcalToken(string, 0, PCAL_TOKEN.added);
|
|
463
|
+
const createBuiltInToken = (string: string) => createPcalToken(string, 0, PCAL_TOKEN.builtin);
|
|
464
|
+
const createIdentToken = (string: string) => createPcalToken(string, 0, PCAL_TOKEN.ident);
|
|
481
465
|
|
|
482
|
-
// PcalTranslate.TokVectorToExpr: copies the tokens onto one line, spaces columns apart.
|
|
483
466
|
const tokensToExpr = (tokens: PcalToken[], spaces: number) => {
|
|
484
467
|
const line: PcalToken[] = [];
|
|
485
468
|
tokens.forEach((token) => {
|
|
@@ -491,38 +474,35 @@ const tokensToExpr = (tokens: PcalToken[], spaces: number) => {
|
|
|
491
474
|
return createNormalizedPcalExpr([line]);
|
|
492
475
|
};
|
|
493
476
|
|
|
494
|
-
// PcalTranslate.MakeNewStackTopExprPretty: lays out a pushed stack frame one field per line with
|
|
495
|
-
// the "|->" aligned.
|
|
496
477
|
const prettifyStackTopExpr = (expr: PcalExpr) =>
|
|
497
478
|
expr.tokens.forEach((line, lineIndex) => {
|
|
498
|
-
|
|
479
|
+
let column = lineIndex === 0 || lineIndex === expr.tokens.length - 1 ? 1 : 6;
|
|
499
480
|
line.forEach((token) => {
|
|
500
|
-
token.column =
|
|
501
|
-
|
|
481
|
+
token.column = column;
|
|
482
|
+
column += getPcalTokenWidth(token);
|
|
502
483
|
if (token.type !== PCAL_TOKEN.builtin) return;
|
|
503
484
|
switch (token.string) {
|
|
504
485
|
case "|->":
|
|
505
486
|
case "↦":
|
|
506
487
|
token.column = Math.max(16, token.column + 1);
|
|
507
|
-
|
|
488
|
+
column = token.column + 5;
|
|
508
489
|
return;
|
|
509
490
|
case "[":
|
|
510
491
|
case "<<":
|
|
511
|
-
|
|
492
|
+
column += 1;
|
|
512
493
|
return;
|
|
513
494
|
case "]":
|
|
514
495
|
case ">>":
|
|
515
496
|
token.column += 1;
|
|
516
|
-
|
|
497
|
+
column += 1;
|
|
517
498
|
return;
|
|
518
499
|
case "\\o":
|
|
519
500
|
token.column += 1;
|
|
520
|
-
|
|
501
|
+
column += 2;
|
|
521
502
|
}
|
|
522
503
|
});
|
|
523
504
|
});
|
|
524
505
|
|
|
525
|
-
// A new AST.SingleAssign and AST.Assign, whose line and column default to 0.
|
|
526
506
|
const createSingleAssign = (
|
|
527
507
|
variable: string,
|
|
528
508
|
sub: PcalExpr,
|
|
@@ -553,7 +533,6 @@ const makeAssign = (variable: string, expr: PcalExpr, line = 0, col = 0) =>
|
|
|
553
533
|
col,
|
|
554
534
|
);
|
|
555
535
|
|
|
556
|
-
// PcalTranslate.IsTRUE, which indexes the first line of an expression without checking it has one.
|
|
557
536
|
const isTrue = (expr: PcalExpr) => {
|
|
558
537
|
if (expr.tokens.length > 1) return false;
|
|
559
538
|
const line = getElement(expr.tokens, 0);
|
|
@@ -564,40 +543,36 @@ const isTrue = (expr: PcalExpr) => {
|
|
|
564
543
|
return false;
|
|
565
544
|
};
|
|
566
545
|
|
|
567
|
-
const
|
|
546
|
+
const createPCCheck = (label: string): PcalWhen => ({
|
|
568
547
|
...createPcalBase(),
|
|
569
548
|
kind: "When",
|
|
570
|
-
exp: tokensToExpr([
|
|
549
|
+
exp: tokensToExpr([createAddedToken("pc"), createBuiltInToken("="), createStringToken(label)], 1),
|
|
571
550
|
});
|
|
572
551
|
|
|
573
552
|
// HACK: PcalSymTab.ProcedureEntry leaves iPC null for a procedure with no statements, which
|
|
574
553
|
// StringToken keeps and AST.toString prints as "null".
|
|
575
|
-
const
|
|
576
|
-
makeAssign("pc", createNormalizedPcalExpr([[
|
|
554
|
+
const createPCUpdate = (next: string | undefined) =>
|
|
555
|
+
makeAssign("pc", createNormalizedPcalExpr([[createStringToken(next ?? "null")]]));
|
|
577
556
|
|
|
578
|
-
// `Head(stack).field`.
|
|
579
557
|
const getStackHeadTokens = (field: string) => [
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
558
|
+
createIdentToken("Head"),
|
|
559
|
+
createBuiltInToken("("),
|
|
560
|
+
createAddedToken("stack"),
|
|
561
|
+
createBuiltInToken(")"),
|
|
562
|
+
createBuiltInToken("."),
|
|
563
|
+
createIdentToken(field),
|
|
586
564
|
];
|
|
587
565
|
|
|
588
|
-
// `Tail(stack)`.
|
|
589
566
|
const getStackTailTokens = () => [
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
567
|
+
createIdentToken("Tail"),
|
|
568
|
+
createBuiltInToken("("),
|
|
569
|
+
createAddedToken("stack"),
|
|
570
|
+
createBuiltInToken(")"),
|
|
594
571
|
];
|
|
595
572
|
|
|
596
573
|
const createStackHeadExpr = (field: string) =>
|
|
597
574
|
createNormalizedPcalExpr([getStackHeadTokens(field)]);
|
|
598
575
|
|
|
599
|
-
// The `<< [ procedure |-> "name", pc |-> ..., var |-> var ] >> \o ...` that ExplodeCall and
|
|
600
|
-
// ExplodeCallReturn push onto the stack.
|
|
601
576
|
const createStackPushExpr = (
|
|
602
577
|
procedure: string,
|
|
603
578
|
pcTokens: PcalToken[],
|
|
@@ -606,20 +581,24 @@ const createStackPushExpr = (
|
|
|
606
581
|
) => {
|
|
607
582
|
const tokens: PcalToken[][] = [
|
|
608
583
|
[
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
584
|
+
createBuiltInToken("<<"),
|
|
585
|
+
createBuiltInToken("["),
|
|
586
|
+
createIdentToken("procedure"),
|
|
587
|
+
createBuiltInToken("|->"),
|
|
588
|
+
createStringToken(procedure),
|
|
589
|
+
createBuiltInToken(","),
|
|
615
590
|
],
|
|
616
|
-
[
|
|
591
|
+
[createIdentToken("pc"), createBuiltInToken("|->"), ...pcTokens],
|
|
617
592
|
];
|
|
618
593
|
variables.forEach((variable) => {
|
|
619
|
-
tokens[tokens.length - 1].push(
|
|
620
|
-
tokens.push([
|
|
594
|
+
tokens[tokens.length - 1].push(createBuiltInToken(","));
|
|
595
|
+
tokens.push([
|
|
596
|
+
createIdentToken(variable.var),
|
|
597
|
+
createBuiltInToken("|->"),
|
|
598
|
+
createIdentToken(variable.var),
|
|
599
|
+
]);
|
|
621
600
|
});
|
|
622
|
-
tokens[tokens.length - 1].push(
|
|
601
|
+
tokens[tokens.length - 1].push(createBuiltInToken("]"), createBuiltInToken(">>"));
|
|
623
602
|
tokens.push(tailTokens);
|
|
624
603
|
const expr = createPcalExpr(tokens);
|
|
625
604
|
prettifyStackTopExpr(expr);
|
|
@@ -627,8 +606,6 @@ const createStackPushExpr = (
|
|
|
627
606
|
return expr;
|
|
628
607
|
};
|
|
629
608
|
|
|
630
|
-
// The statements a call explodes into after its stack push: the parameters' and the procedure
|
|
631
|
-
// variables' initial values and the jump to the procedure's first label.
|
|
632
609
|
const createCallStmts = (
|
|
633
610
|
assign: PcalAssign,
|
|
634
611
|
entry: PcalProcedureEntry,
|
|
@@ -651,28 +628,22 @@ const createCallStmts = (
|
|
|
651
628
|
return [
|
|
652
629
|
assign,
|
|
653
630
|
...entry.decls.map((decl) => makeAssign(decl.var, decl.val, call.line, call.col)),
|
|
654
|
-
|
|
631
|
+
createPCUpdate(entry.initialPC),
|
|
655
632
|
];
|
|
656
633
|
};
|
|
657
634
|
|
|
658
|
-
// CopyAndExplodeLastStmt's triple: the statements with their last one exploded, the labeled
|
|
659
|
-
// statements the explosion split off, and whether control falls off the end needing a pc update.
|
|
660
635
|
interface PcalExplodedStmts {
|
|
661
636
|
stmts: PcalStmt[];
|
|
662
637
|
labeledStmts: PcalLabeledStmt[];
|
|
663
638
|
needsGoto: boolean;
|
|
664
639
|
}
|
|
665
640
|
|
|
666
|
-
// PcalTranslate.Explode: turns each labeled statement into an atomic action that checks and sets
|
|
667
|
-
// pc, and calls, returns and gotos into stack and pc assignments. Statement lists nested in the
|
|
668
|
-
// original AST are exploded in place, as the Java does, so the original AST changes too.
|
|
669
641
|
const explodePcalAlgorithm = (
|
|
670
642
|
ast: PcalAlgorithm,
|
|
671
643
|
table: PcalSymbolTable,
|
|
672
|
-
|
|
644
|
+
shouldOmitPC: boolean,
|
|
673
645
|
): PcalAlgorithm => {
|
|
674
|
-
|
|
675
|
-
const context: { procedure: string | undefined } = { procedure: undefined };
|
|
646
|
+
let currentProcedure: string | undefined;
|
|
676
647
|
|
|
677
648
|
const explodeCall = (call: PcalCall, next: string) => {
|
|
678
649
|
const procedureIndex = findProcedureIndex(table, call.to);
|
|
@@ -682,15 +653,15 @@ const explodePcalAlgorithm = (
|
|
|
682
653
|
const entry = table.procedures[procedureIndex];
|
|
683
654
|
const stackPush = createStackPushExpr(
|
|
684
655
|
call.to,
|
|
685
|
-
[
|
|
656
|
+
[createStringToken(next)],
|
|
686
657
|
[...entry.decls, ...entry.params],
|
|
687
|
-
[
|
|
658
|
+
[createBuiltInToken("\\o"), createAddedToken("stack")],
|
|
688
659
|
);
|
|
689
660
|
return createCallStmts(makeAssign("stack", stackPush, call.line, call.col), entry, call);
|
|
690
661
|
};
|
|
691
662
|
|
|
692
663
|
const explodeReturn = (stmt: PcalReturn) => {
|
|
693
|
-
stmt.from ??=
|
|
664
|
+
stmt.from ??= currentProcedure;
|
|
694
665
|
const from = stmt.from;
|
|
695
666
|
if (from === undefined) throw new PcalError("`return' statement not in procedure", stmt);
|
|
696
667
|
const procedureIndex = findProcedureIndex(table, from);
|
|
@@ -726,7 +697,6 @@ const explodePcalAlgorithm = (
|
|
|
726
697
|
}
|
|
727
698
|
const toEntry = table.procedures[toIndex];
|
|
728
699
|
const assign = createAssign([], stmt.line, stmt.col);
|
|
729
|
-
// A tail call to the procedure itself reuses its stack frame.
|
|
730
700
|
if (from !== stmt.to) {
|
|
731
701
|
fromEntry.decls.forEach((decl) =>
|
|
732
702
|
assign.ass.push(
|
|
@@ -743,7 +713,7 @@ const explodePcalAlgorithm = (
|
|
|
743
713
|
stmt.to,
|
|
744
714
|
getStackHeadTokens("pc"),
|
|
745
715
|
[...toEntry.decls, ...toEntry.params],
|
|
746
|
-
[
|
|
716
|
+
[createBuiltInToken("\\o"), ...getStackTailTokens()],
|
|
747
717
|
);
|
|
748
718
|
assign.ass.push(
|
|
749
719
|
createSingleAssign("stack", createNormalizedPcalExpr([]), stackPush, stmt.line, stmt.col),
|
|
@@ -752,10 +722,8 @@ const explodePcalAlgorithm = (
|
|
|
752
722
|
return createCallStmts(assign, toEntry, stmt);
|
|
753
723
|
};
|
|
754
724
|
|
|
755
|
-
// PcalTranslate.CopyAndExplodeLastStmt: explodes the last statement of stmts in place, recursing
|
|
756
|
-
// into the branches of a trailing if, either or with.
|
|
757
725
|
const copyAndExplodeLastStmt = (stmts: PcalStmt[], next: string): PcalExplodedStmts => {
|
|
758
|
-
if (stmts.length === 0) return { stmts: [], labeledStmts: [], needsGoto: !
|
|
726
|
+
if (stmts.length === 0) return { stmts: [], labeledStmts: [], needsGoto: !shouldOmitPC };
|
|
759
727
|
const result: PcalExplodedStmts = { stmts, labeledStmts: [], needsGoto: false };
|
|
760
728
|
const last = stmts[stmts.length - 1];
|
|
761
729
|
switch (last.kind) {
|
|
@@ -770,7 +738,7 @@ const explodePcalAlgorithm = (
|
|
|
770
738
|
}
|
|
771
739
|
case "Goto":
|
|
772
740
|
stmts.pop();
|
|
773
|
-
stmts.push(
|
|
741
|
+
stmts.push(createPCUpdate(last.to));
|
|
774
742
|
break;
|
|
775
743
|
case "Call":
|
|
776
744
|
stmts.pop();
|
|
@@ -807,11 +775,11 @@ const explodePcalAlgorithm = (
|
|
|
807
775
|
result.labeledStmts.push(...explodedThen.labeledStmts, ...explodedElse.labeledStmts);
|
|
808
776
|
last.Then = explodedThen.stmts;
|
|
809
777
|
last.Else = explodedElse.stmts;
|
|
810
|
-
if (!
|
|
778
|
+
if (!shouldOmitPC) {
|
|
811
779
|
result.needsGoto = explodedThen.needsGoto && explodedElse.needsGoto;
|
|
812
780
|
if (!result.needsGoto) {
|
|
813
|
-
if (explodedThen.needsGoto) last.Then.push(
|
|
814
|
-
if (explodedElse.needsGoto) last.Else.push(
|
|
781
|
+
if (explodedThen.needsGoto) last.Then.push(createPCUpdate(next));
|
|
782
|
+
if (explodedElse.needsGoto) last.Else.push(createPCUpdate(next));
|
|
815
783
|
}
|
|
816
784
|
}
|
|
817
785
|
break;
|
|
@@ -824,9 +792,9 @@ const explodePcalAlgorithm = (
|
|
|
824
792
|
return exploded;
|
|
825
793
|
});
|
|
826
794
|
result.needsGoto = explodedOrs.every((exploded) => exploded.needsGoto);
|
|
827
|
-
if (!
|
|
795
|
+
if (!shouldOmitPC && !result.needsGoto) {
|
|
828
796
|
explodedOrs.forEach((exploded, index) => {
|
|
829
|
-
if (exploded.needsGoto) last.ors[index].push(
|
|
797
|
+
if (exploded.needsGoto) last.ors[index].push(createPCUpdate(next));
|
|
830
798
|
});
|
|
831
799
|
}
|
|
832
800
|
break;
|
|
@@ -841,13 +809,13 @@ const explodePcalAlgorithm = (
|
|
|
841
809
|
default:
|
|
842
810
|
result.needsGoto = true;
|
|
843
811
|
}
|
|
844
|
-
if (
|
|
812
|
+
if (shouldOmitPC) result.needsGoto = false;
|
|
845
813
|
return result;
|
|
846
814
|
};
|
|
847
815
|
|
|
848
816
|
const copyAndExplodeLastStmtWithGoto = (stmts: PcalStmt[], next: string) => {
|
|
849
817
|
const exploded = copyAndExplodeLastStmt(stmts, next);
|
|
850
|
-
if (exploded.needsGoto) exploded.stmts.push(
|
|
818
|
+
if (exploded.needsGoto) exploded.stmts.push(createPCUpdate(next));
|
|
851
819
|
return exploded;
|
|
852
820
|
};
|
|
853
821
|
|
|
@@ -856,9 +824,8 @@ const explodePcalAlgorithm = (
|
|
|
856
824
|
if (first?.kind === "While") return explodeWhile(labeledStmt, first, next);
|
|
857
825
|
const exploded = copyAndExplodeLastStmtWithGoto([...labeledStmt.stmts], next);
|
|
858
826
|
const result: PcalLabeledStmt[] = [];
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
exploded.stmts.unshift(checkPC(labeledStmt.label));
|
|
827
|
+
if (!shouldOmitPC) {
|
|
828
|
+
exploded.stmts.unshift(createPCCheck(labeledStmt.label));
|
|
862
829
|
result.push({
|
|
863
830
|
...createPcalBase(),
|
|
864
831
|
kind: "LabeledStmt",
|
|
@@ -877,8 +844,6 @@ const explodePcalAlgorithm = (
|
|
|
877
844
|
explodeLabeledStmt(labeledStmt, index < seq.length - 1 ? seq[index + 1].label : next),
|
|
878
845
|
);
|
|
879
846
|
|
|
880
|
-
// PcalTranslate.ExplodeWhile: the loop's label tests the condition, running the unlabeled body
|
|
881
|
-
// or the statements after the loop.
|
|
882
847
|
const explodeWhile = (labeledStmt: PcalLabeledStmt, loop: PcalWhile, next: string) => {
|
|
883
848
|
const unlabDoNext = loop.labDo.length === 0 ? labeledStmt.label : loop.labDo[0].label;
|
|
884
849
|
const explodedBody = copyAndExplodeLastStmtWithGoto([...loop.unlabDo], unlabDoNext);
|
|
@@ -901,7 +866,7 @@ const explodePcalAlgorithm = (
|
|
|
901
866
|
col: labeledStmt.col,
|
|
902
867
|
line: labeledStmt.line,
|
|
903
868
|
label: labeledStmt.label,
|
|
904
|
-
stmts: [...(
|
|
869
|
+
stmts: [...(shouldOmitPC ? [] : [createPCCheck(labeledStmt.label)]), ...loopStmts],
|
|
905
870
|
};
|
|
906
871
|
return [
|
|
907
872
|
newLabeledStmt,
|
|
@@ -961,9 +926,9 @@ const explodePcalAlgorithm = (
|
|
|
961
926
|
explodeLabeledStmtSeq(body.map(toLabeledStmt), next);
|
|
962
927
|
|
|
963
928
|
const explodeProcedure = (procedure: PcalProcedure): PcalProcedure => {
|
|
964
|
-
|
|
929
|
+
currentProcedure = procedure.name;
|
|
965
930
|
const body = explodeBody(procedure.body, useThis(table, PCAL_SYMBOL.label, "Error", ""));
|
|
966
|
-
|
|
931
|
+
currentProcedure = undefined;
|
|
967
932
|
return {
|
|
968
933
|
...createPcalBase(),
|
|
969
934
|
kind: "Procedure",
|
|
@@ -1024,12 +989,8 @@ const explodePcalAlgorithm = (
|
|
|
1024
989
|
};
|
|
1025
990
|
};
|
|
1026
991
|
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
// variable is declared and assigned at most once per step. Changed counts the assignments to each
|
|
1030
|
-
// variable along the paths through a labeled statement.
|
|
1031
|
-
const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
1032
|
-
const vars = omitPC ? [] : ["pc"];
|
|
992
|
+
const checkPcalTlaGen = (explodedAst: PcalAlgorithm, shouldOmitPC: boolean) => {
|
|
993
|
+
const vars = shouldOmitPC ? [] : ["pc"];
|
|
1033
994
|
vars.push(...explodedAst.decls.map((decl) => decl.var));
|
|
1034
995
|
if (explodedAst.prcds.length > 0) vars.push("stack");
|
|
1035
996
|
explodedAst.prcds.forEach((procedure) => {
|
|
@@ -1041,7 +1002,6 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1041
1002
|
}
|
|
1042
1003
|
if (vars.length === 0) throw new PcalError("The algorithm has no variables.");
|
|
1043
1004
|
|
|
1044
|
-
// Changed.Set, which counts only the first of duplicate variable names.
|
|
1045
1005
|
const setChanged = (changed: number[], variable: string) => {
|
|
1046
1006
|
const index = vars.indexOf(variable);
|
|
1047
1007
|
if (index === -1) return 0;
|
|
@@ -1054,23 +1014,19 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1054
1014
|
changed[index] = Math.max(changed[index], count);
|
|
1055
1015
|
});
|
|
1056
1016
|
|
|
1057
|
-
|
|
1058
|
-
const sortSass = (assigns: PcalSingleAssign[]) =>
|
|
1017
|
+
const sortSingleAssigns = (assigns: PcalSingleAssign[]) =>
|
|
1059
1018
|
[...assigns].sort((left, right) =>
|
|
1060
1019
|
left.lhs.var < right.lhs.var ? -1 : left.lhs.var > right.lhs.var ? 1 : 0,
|
|
1061
1020
|
);
|
|
1062
1021
|
|
|
1063
|
-
const
|
|
1022
|
+
const checkAssign = (assign: PcalAssign, changed: number[]) => {
|
|
1064
1023
|
const thisChanged = [...changed];
|
|
1065
|
-
assign.ass =
|
|
1066
|
-
// The sort puts the assignments to each variable next to each other.
|
|
1024
|
+
assign.ass = sortSingleAssigns(assign.ass);
|
|
1067
1025
|
new Set(assign.ass.map((single) => single.lhs.var)).forEach((variable) => {
|
|
1068
1026
|
const group = assign.ass.filter((single) => single.lhs.var === variable);
|
|
1069
1027
|
if (!vars.includes(variable)) {
|
|
1070
1028
|
throw new PcalError(`Assignment to undeclared variable ${variable}`, group[0]);
|
|
1071
1029
|
}
|
|
1072
|
-
// GenAssign also notes whether the assignment after the group lacks a subscript, but its
|
|
1073
|
-
// loop ends before reading that, so only the group's own assignments count.
|
|
1074
1030
|
const hasAssignmentWithNoSubscript = group.some(
|
|
1075
1031
|
(single) => single.lhs.sub.tokens.length === 0,
|
|
1076
1032
|
);
|
|
@@ -1084,16 +1040,16 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1084
1040
|
mergeChanged(changed, thisChanged);
|
|
1085
1041
|
};
|
|
1086
1042
|
|
|
1087
|
-
const
|
|
1043
|
+
const checkStmt = (stmt: PcalStmt, changed: number[]): void => {
|
|
1088
1044
|
switch (stmt.kind) {
|
|
1089
1045
|
case "Assign":
|
|
1090
|
-
|
|
1046
|
+
checkAssign(stmt, changed);
|
|
1091
1047
|
return;
|
|
1092
1048
|
case "If": {
|
|
1093
1049
|
const thenChanged = [...changed];
|
|
1094
1050
|
const elseChanged = [...changed];
|
|
1095
|
-
stmt.Then.forEach((innerStmt) =>
|
|
1096
|
-
stmt.Else.forEach((innerStmt) =>
|
|
1051
|
+
stmt.Then.forEach((innerStmt) => checkStmt(innerStmt, thenChanged));
|
|
1052
|
+
stmt.Else.forEach((innerStmt) => checkStmt(innerStmt, elseChanged));
|
|
1097
1053
|
mergeChanged(changed, thenChanged);
|
|
1098
1054
|
mergeChanged(changed, elseChanged);
|
|
1099
1055
|
return;
|
|
@@ -1102,14 +1058,14 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1102
1058
|
const allChanged = [...changed];
|
|
1103
1059
|
stmt.ors.forEach((orStmts) => {
|
|
1104
1060
|
const orChanged = [...changed];
|
|
1105
|
-
orStmts.forEach((innerStmt) =>
|
|
1061
|
+
orStmts.forEach((innerStmt) => checkStmt(innerStmt, orChanged));
|
|
1106
1062
|
mergeChanged(allChanged, orChanged);
|
|
1107
1063
|
});
|
|
1108
1064
|
mergeChanged(changed, allChanged);
|
|
1109
1065
|
return;
|
|
1110
1066
|
}
|
|
1111
1067
|
case "With":
|
|
1112
|
-
stmt.Do.forEach((innerStmt) =>
|
|
1068
|
+
stmt.Do.forEach((innerStmt) => checkStmt(innerStmt, changed));
|
|
1113
1069
|
return;
|
|
1114
1070
|
case "When":
|
|
1115
1071
|
case "PrintS":
|
|
@@ -1121,31 +1077,28 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1121
1077
|
}
|
|
1122
1078
|
};
|
|
1123
1079
|
|
|
1124
|
-
const
|
|
1080
|
+
const checkBody = (body: PcalStmt[]) =>
|
|
1125
1081
|
body.forEach((stmt) => {
|
|
1126
1082
|
const changed = vars.map(() => 0);
|
|
1127
|
-
toLabeledStmt(stmt).stmts.forEach((innerStmt) =>
|
|
1083
|
+
toLabeledStmt(stmt).stmts.forEach((innerStmt) => checkStmt(innerStmt, changed));
|
|
1128
1084
|
});
|
|
1129
1085
|
|
|
1130
|
-
explodedAst.prcds.forEach((procedure) =>
|
|
1086
|
+
explodedAst.prcds.forEach((procedure) => checkBody(procedure.body));
|
|
1131
1087
|
(explodedAst.kind === "Uniprocess"
|
|
1132
1088
|
? [explodedAst.body]
|
|
1133
1089
|
: explodedAst.procs.map((process) => process.body)
|
|
1134
|
-
).forEach(
|
|
1090
|
+
).forEach(checkBody);
|
|
1135
1091
|
};
|
|
1136
1092
|
|
|
1137
|
-
// PCalTLAGenerator.removeNameConflicts followed by translate, for what they do to the AST and the
|
|
1138
|
-
// errors they report: the symbol table's renaming, PcalFixIDs, PcalTranslate.Explode and the checks
|
|
1139
|
-
// PcalTLAGen makes while generating the TLA+ translation, which SANY discards.
|
|
1140
1093
|
export const translatePcalAlgorithm = (
|
|
1141
1094
|
ast: PcalAlgorithm,
|
|
1142
|
-
|
|
1095
|
+
shouldOmitPC: boolean,
|
|
1143
1096
|
hasDefaultInitialization: boolean,
|
|
1144
1097
|
log: (line: string) => void,
|
|
1145
1098
|
) => {
|
|
1146
1099
|
const table = createPcalSymbolTable(ast);
|
|
1147
1100
|
if (disambiguatePcalSymbols(table)) log("Warning: symbols were renamed.");
|
|
1148
1101
|
fixPcalIds(ast, table, log);
|
|
1149
|
-
checkPcalTlaGen(explodePcalAlgorithm(ast, table,
|
|
1102
|
+
checkPcalTlaGen(explodePcalAlgorithm(ast, table, shouldOmitPC), shouldOmitPC);
|
|
1150
1103
|
if (hasDefaultInitialization) checkForDefaultInitValue(table);
|
|
1151
1104
|
};
|