tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.d618a2d79
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 +47 -44
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +44 -41
- 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 +474 -718
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +244 -238
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +49 -702
- 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 +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +31 -106
- package/src/exit-codes.ts +2 -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 +616 -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 +10 -30
- package/src/parallel.ts +50 -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 +9 -5
- 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 +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +15 -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 +206 -44
- 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 +22 -47
- 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 +54 -26
- 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/liveness.ts
CHANGED
|
@@ -37,8 +37,10 @@ import {
|
|
|
37
37
|
createPair,
|
|
38
38
|
createUnary,
|
|
39
39
|
getLiveLevel,
|
|
40
|
+
type LiveAction,
|
|
40
41
|
type LiveEnabled,
|
|
41
42
|
type LiveExpression,
|
|
43
|
+
type LiveState,
|
|
42
44
|
} from "./tableau";
|
|
43
45
|
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
46
|
|
|
@@ -47,7 +49,6 @@ export interface ScopedExpression {
|
|
|
47
49
|
scope: Scope | undefined;
|
|
48
50
|
}
|
|
49
51
|
|
|
50
|
-
// The name TLC gives a part of a property: a conjunct's location or the enclosing definition.
|
|
51
52
|
interface ExpandedExpression extends ScopedExpression {
|
|
52
53
|
name: string | undefined;
|
|
53
54
|
path: string[];
|
|
@@ -57,6 +58,13 @@ export interface TemporalProperty extends ScopedExpression {
|
|
|
57
58
|
name: string;
|
|
58
59
|
}
|
|
59
60
|
|
|
61
|
+
interface Expansion {
|
|
62
|
+
name: string | undefined;
|
|
63
|
+
path: string[];
|
|
64
|
+
expanding: Set<Definition>;
|
|
65
|
+
isSubstituted: boolean;
|
|
66
|
+
}
|
|
67
|
+
|
|
60
68
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
61
69
|
|
|
62
70
|
export const createTautologyError = () =>
|
|
@@ -81,7 +89,6 @@ const getConstantContext = (environment: Environment, scope: Scope | undefined):
|
|
|
81
89
|
next: undefined,
|
|
82
90
|
});
|
|
83
91
|
|
|
84
|
-
// TLC adds the message of the error that stopped it, when it has one.
|
|
85
92
|
const createCannotHandleError = (expression: Expression, inner?: string) =>
|
|
86
93
|
new TlaEvaluationError(
|
|
87
94
|
`TLC cannot handle the temporal formula ${describeRange(expression)}${inner === undefined ? "" : `:\n${inner}`}`,
|
|
@@ -95,7 +102,6 @@ export const getLevel = (
|
|
|
95
102
|
visiting = new Set<object>(),
|
|
96
103
|
): number => {
|
|
97
104
|
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
98
|
-
// A recursive call adds nothing, as SANY's level never decreases while it iterates.
|
|
99
105
|
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
100
106
|
visiting.add(binding);
|
|
101
107
|
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
@@ -134,10 +140,10 @@ export const getLevel = (
|
|
|
134
140
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
135
141
|
};
|
|
136
142
|
const getChildrenLevel = (node: Expression) => {
|
|
137
|
-
|
|
143
|
+
let level = CONSTANT_LEVEL;
|
|
138
144
|
mapChildren(node, (child, bound) => {
|
|
139
|
-
level
|
|
140
|
-
level
|
|
145
|
+
level = Math.max(
|
|
146
|
+
level,
|
|
141
147
|
getLevel(
|
|
142
148
|
child,
|
|
143
149
|
scope,
|
|
@@ -148,7 +154,7 @@ export const getLevel = (
|
|
|
148
154
|
);
|
|
149
155
|
return child;
|
|
150
156
|
});
|
|
151
|
-
return level
|
|
157
|
+
return level;
|
|
152
158
|
};
|
|
153
159
|
switch (expression.kind) {
|
|
154
160
|
case "Prime":
|
|
@@ -184,8 +190,6 @@ export const getLevel = (
|
|
|
184
190
|
) {
|
|
185
191
|
return level;
|
|
186
192
|
}
|
|
187
|
-
// SANY counts an argument only where the definition's level depends on its parameter, so
|
|
188
|
-
// ENABLED of an operator argument stays a state predicate.
|
|
189
193
|
return getBodyLevel(
|
|
190
194
|
operator,
|
|
191
195
|
operator.body,
|
|
@@ -197,7 +201,6 @@ export const getLevel = (
|
|
|
197
201
|
}
|
|
198
202
|
};
|
|
199
203
|
|
|
200
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
201
204
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
202
205
|
try {
|
|
203
206
|
return getBoundElements(bounds, context);
|
|
@@ -215,34 +218,27 @@ export const expandTemporal = (
|
|
|
215
218
|
expression: Expression,
|
|
216
219
|
scope: Scope | undefined,
|
|
217
220
|
environment: Environment,
|
|
218
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
219
221
|
isProperty: boolean,
|
|
220
|
-
|
|
221
|
-
// Whether the expansion entered an instance's definition, after which TLC expands no call.
|
|
222
|
-
isSubstituted = false,
|
|
223
|
-
name?: string,
|
|
224
|
-
path: string[] = [],
|
|
222
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
225
223
|
): ExpandedExpression[] => {
|
|
226
224
|
const expand = (
|
|
227
225
|
child: Expression,
|
|
228
226
|
childScope: Scope | undefined,
|
|
229
|
-
childName = name,
|
|
230
|
-
childExpanding = expanding,
|
|
227
|
+
childName = expansion.name,
|
|
228
|
+
childExpanding = expansion.expanding,
|
|
231
229
|
definition?: Definition,
|
|
232
230
|
): ExpandedExpression[] =>
|
|
233
|
-
expandTemporal(
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
231
|
+
expandTemporal(child, childScope, environment, isProperty, {
|
|
232
|
+
name: childName,
|
|
233
|
+
path:
|
|
234
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
235
|
+
? [...expansion.path, definition.name]
|
|
236
|
+
: expansion.path,
|
|
237
|
+
expanding: childExpanding,
|
|
238
|
+
isSubstituted:
|
|
239
|
+
expansion.isSubstituted ||
|
|
240
240
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
241
|
-
|
|
242
|
-
definition?.kind === "Operator" && definition.params.length === 0
|
|
243
|
-
? [...path, definition.name]
|
|
244
|
-
: path,
|
|
245
|
-
);
|
|
241
|
+
});
|
|
246
242
|
if (expression.kind === "And") {
|
|
247
243
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
248
244
|
}
|
|
@@ -256,13 +252,12 @@ export const expandTemporal = (
|
|
|
256
252
|
return expand(
|
|
257
253
|
binding.expression,
|
|
258
254
|
binding.scope,
|
|
259
|
-
definitionThunks.has(binding) ? expression.name : name,
|
|
255
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
260
256
|
);
|
|
261
257
|
}
|
|
262
258
|
const definition = environment.constants.has(expression.name)
|
|
263
259
|
? undefined
|
|
264
260
|
: getDefinition(expression.name, environment);
|
|
265
|
-
// TLC expands a definition it didn't compute at startup, even a constant one.
|
|
266
261
|
if (
|
|
267
262
|
!binding &&
|
|
268
263
|
definition?.kind === "Operator" &&
|
|
@@ -270,21 +265,20 @@ export const expandTemporal = (
|
|
|
270
265
|
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
271
266
|
getStartupValue(definition, environment) === undefined)
|
|
272
267
|
) {
|
|
273
|
-
if (expanding.has(definition)) {
|
|
268
|
+
if (expansion.expanding.has(definition)) {
|
|
274
269
|
throw createStackOverflowError();
|
|
275
270
|
}
|
|
276
|
-
// TLC names a part after the operator as the spec writes it, as I!Op outside the instance.
|
|
277
271
|
return expand(
|
|
278
272
|
definition.body,
|
|
279
273
|
undefined,
|
|
280
|
-
(!isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
281
|
-
|
|
274
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
275
|
+
definition.name,
|
|
276
|
+
new Set([...expansion.expanding, definition]),
|
|
282
277
|
definition,
|
|
283
278
|
);
|
|
284
279
|
}
|
|
285
280
|
}
|
|
286
281
|
const context = getConstantContext(environment, scope);
|
|
287
|
-
// TLC 1.7.4 expands no call, a property every one, and a specification only temporal ones.
|
|
288
282
|
if (
|
|
289
283
|
expression.kind === "Apply" &&
|
|
290
284
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -294,8 +288,6 @@ export const expandTemporal = (
|
|
|
294
288
|
const definition = isLocallyResolved(expression)
|
|
295
289
|
? undefined
|
|
296
290
|
: getDefinition(expression.operator, environment);
|
|
297
|
-
// An instance's definition that takes only the instance's parameters takes no arguments in
|
|
298
|
-
// TLC, which expands it even within the instance.
|
|
299
291
|
const isOwnArgumentFree =
|
|
300
292
|
operator?.kind === "Closure" &&
|
|
301
293
|
operator.params.every((param) => environment.instanceParams.has(param));
|
|
@@ -303,13 +295,13 @@ export const expandTemporal = (
|
|
|
303
295
|
operator?.kind === "Closure" &&
|
|
304
296
|
operator.params.length === expression.args.length &&
|
|
305
297
|
!definition?.isRecursive &&
|
|
306
|
-
(!isSubstituted || isOwnArgumentFree);
|
|
298
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
307
299
|
if (isExpandable) {
|
|
308
300
|
return expand(
|
|
309
301
|
operator.body,
|
|
310
302
|
bindOperatorArguments(operator, expression.args, context),
|
|
311
|
-
isSubstituted && definition ? definition.name : expression.operator,
|
|
312
|
-
expanding,
|
|
303
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
304
|
+
expansion.expanding,
|
|
313
305
|
definition,
|
|
314
306
|
);
|
|
315
307
|
}
|
|
@@ -328,7 +320,7 @@ export const expandTemporal = (
|
|
|
328
320
|
if (expanded.length === 0) throw createTautologyError();
|
|
329
321
|
return expanded;
|
|
330
322
|
}
|
|
331
|
-
return [{ expression, scope, name, path }];
|
|
323
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
332
324
|
};
|
|
333
325
|
|
|
334
326
|
const bindLetDefinitions = (
|
|
@@ -354,7 +346,6 @@ export const toLiveExpression = (
|
|
|
354
346
|
scope: Scope | undefined,
|
|
355
347
|
level: number,
|
|
356
348
|
): LiveExpression => {
|
|
357
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
358
349
|
const atomLevel =
|
|
359
350
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
360
351
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -367,7 +358,6 @@ export const toLiveExpression = (
|
|
|
367
358
|
return createBoolean(value);
|
|
368
359
|
}
|
|
369
360
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
370
|
-
// TLC checks <<A>>_v's subscript before it evaluates A.
|
|
371
361
|
if (expression.kind === "AngleAction") {
|
|
372
362
|
return {
|
|
373
363
|
kind: "Action",
|
|
@@ -379,7 +369,7 @@ export const toLiveExpression = (
|
|
|
379
369
|
return { kind: "Action", expression, subscript: undefined, scope };
|
|
380
370
|
};
|
|
381
371
|
|
|
382
|
-
|
|
372
|
+
let expansionDepth = 0;
|
|
383
373
|
|
|
384
374
|
const expand = (
|
|
385
375
|
body: Expression,
|
|
@@ -387,15 +377,14 @@ export const toLiveExpression = (
|
|
|
387
377
|
expression: Expression,
|
|
388
378
|
scope: Scope | undefined,
|
|
389
379
|
) => {
|
|
390
|
-
if (
|
|
380
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
391
381
|
throw createStackOverflowError();
|
|
392
382
|
}
|
|
393
|
-
|
|
383
|
+
expansionDepth++;
|
|
394
384
|
const result = convert(body, bodyScope);
|
|
395
|
-
|
|
385
|
+
expansionDepth--;
|
|
396
386
|
const level = getLiveLevel(result);
|
|
397
|
-
//
|
|
398
|
-
// takes the call for an action, which classifyExpr rejects. tla-ts keeps the constant.
|
|
387
|
+
// Deviation from TLC: Liveness#astToLive takes a temporal call with a constant body for an action, which classifyExpr rejects.
|
|
399
388
|
const isConstantTemporal =
|
|
400
389
|
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
401
390
|
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
@@ -425,8 +414,6 @@ export const toLiveExpression = (
|
|
|
425
414
|
? resolveOperator(name, context)
|
|
426
415
|
: resolveGlobalOperator(name, environment);
|
|
427
416
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
428
|
-
// An operator constant can be substituted by a conjunction or disjunction, whose arguments
|
|
429
|
-
// TLC translates as it translates its operands.
|
|
430
417
|
const junction =
|
|
431
418
|
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
432
419
|
if (junction) {
|
|
@@ -456,8 +443,6 @@ export const toLiveExpression = (
|
|
|
456
443
|
);
|
|
457
444
|
};
|
|
458
445
|
|
|
459
|
-
// TLC can't handle a call whose expansion fails, except that after 1.7.4 it fails as a
|
|
460
|
-
// recursive operator's expansion does.
|
|
461
446
|
const expandCall = (
|
|
462
447
|
expression: Expression,
|
|
463
448
|
expandBody: () => LiveExpression,
|
|
@@ -479,7 +464,6 @@ export const toLiveExpression = (
|
|
|
479
464
|
const level = getLevel(expression, scope, environment);
|
|
480
465
|
const operands: LiveExpression[] = [];
|
|
481
466
|
const isForall = expression.kind === "Forall";
|
|
482
|
-
// TLC can't handle a quantifier whose body fails, and under \A adds another failure's message.
|
|
483
467
|
try {
|
|
484
468
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
485
469
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -499,49 +483,21 @@ export const toLiveExpression = (
|
|
|
499
483
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
500
484
|
};
|
|
501
485
|
|
|
502
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
503
486
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
504
487
|
const level = getLiveLevel(parts);
|
|
505
488
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
506
489
|
};
|
|
507
490
|
|
|
508
|
-
//
|
|
509
|
-
const isTranslatedWhole = (expression: Expression) =>
|
|
510
|
-
expression.kind === "Label" ||
|
|
511
|
-
expression.kind === "Let" ||
|
|
512
|
-
expression.kind === "And" ||
|
|
513
|
-
expression.kind === "Or" ||
|
|
514
|
-
expression.kind === "Forall" ||
|
|
515
|
-
expression.kind === "Exists" ||
|
|
516
|
-
expression.kind === "If" ||
|
|
517
|
-
(expression.kind === "Apply" &&
|
|
518
|
-
((expression.operator === "~" && !isLocallyResolved(expression)) ||
|
|
519
|
-
expression.operator === "=>"));
|
|
520
|
-
|
|
491
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
521
492
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
522
493
|
const level = getLevel(expression, scope, environment);
|
|
523
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
524
|
-
return toAtom(expression, scope, level);
|
|
525
|
-
}
|
|
526
494
|
switch (expression.kind) {
|
|
527
495
|
case "Label":
|
|
528
496
|
return convert(expression.body, scope);
|
|
529
497
|
case "Let":
|
|
530
498
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
531
|
-
case "Identifier":
|
|
532
|
-
return convertCall(expression, scope);
|
|
533
499
|
case "Apply": {
|
|
534
500
|
const args = expression.args;
|
|
535
|
-
if (expression.operator === "~>") {
|
|
536
|
-
return createUnary(
|
|
537
|
-
"Always",
|
|
538
|
-
createPair(
|
|
539
|
-
"Or",
|
|
540
|
-
createUnary("Not", convert(args[0], scope)),
|
|
541
|
-
createUnary("Eventually", convert(args[1], scope)),
|
|
542
|
-
),
|
|
543
|
-
);
|
|
544
|
-
}
|
|
545
501
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
546
502
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
547
503
|
}
|
|
@@ -552,7 +508,7 @@ export const toLiveExpression = (
|
|
|
552
508
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
553
509
|
);
|
|
554
510
|
}
|
|
555
|
-
|
|
511
|
+
break;
|
|
556
512
|
}
|
|
557
513
|
case "And":
|
|
558
514
|
case "Or":
|
|
@@ -568,7 +524,6 @@ export const toLiveExpression = (
|
|
|
568
524
|
case "Exists":
|
|
569
525
|
return convertQuantifier(expression, scope);
|
|
570
526
|
case "If": {
|
|
571
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
572
527
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
573
528
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
574
529
|
if (typeof condition === "boolean") {
|
|
@@ -590,6 +545,22 @@ export const toLiveExpression = (
|
|
|
590
545
|
),
|
|
591
546
|
);
|
|
592
547
|
}
|
|
548
|
+
}
|
|
549
|
+
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
550
|
+
switch (expression.kind) {
|
|
551
|
+
case "Identifier":
|
|
552
|
+
return convertCall(expression, scope);
|
|
553
|
+
case "Apply":
|
|
554
|
+
return expression.operator === "~>"
|
|
555
|
+
? createUnary(
|
|
556
|
+
"Always",
|
|
557
|
+
createPair(
|
|
558
|
+
"Or",
|
|
559
|
+
createUnary("Not", convert(expression.args[0], scope)),
|
|
560
|
+
createUnary("Eventually", convert(expression.args[1], scope)),
|
|
561
|
+
),
|
|
562
|
+
)
|
|
563
|
+
: convertCall(expression, scope);
|
|
593
564
|
case "Always":
|
|
594
565
|
case "Eventually":
|
|
595
566
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -630,15 +601,50 @@ export const toLiveExpression = (
|
|
|
630
601
|
return convert(root, rootScope);
|
|
631
602
|
};
|
|
632
603
|
|
|
633
|
-
|
|
604
|
+
// Evaluates the atoms of a formula, which the interpreter and the typed tier evaluate differently.
|
|
605
|
+
export interface LiveAtoms<State> {
|
|
606
|
+
holdsState: (atom: LiveState | LiveEnabled, state: State) => boolean;
|
|
607
|
+
holdsAction: (atom: LiveAction, state: State, next: State) => boolean;
|
|
608
|
+
}
|
|
609
|
+
|
|
610
|
+
export const getInterpretedAtoms = (environment: Environment): LiveAtoms<Value[]> => ({
|
|
611
|
+
holdsState: (atom, state) => {
|
|
612
|
+
const context = { environment, scope: atom.scope, state, next: undefined };
|
|
613
|
+
const value =
|
|
614
|
+
atom.kind === "State" ? evaluate(atom.expression, context) : isEnabled(atom.step, context);
|
|
615
|
+
if (typeof value !== "boolean") {
|
|
616
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
617
|
+
}
|
|
618
|
+
return value;
|
|
619
|
+
},
|
|
620
|
+
holdsAction: (atom, state, next) => {
|
|
621
|
+
const scope = atom.scope;
|
|
622
|
+
const subscript = atom.subscript;
|
|
623
|
+
if (
|
|
624
|
+
subscript &&
|
|
625
|
+
isEqualLikeTlc(
|
|
626
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
627
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
628
|
+
)
|
|
629
|
+
)
|
|
630
|
+
return false;
|
|
631
|
+
const value = evaluate(atom.expression, { environment, scope, state, next });
|
|
632
|
+
if (typeof value !== "boolean") {
|
|
633
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
634
|
+
}
|
|
635
|
+
return value;
|
|
636
|
+
},
|
|
637
|
+
});
|
|
638
|
+
|
|
639
|
+
export const evaluateLive = <State>(
|
|
634
640
|
expression: LiveExpression,
|
|
635
|
-
state:
|
|
636
|
-
next:
|
|
637
|
-
|
|
641
|
+
state: State,
|
|
642
|
+
next: State | undefined,
|
|
643
|
+
atoms: LiveAtoms<State>,
|
|
638
644
|
stateCache: Map<LiveExpression, boolean>,
|
|
639
645
|
): boolean => {
|
|
640
646
|
const recurse = (operand: LiveExpression) =>
|
|
641
|
-
evaluateLive(operand, state, next,
|
|
647
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
642
648
|
switch (expression.kind) {
|
|
643
649
|
case "Boolean":
|
|
644
650
|
return expression.value;
|
|
@@ -646,35 +652,13 @@ export const evaluateLive = (
|
|
|
646
652
|
case "Enabled": {
|
|
647
653
|
const cached = stateCache.get(expression);
|
|
648
654
|
if (cached !== undefined) return cached;
|
|
649
|
-
const
|
|
650
|
-
const value =
|
|
651
|
-
expression.kind === "State"
|
|
652
|
-
? evaluate(expression.expression, context)
|
|
653
|
-
: isEnabled(expression.step, context);
|
|
654
|
-
if (typeof value !== "boolean") {
|
|
655
|
-
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
656
|
-
}
|
|
655
|
+
const value = atoms.holdsState(expression, state);
|
|
657
656
|
stateCache.set(expression, value);
|
|
658
657
|
return value;
|
|
659
658
|
}
|
|
660
|
-
case "Action":
|
|
659
|
+
case "Action":
|
|
661
660
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
662
|
-
|
|
663
|
-
const subscript = expression.subscript;
|
|
664
|
-
if (
|
|
665
|
-
subscript &&
|
|
666
|
-
isEqualLikeTlc(
|
|
667
|
-
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
668
|
-
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
669
|
-
)
|
|
670
|
-
)
|
|
671
|
-
return false;
|
|
672
|
-
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
673
|
-
if (typeof value !== "boolean") {
|
|
674
|
-
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
675
|
-
}
|
|
676
|
-
return value;
|
|
677
|
-
}
|
|
661
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
678
662
|
case "Not":
|
|
679
663
|
return !recurse(expression.body);
|
|
680
664
|
case "And":
|
|
@@ -682,7 +666,7 @@ export const evaluateLive = (
|
|
|
682
666
|
case "Or":
|
|
683
667
|
return expression.operands.some(recurse);
|
|
684
668
|
case "Next":
|
|
685
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
669
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
686
670
|
case "Always":
|
|
687
671
|
case "Eventually":
|
|
688
672
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -698,7 +682,7 @@ export const evaluateOnLasso = (
|
|
|
698
682
|
): boolean => {
|
|
699
683
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
700
684
|
const getFuture = (index: number) =>
|
|
701
|
-
path.map((
|
|
685
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
702
686
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
703
687
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
704
688
|
switch (expression.kind) {
|
|
@@ -719,7 +703,7 @@ export const evaluateOnLasso = (
|
|
|
719
703
|
expression,
|
|
720
704
|
path[position],
|
|
721
705
|
path[getNext(position)],
|
|
722
|
-
environment,
|
|
706
|
+
getInterpretedAtoms(environment),
|
|
723
707
|
new Map(),
|
|
724
708
|
);
|
|
725
709
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
1
|
+
import { TlapmBugError, TlaProverError } from "../errors";
|
|
4
2
|
import type { Anonymizer } from "./anonymize";
|
|
5
3
|
import { bumpBy, normalizeApply, shift, substituteExpr, type Substitution } from "./substitution";
|
|
6
4
|
import {
|
|
@@ -14,6 +12,7 @@ import {
|
|
|
14
12
|
getParamFresh,
|
|
15
13
|
getScopeAt,
|
|
16
14
|
isBuiltinApply,
|
|
15
|
+
mapChildren,
|
|
17
16
|
mapScoped,
|
|
18
17
|
stripProps,
|
|
19
18
|
type Expr,
|
|
@@ -22,7 +21,7 @@ import {
|
|
|
22
21
|
type Scope,
|
|
23
22
|
} from "./expression";
|
|
24
23
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
25
|
-
import { rewriteUnchanged } from "./temporal";
|
|
24
|
+
import { expandFairness, rewriteUnchanged } from "./temporal";
|
|
26
25
|
|
|
27
26
|
interface ActionOptions {
|
|
28
27
|
isEnabled: boolean;
|
|
@@ -46,14 +45,6 @@ const NESTED_CDOT =
|
|
|
46
45
|
|
|
47
46
|
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
48
47
|
|
|
49
|
-
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
50
|
-
mapScoped(
|
|
51
|
-
undefined,
|
|
52
|
-
expression,
|
|
53
|
-
(_state, child) => map(child),
|
|
54
|
-
() => undefined,
|
|
55
|
-
);
|
|
56
|
-
|
|
57
48
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
58
49
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
59
50
|
if (!hyp) throw new TlapmBugError();
|
|
@@ -170,7 +161,7 @@ const expandDefinitions = (
|
|
|
170
161
|
if (hyp.kind === "Fresh") {
|
|
171
162
|
const message = `The expression that results from applying the declared operator \`${hyp.name}\` has expression level ${expressionLevel} within the scope of \`ENABLED\` or \`\\cdot\` where soundness requires expanding expressions of level >= ${level}. A declared operator cannot be expanded.\n${getDeclaration(hyp.name)}\n and has level: ${LEVEL_NUMBERS[hyp.level]}\n and arity: ${hyp.shape}`;
|
|
172
163
|
onWarning(getErrorNote(expression.location, message));
|
|
173
|
-
throw new
|
|
164
|
+
throw new TlaProverError(message);
|
|
174
165
|
}
|
|
175
166
|
const definition = hyp.definition;
|
|
176
167
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
@@ -392,7 +383,7 @@ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
|
392
383
|
],
|
|
393
384
|
};
|
|
394
385
|
}
|
|
395
|
-
return
|
|
386
|
+
return mapChildren(expression, (child) => renameParams(isKeepingNames, child), "visible");
|
|
396
387
|
};
|
|
397
388
|
|
|
398
389
|
const checkArity = (expression: Expr): Expr => {
|
|
@@ -403,7 +394,7 @@ const checkArity = (expression: Expr): Expr => {
|
|
|
403
394
|
) {
|
|
404
395
|
throw new TlapmBugError();
|
|
405
396
|
}
|
|
406
|
-
return
|
|
397
|
+
return mapChildren(expression, checkArity, "visible");
|
|
407
398
|
};
|
|
408
399
|
|
|
409
400
|
const lambdifyOperators = (
|
|
@@ -427,7 +418,13 @@ export const lambdify = (
|
|
|
427
418
|
expression: Expr,
|
|
428
419
|
options = LAMBDIFY_ALL,
|
|
429
420
|
) => {
|
|
430
|
-
const expanded = expandDefinitions(
|
|
421
|
+
const expanded = expandDefinitions(
|
|
422
|
+
options,
|
|
423
|
+
onWarning,
|
|
424
|
+
scope,
|
|
425
|
+
options.isEnabled ? expandFairness(expression) : expression,
|
|
426
|
+
undefined,
|
|
427
|
+
);
|
|
431
428
|
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
432
429
|
};
|
|
433
430
|
|
|
@@ -516,7 +513,7 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
516
513
|
});
|
|
517
514
|
}
|
|
518
515
|
}
|
|
519
|
-
return
|
|
516
|
+
return mapChildren(expression, commuteExistsDisjunction, "visible");
|
|
520
517
|
};
|
|
521
518
|
|
|
522
519
|
export const expandActionOperators = (
|