tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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 +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -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 +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -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 +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -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 +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- 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 +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +496 -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 +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -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 +218 -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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- 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 +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -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 +2127 -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 +1010 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -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 +1200 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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
|
@@ -68,7 +68,6 @@ interface PcalSymbol {
|
|
|
68
68
|
useThis: string;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
// initialPC is the first label, which a body with no statements lacks.
|
|
72
71
|
interface PcalProcedureEntry {
|
|
73
72
|
name: string;
|
|
74
73
|
params: PcalPVarDecl[];
|
|
@@ -83,8 +82,6 @@ interface PcalSymbolTable {
|
|
|
83
82
|
errorReport: string;
|
|
84
83
|
}
|
|
85
84
|
|
|
86
|
-
// A Return or CallReturn outside a procedure has no from, and PcalSymTab.FindSym never matches a
|
|
87
|
-
// null id.
|
|
88
85
|
const findSymbol = (
|
|
89
86
|
table: PcalSymbolTable,
|
|
90
87
|
type: number,
|
|
@@ -98,7 +95,6 @@ const findSymbol = (
|
|
|
98
95
|
const findSymbolInContext = (table: PcalSymbolTable, id: string, context: string) =>
|
|
99
96
|
table.symbols.find((symbol) => symbol.id === id && symbol.context === context);
|
|
100
97
|
|
|
101
|
-
// PcalSymTab.FindProc returns the number of procedures when it finds none.
|
|
102
98
|
const findProcedureIndex = (table: PcalSymbolTable, name: string) => {
|
|
103
99
|
const index = table.procedures.findIndex((procedure) => procedure.name === name);
|
|
104
100
|
return index === -1 ? table.procedures.length : index;
|
|
@@ -249,7 +245,7 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
249
245
|
const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
250
246
|
const isAmbiguous = (id: string) =>
|
|
251
247
|
table.symbols.filter((symbol) => symbol.useThis === id).length > 1;
|
|
252
|
-
|
|
248
|
+
let isRenamed = false;
|
|
253
249
|
for (let type = 0; type <= PCAL_SYMBOL_TYPE_COUNT; type += 1) {
|
|
254
250
|
table.symbols.forEach((symbol) => {
|
|
255
251
|
if (symbol.type !== type) return;
|
|
@@ -258,10 +254,10 @@ const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
|
258
254
|
symbol.useThis +=
|
|
259
255
|
suffixLength === 1 ? "_" : (symbol.context[suffixLength - 2] ?? String(type));
|
|
260
256
|
}
|
|
261
|
-
if (symbol.id !== symbol.useThis)
|
|
257
|
+
if (symbol.id !== symbol.useThis) isRenamed = true;
|
|
262
258
|
});
|
|
263
259
|
}
|
|
264
|
-
return
|
|
260
|
+
return isRenamed;
|
|
265
261
|
};
|
|
266
262
|
|
|
267
263
|
const checkForDefaultInitValue = (table: PcalSymbolTable) => {
|
|
@@ -283,7 +279,7 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
283
279
|
const useMe = useThisVar(table, token.string, context);
|
|
284
280
|
if (names.includes(token.string) || useMe === token.string) return;
|
|
285
281
|
names.push(token.string);
|
|
286
|
-
replacements.push(createNormalizedPcalExpr([[
|
|
282
|
+
replacements.push(createNormalizedPcalExpr([[createIdentToken(useMe)]]));
|
|
287
283
|
}),
|
|
288
284
|
);
|
|
289
285
|
if (replacements.length > 0) substitutePcalExpr(expr, replacements, names, false);
|
|
@@ -417,15 +413,13 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
417
413
|
process.name = useThis(table, PCAL_SYMBOL.process, process.name, "");
|
|
418
414
|
};
|
|
419
415
|
|
|
420
|
-
// A process calling an unknown procedure stops the fixing of the remaining processes with an
|
|
421
|
-
// error message, but not the translation.
|
|
422
416
|
const fixMultiprocess = (procedures: PcalProcedure[], processes: PcalProcess[]) => {
|
|
423
417
|
procedures.forEach(fixProcedure);
|
|
424
418
|
const procedureNames = procedures.map((procedure) => procedure.name);
|
|
425
419
|
const isCalled = procedures.map((procedure) =>
|
|
426
420
|
procedureNames.map((name) => procedure.proceduresCalled.includes(name)),
|
|
427
421
|
);
|
|
428
|
-
procedureNames.forEach((
|
|
422
|
+
procedureNames.forEach((_name, middle) =>
|
|
429
423
|
isCalled.forEach((row) =>
|
|
430
424
|
row.forEach((isPath, end) => {
|
|
431
425
|
row[end] = isPath || (row[middle] && isCalled[middle][end]);
|
|
@@ -434,13 +428,12 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
434
428
|
);
|
|
435
429
|
procedures.forEach((procedure, index) => {
|
|
436
430
|
procedure.proceduresCalled = procedureNames.filter(
|
|
437
|
-
(
|
|
431
|
+
(_name, calleeIndex) => isCalled[index][calleeIndex],
|
|
438
432
|
);
|
|
439
433
|
});
|
|
440
434
|
for (const process of processes) {
|
|
441
435
|
fixProcess(process);
|
|
442
436
|
const called = process.proceduresCalled;
|
|
443
|
-
// Callees appended below are themselves visited, as the Java loop rereads the size.
|
|
444
437
|
for (let calledIndex = 0; calledIndex < called.length; calledIndex += 1) {
|
|
445
438
|
const procedureIndex = procedureNames.indexOf(called[calledIndex]);
|
|
446
439
|
if (procedureIndex === -1) {
|
|
@@ -465,10 +458,10 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
465
458
|
}
|
|
466
459
|
};
|
|
467
460
|
|
|
468
|
-
const
|
|
469
|
-
const
|
|
470
|
-
const
|
|
471
|
-
const
|
|
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);
|
|
472
465
|
|
|
473
466
|
const tokensToExpr = (tokens: PcalToken[], spaces: number) => {
|
|
474
467
|
const line: PcalToken[] = [];
|
|
@@ -483,29 +476,29 @@ const tokensToExpr = (tokens: PcalToken[], spaces: number) => {
|
|
|
483
476
|
|
|
484
477
|
const prettifyStackTopExpr = (expr: PcalExpr) =>
|
|
485
478
|
expr.tokens.forEach((line, lineIndex) => {
|
|
486
|
-
|
|
479
|
+
let column = lineIndex === 0 || lineIndex === expr.tokens.length - 1 ? 1 : 6;
|
|
487
480
|
line.forEach((token) => {
|
|
488
|
-
token.column =
|
|
489
|
-
|
|
481
|
+
token.column = column;
|
|
482
|
+
column += getPcalTokenWidth(token);
|
|
490
483
|
if (token.type !== PCAL_TOKEN.builtin) return;
|
|
491
484
|
switch (token.string) {
|
|
492
485
|
case "|->":
|
|
493
486
|
case "↦":
|
|
494
487
|
token.column = Math.max(16, token.column + 1);
|
|
495
|
-
|
|
488
|
+
column = token.column + 5;
|
|
496
489
|
return;
|
|
497
490
|
case "[":
|
|
498
491
|
case "<<":
|
|
499
|
-
|
|
492
|
+
column += 1;
|
|
500
493
|
return;
|
|
501
494
|
case "]":
|
|
502
495
|
case ">>":
|
|
503
496
|
token.column += 1;
|
|
504
|
-
|
|
497
|
+
column += 1;
|
|
505
498
|
return;
|
|
506
499
|
case "\\o":
|
|
507
500
|
token.column += 1;
|
|
508
|
-
|
|
501
|
+
column += 2;
|
|
509
502
|
}
|
|
510
503
|
});
|
|
511
504
|
});
|
|
@@ -540,7 +533,6 @@ const makeAssign = (variable: string, expr: PcalExpr, line = 0, col = 0) =>
|
|
|
540
533
|
col,
|
|
541
534
|
);
|
|
542
535
|
|
|
543
|
-
// PcalTranslate.IsTRUE indexes the first line of an expression without checking it has one.
|
|
544
536
|
const isTrue = (expr: PcalExpr) => {
|
|
545
537
|
if (expr.tokens.length > 1) return false;
|
|
546
538
|
const line = getElement(expr.tokens, 0);
|
|
@@ -551,31 +543,31 @@ const isTrue = (expr: PcalExpr) => {
|
|
|
551
543
|
return false;
|
|
552
544
|
};
|
|
553
545
|
|
|
554
|
-
const
|
|
546
|
+
const createPCCheck = (label: string): PcalWhen => ({
|
|
555
547
|
...createPcalBase(),
|
|
556
548
|
kind: "When",
|
|
557
|
-
exp: tokensToExpr([
|
|
549
|
+
exp: tokensToExpr([createAddedToken("pc"), createBuiltInToken("="), createStringToken(label)], 1),
|
|
558
550
|
});
|
|
559
551
|
|
|
560
552
|
// HACK: PcalSymTab.ProcedureEntry leaves iPC null for a procedure with no statements, which
|
|
561
553
|
// StringToken keeps and AST.toString prints as "null".
|
|
562
|
-
const
|
|
563
|
-
makeAssign("pc", createNormalizedPcalExpr([[
|
|
554
|
+
const createPCUpdate = (next: string | undefined) =>
|
|
555
|
+
makeAssign("pc", createNormalizedPcalExpr([[createStringToken(next ?? "null")]]));
|
|
564
556
|
|
|
565
557
|
const getStackHeadTokens = (field: string) => [
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
558
|
+
createIdentToken("Head"),
|
|
559
|
+
createBuiltInToken("("),
|
|
560
|
+
createAddedToken("stack"),
|
|
561
|
+
createBuiltInToken(")"),
|
|
562
|
+
createBuiltInToken("."),
|
|
563
|
+
createIdentToken(field),
|
|
572
564
|
];
|
|
573
565
|
|
|
574
566
|
const getStackTailTokens = () => [
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
567
|
+
createIdentToken("Tail"),
|
|
568
|
+
createBuiltInToken("("),
|
|
569
|
+
createAddedToken("stack"),
|
|
570
|
+
createBuiltInToken(")"),
|
|
579
571
|
];
|
|
580
572
|
|
|
581
573
|
const createStackHeadExpr = (field: string) =>
|
|
@@ -589,20 +581,24 @@ const createStackPushExpr = (
|
|
|
589
581
|
) => {
|
|
590
582
|
const tokens: PcalToken[][] = [
|
|
591
583
|
[
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
584
|
+
createBuiltInToken("<<"),
|
|
585
|
+
createBuiltInToken("["),
|
|
586
|
+
createIdentToken("procedure"),
|
|
587
|
+
createBuiltInToken("|->"),
|
|
588
|
+
createStringToken(procedure),
|
|
589
|
+
createBuiltInToken(","),
|
|
598
590
|
],
|
|
599
|
-
[
|
|
591
|
+
[createIdentToken("pc"), createBuiltInToken("|->"), ...pcTokens],
|
|
600
592
|
];
|
|
601
593
|
variables.forEach((variable) => {
|
|
602
|
-
tokens[tokens.length - 1].push(
|
|
603
|
-
tokens.push([
|
|
594
|
+
tokens[tokens.length - 1].push(createBuiltInToken(","));
|
|
595
|
+
tokens.push([
|
|
596
|
+
createIdentToken(variable.var),
|
|
597
|
+
createBuiltInToken("|->"),
|
|
598
|
+
createIdentToken(variable.var),
|
|
599
|
+
]);
|
|
604
600
|
});
|
|
605
|
-
tokens[tokens.length - 1].push(
|
|
601
|
+
tokens[tokens.length - 1].push(createBuiltInToken("]"), createBuiltInToken(">>"));
|
|
606
602
|
tokens.push(tailTokens);
|
|
607
603
|
const expr = createPcalExpr(tokens);
|
|
608
604
|
prettifyStackTopExpr(expr);
|
|
@@ -632,7 +628,7 @@ const createCallStmts = (
|
|
|
632
628
|
return [
|
|
633
629
|
assign,
|
|
634
630
|
...entry.decls.map((decl) => makeAssign(decl.var, decl.val, call.line, call.col)),
|
|
635
|
-
|
|
631
|
+
createPCUpdate(entry.initialPC),
|
|
636
632
|
];
|
|
637
633
|
};
|
|
638
634
|
|
|
@@ -642,14 +638,12 @@ interface PcalExplodedStmts {
|
|
|
642
638
|
needsGoto: boolean;
|
|
643
639
|
}
|
|
644
640
|
|
|
645
|
-
// Statement lists nested in the original AST are exploded in place, as the Java does, so the
|
|
646
|
-
// original AST changes too.
|
|
647
641
|
const explodePcalAlgorithm = (
|
|
648
642
|
ast: PcalAlgorithm,
|
|
649
643
|
table: PcalSymbolTable,
|
|
650
|
-
|
|
644
|
+
shouldOmitPC: boolean,
|
|
651
645
|
): PcalAlgorithm => {
|
|
652
|
-
|
|
646
|
+
let currentProcedure: string | undefined;
|
|
653
647
|
|
|
654
648
|
const explodeCall = (call: PcalCall, next: string) => {
|
|
655
649
|
const procedureIndex = findProcedureIndex(table, call.to);
|
|
@@ -659,15 +653,15 @@ const explodePcalAlgorithm = (
|
|
|
659
653
|
const entry = table.procedures[procedureIndex];
|
|
660
654
|
const stackPush = createStackPushExpr(
|
|
661
655
|
call.to,
|
|
662
|
-
[
|
|
656
|
+
[createStringToken(next)],
|
|
663
657
|
[...entry.decls, ...entry.params],
|
|
664
|
-
[
|
|
658
|
+
[createBuiltInToken("\\o"), createAddedToken("stack")],
|
|
665
659
|
);
|
|
666
660
|
return createCallStmts(makeAssign("stack", stackPush, call.line, call.col), entry, call);
|
|
667
661
|
};
|
|
668
662
|
|
|
669
663
|
const explodeReturn = (stmt: PcalReturn) => {
|
|
670
|
-
stmt.from ??=
|
|
664
|
+
stmt.from ??= currentProcedure;
|
|
671
665
|
const from = stmt.from;
|
|
672
666
|
if (from === undefined) throw new PcalError("`return' statement not in procedure", stmt);
|
|
673
667
|
const procedureIndex = findProcedureIndex(table, from);
|
|
@@ -703,7 +697,6 @@ const explodePcalAlgorithm = (
|
|
|
703
697
|
}
|
|
704
698
|
const toEntry = table.procedures[toIndex];
|
|
705
699
|
const assign = createAssign([], stmt.line, stmt.col);
|
|
706
|
-
// A tail call to the procedure itself reuses its stack frame.
|
|
707
700
|
if (from !== stmt.to) {
|
|
708
701
|
fromEntry.decls.forEach((decl) =>
|
|
709
702
|
assign.ass.push(
|
|
@@ -720,7 +713,7 @@ const explodePcalAlgorithm = (
|
|
|
720
713
|
stmt.to,
|
|
721
714
|
getStackHeadTokens("pc"),
|
|
722
715
|
[...toEntry.decls, ...toEntry.params],
|
|
723
|
-
[
|
|
716
|
+
[createBuiltInToken("\\o"), ...getStackTailTokens()],
|
|
724
717
|
);
|
|
725
718
|
assign.ass.push(
|
|
726
719
|
createSingleAssign("stack", createNormalizedPcalExpr([]), stackPush, stmt.line, stmt.col),
|
|
@@ -730,7 +723,7 @@ const explodePcalAlgorithm = (
|
|
|
730
723
|
};
|
|
731
724
|
|
|
732
725
|
const copyAndExplodeLastStmt = (stmts: PcalStmt[], next: string): PcalExplodedStmts => {
|
|
733
|
-
if (stmts.length === 0) return { stmts: [], labeledStmts: [], needsGoto: !
|
|
726
|
+
if (stmts.length === 0) return { stmts: [], labeledStmts: [], needsGoto: !shouldOmitPC };
|
|
734
727
|
const result: PcalExplodedStmts = { stmts, labeledStmts: [], needsGoto: false };
|
|
735
728
|
const last = stmts[stmts.length - 1];
|
|
736
729
|
switch (last.kind) {
|
|
@@ -745,7 +738,7 @@ const explodePcalAlgorithm = (
|
|
|
745
738
|
}
|
|
746
739
|
case "Goto":
|
|
747
740
|
stmts.pop();
|
|
748
|
-
stmts.push(
|
|
741
|
+
stmts.push(createPCUpdate(last.to));
|
|
749
742
|
break;
|
|
750
743
|
case "Call":
|
|
751
744
|
stmts.pop();
|
|
@@ -782,11 +775,11 @@ const explodePcalAlgorithm = (
|
|
|
782
775
|
result.labeledStmts.push(...explodedThen.labeledStmts, ...explodedElse.labeledStmts);
|
|
783
776
|
last.Then = explodedThen.stmts;
|
|
784
777
|
last.Else = explodedElse.stmts;
|
|
785
|
-
if (!
|
|
778
|
+
if (!shouldOmitPC) {
|
|
786
779
|
result.needsGoto = explodedThen.needsGoto && explodedElse.needsGoto;
|
|
787
780
|
if (!result.needsGoto) {
|
|
788
|
-
if (explodedThen.needsGoto) last.Then.push(
|
|
789
|
-
if (explodedElse.needsGoto) last.Else.push(
|
|
781
|
+
if (explodedThen.needsGoto) last.Then.push(createPCUpdate(next));
|
|
782
|
+
if (explodedElse.needsGoto) last.Else.push(createPCUpdate(next));
|
|
790
783
|
}
|
|
791
784
|
}
|
|
792
785
|
break;
|
|
@@ -799,9 +792,9 @@ const explodePcalAlgorithm = (
|
|
|
799
792
|
return exploded;
|
|
800
793
|
});
|
|
801
794
|
result.needsGoto = explodedOrs.every((exploded) => exploded.needsGoto);
|
|
802
|
-
if (!
|
|
795
|
+
if (!shouldOmitPC && !result.needsGoto) {
|
|
803
796
|
explodedOrs.forEach((exploded, index) => {
|
|
804
|
-
if (exploded.needsGoto) last.ors[index].push(
|
|
797
|
+
if (exploded.needsGoto) last.ors[index].push(createPCUpdate(next));
|
|
805
798
|
});
|
|
806
799
|
}
|
|
807
800
|
break;
|
|
@@ -816,13 +809,13 @@ const explodePcalAlgorithm = (
|
|
|
816
809
|
default:
|
|
817
810
|
result.needsGoto = true;
|
|
818
811
|
}
|
|
819
|
-
if (
|
|
812
|
+
if (shouldOmitPC) result.needsGoto = false;
|
|
820
813
|
return result;
|
|
821
814
|
};
|
|
822
815
|
|
|
823
816
|
const copyAndExplodeLastStmtWithGoto = (stmts: PcalStmt[], next: string) => {
|
|
824
817
|
const exploded = copyAndExplodeLastStmt(stmts, next);
|
|
825
|
-
if (exploded.needsGoto) exploded.stmts.push(
|
|
818
|
+
if (exploded.needsGoto) exploded.stmts.push(createPCUpdate(next));
|
|
826
819
|
return exploded;
|
|
827
820
|
};
|
|
828
821
|
|
|
@@ -831,9 +824,8 @@ const explodePcalAlgorithm = (
|
|
|
831
824
|
if (first?.kind === "While") return explodeWhile(labeledStmt, first, next);
|
|
832
825
|
const exploded = copyAndExplodeLastStmtWithGoto([...labeledStmt.stmts], next);
|
|
833
826
|
const result: PcalLabeledStmt[] = [];
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
exploded.stmts.unshift(checkPC(labeledStmt.label));
|
|
827
|
+
if (!shouldOmitPC) {
|
|
828
|
+
exploded.stmts.unshift(createPCCheck(labeledStmt.label));
|
|
837
829
|
result.push({
|
|
838
830
|
...createPcalBase(),
|
|
839
831
|
kind: "LabeledStmt",
|
|
@@ -874,7 +866,7 @@ const explodePcalAlgorithm = (
|
|
|
874
866
|
col: labeledStmt.col,
|
|
875
867
|
line: labeledStmt.line,
|
|
876
868
|
label: labeledStmt.label,
|
|
877
|
-
stmts: [...(
|
|
869
|
+
stmts: [...(shouldOmitPC ? [] : [createPCCheck(labeledStmt.label)]), ...loopStmts],
|
|
878
870
|
};
|
|
879
871
|
return [
|
|
880
872
|
newLabeledStmt,
|
|
@@ -934,9 +926,9 @@ const explodePcalAlgorithm = (
|
|
|
934
926
|
explodeLabeledStmtSeq(body.map(toLabeledStmt), next);
|
|
935
927
|
|
|
936
928
|
const explodeProcedure = (procedure: PcalProcedure): PcalProcedure => {
|
|
937
|
-
|
|
929
|
+
currentProcedure = procedure.name;
|
|
938
930
|
const body = explodeBody(procedure.body, useThis(table, PCAL_SYMBOL.label, "Error", ""));
|
|
939
|
-
|
|
931
|
+
currentProcedure = undefined;
|
|
940
932
|
return {
|
|
941
933
|
...createPcalBase(),
|
|
942
934
|
kind: "Procedure",
|
|
@@ -997,9 +989,8 @@ const explodePcalAlgorithm = (
|
|
|
997
989
|
};
|
|
998
990
|
};
|
|
999
991
|
|
|
1000
|
-
|
|
1001
|
-
const
|
|
1002
|
-
const vars = omitPC ? [] : ["pc"];
|
|
992
|
+
const checkPcalTlaGen = (explodedAst: PcalAlgorithm, shouldOmitPC: boolean) => {
|
|
993
|
+
const vars = shouldOmitPC ? [] : ["pc"];
|
|
1003
994
|
vars.push(...explodedAst.decls.map((decl) => decl.var));
|
|
1004
995
|
if (explodedAst.prcds.length > 0) vars.push("stack");
|
|
1005
996
|
explodedAst.prcds.forEach((procedure) => {
|
|
@@ -1011,7 +1002,6 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1011
1002
|
}
|
|
1012
1003
|
if (vars.length === 0) throw new PcalError("The algorithm has no variables.");
|
|
1013
1004
|
|
|
1014
|
-
// Changed.Set counts only the first of duplicate variable names.
|
|
1015
1005
|
const setChanged = (changed: number[], variable: string) => {
|
|
1016
1006
|
const index = vars.indexOf(variable);
|
|
1017
1007
|
if (index === -1) return 0;
|
|
@@ -1024,22 +1014,19 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1024
1014
|
changed[index] = Math.max(changed[index], count);
|
|
1025
1015
|
});
|
|
1026
1016
|
|
|
1027
|
-
|
|
1028
|
-
const sortSass = (assigns: PcalSingleAssign[]) =>
|
|
1017
|
+
const sortSingleAssigns = (assigns: PcalSingleAssign[]) =>
|
|
1029
1018
|
[...assigns].sort((left, right) =>
|
|
1030
1019
|
left.lhs.var < right.lhs.var ? -1 : left.lhs.var > right.lhs.var ? 1 : 0,
|
|
1031
1020
|
);
|
|
1032
1021
|
|
|
1033
|
-
const
|
|
1022
|
+
const checkAssign = (assign: PcalAssign, changed: number[]) => {
|
|
1034
1023
|
const thisChanged = [...changed];
|
|
1035
|
-
assign.ass =
|
|
1024
|
+
assign.ass = sortSingleAssigns(assign.ass);
|
|
1036
1025
|
new Set(assign.ass.map((single) => single.lhs.var)).forEach((variable) => {
|
|
1037
1026
|
const group = assign.ass.filter((single) => single.lhs.var === variable);
|
|
1038
1027
|
if (!vars.includes(variable)) {
|
|
1039
1028
|
throw new PcalError(`Assignment to undeclared variable ${variable}`, group[0]);
|
|
1040
1029
|
}
|
|
1041
|
-
// GenAssign also notes whether the assignment after the group lacks a subscript, but its
|
|
1042
|
-
// loop ends before reading that, so only the group's own assignments count.
|
|
1043
1030
|
const hasAssignmentWithNoSubscript = group.some(
|
|
1044
1031
|
(single) => single.lhs.sub.tokens.length === 0,
|
|
1045
1032
|
);
|
|
@@ -1053,16 +1040,16 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1053
1040
|
mergeChanged(changed, thisChanged);
|
|
1054
1041
|
};
|
|
1055
1042
|
|
|
1056
|
-
const
|
|
1043
|
+
const checkStmt = (stmt: PcalStmt, changed: number[]): void => {
|
|
1057
1044
|
switch (stmt.kind) {
|
|
1058
1045
|
case "Assign":
|
|
1059
|
-
|
|
1046
|
+
checkAssign(stmt, changed);
|
|
1060
1047
|
return;
|
|
1061
1048
|
case "If": {
|
|
1062
1049
|
const thenChanged = [...changed];
|
|
1063
1050
|
const elseChanged = [...changed];
|
|
1064
|
-
stmt.Then.forEach((innerStmt) =>
|
|
1065
|
-
stmt.Else.forEach((innerStmt) =>
|
|
1051
|
+
stmt.Then.forEach((innerStmt) => checkStmt(innerStmt, thenChanged));
|
|
1052
|
+
stmt.Else.forEach((innerStmt) => checkStmt(innerStmt, elseChanged));
|
|
1066
1053
|
mergeChanged(changed, thenChanged);
|
|
1067
1054
|
mergeChanged(changed, elseChanged);
|
|
1068
1055
|
return;
|
|
@@ -1071,14 +1058,14 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1071
1058
|
const allChanged = [...changed];
|
|
1072
1059
|
stmt.ors.forEach((orStmts) => {
|
|
1073
1060
|
const orChanged = [...changed];
|
|
1074
|
-
orStmts.forEach((innerStmt) =>
|
|
1061
|
+
orStmts.forEach((innerStmt) => checkStmt(innerStmt, orChanged));
|
|
1075
1062
|
mergeChanged(allChanged, orChanged);
|
|
1076
1063
|
});
|
|
1077
1064
|
mergeChanged(changed, allChanged);
|
|
1078
1065
|
return;
|
|
1079
1066
|
}
|
|
1080
1067
|
case "With":
|
|
1081
|
-
stmt.Do.forEach((innerStmt) =>
|
|
1068
|
+
stmt.Do.forEach((innerStmt) => checkStmt(innerStmt, changed));
|
|
1082
1069
|
return;
|
|
1083
1070
|
case "When":
|
|
1084
1071
|
case "PrintS":
|
|
@@ -1090,30 +1077,28 @@ const checkPcalTlaGen = (explodedAst: PcalAlgorithm, omitPC: boolean) => {
|
|
|
1090
1077
|
}
|
|
1091
1078
|
};
|
|
1092
1079
|
|
|
1093
|
-
const
|
|
1080
|
+
const checkBody = (body: PcalStmt[]) =>
|
|
1094
1081
|
body.forEach((stmt) => {
|
|
1095
1082
|
const changed = vars.map(() => 0);
|
|
1096
|
-
toLabeledStmt(stmt).stmts.forEach((innerStmt) =>
|
|
1083
|
+
toLabeledStmt(stmt).stmts.forEach((innerStmt) => checkStmt(innerStmt, changed));
|
|
1097
1084
|
});
|
|
1098
1085
|
|
|
1099
|
-
explodedAst.prcds.forEach((procedure) =>
|
|
1086
|
+
explodedAst.prcds.forEach((procedure) => checkBody(procedure.body));
|
|
1100
1087
|
(explodedAst.kind === "Uniprocess"
|
|
1101
1088
|
? [explodedAst.body]
|
|
1102
1089
|
: explodedAst.procs.map((process) => process.body)
|
|
1103
|
-
).forEach(
|
|
1090
|
+
).forEach(checkBody);
|
|
1104
1091
|
};
|
|
1105
1092
|
|
|
1106
|
-
// What removeNameConflicts and translate do to the AST, and the errors they report, without the
|
|
1107
|
-
// TLA+ translation, which SANY discards.
|
|
1108
1093
|
export const translatePcalAlgorithm = (
|
|
1109
1094
|
ast: PcalAlgorithm,
|
|
1110
|
-
|
|
1095
|
+
shouldOmitPC: boolean,
|
|
1111
1096
|
hasDefaultInitialization: boolean,
|
|
1112
1097
|
log: (line: string) => void,
|
|
1113
1098
|
) => {
|
|
1114
1099
|
const table = createPcalSymbolTable(ast);
|
|
1115
1100
|
if (disambiguatePcalSymbols(table)) log("Warning: symbols were renamed.");
|
|
1116
1101
|
fixPcalIds(ast, table, log);
|
|
1117
|
-
checkPcalTlaGen(explodePcalAlgorithm(ast, table,
|
|
1102
|
+
checkPcalTlaGen(explodePcalAlgorithm(ast, table, shouldOmitPC), shouldOmitPC);
|
|
1118
1103
|
if (hasDefaultInitialization) checkForDefaultInitValue(table);
|
|
1119
1104
|
};
|