tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
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 +3 -0
- package/dist/index.d.ts +3 -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 +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- 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 +0 -2
- 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 +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- 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 +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- 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 +907 -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 +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- 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 -4
- 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 +25 -4
- 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 +234 -36
- 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 +25 -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 +1301 -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 +86 -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 +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -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 +0 -2
- 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/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- 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 +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- 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 +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- 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 +62 -152
- 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
|
|
|
@@ -56,6 +58,13 @@ export interface TemporalProperty extends ScopedExpression {
|
|
|
56
58
|
name: string;
|
|
57
59
|
}
|
|
58
60
|
|
|
61
|
+
interface Expansion {
|
|
62
|
+
name: string | undefined;
|
|
63
|
+
path: string[];
|
|
64
|
+
expanding: Set<Definition>;
|
|
65
|
+
isSubstituted: boolean;
|
|
66
|
+
}
|
|
67
|
+
|
|
59
68
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
60
69
|
|
|
61
70
|
export const createTautologyError = () =>
|
|
@@ -210,31 +219,26 @@ export const expandTemporal = (
|
|
|
210
219
|
scope: Scope | undefined,
|
|
211
220
|
environment: Environment,
|
|
212
221
|
isProperty: boolean,
|
|
213
|
-
|
|
214
|
-
isSubstituted = false,
|
|
215
|
-
name?: string,
|
|
216
|
-
path: string[] = [],
|
|
222
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
217
223
|
): ExpandedExpression[] => {
|
|
218
224
|
const expand = (
|
|
219
225
|
child: Expression,
|
|
220
226
|
childScope: Scope | undefined,
|
|
221
|
-
childName = name,
|
|
222
|
-
childExpanding = expanding,
|
|
227
|
+
childName = expansion.name,
|
|
228
|
+
childExpanding = expansion.expanding,
|
|
223
229
|
definition?: Definition,
|
|
224
230
|
): ExpandedExpression[] =>
|
|
225
|
-
expandTemporal(
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
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 ||
|
|
232
240
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
233
|
-
|
|
234
|
-
definition?.kind === "Operator" && definition.params.length === 0
|
|
235
|
-
? [...path, definition.name]
|
|
236
|
-
: path,
|
|
237
|
-
);
|
|
241
|
+
});
|
|
238
242
|
if (expression.kind === "And") {
|
|
239
243
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
240
244
|
}
|
|
@@ -248,7 +252,7 @@ export const expandTemporal = (
|
|
|
248
252
|
return expand(
|
|
249
253
|
binding.expression,
|
|
250
254
|
binding.scope,
|
|
251
|
-
definitionThunks.has(binding) ? expression.name : name,
|
|
255
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
252
256
|
);
|
|
253
257
|
}
|
|
254
258
|
const definition = environment.constants.has(expression.name)
|
|
@@ -261,14 +265,15 @@ export const expandTemporal = (
|
|
|
261
265
|
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
262
266
|
getStartupValue(definition, environment) === undefined)
|
|
263
267
|
) {
|
|
264
|
-
if (expanding.has(definition)) {
|
|
268
|
+
if (expansion.expanding.has(definition)) {
|
|
265
269
|
throw createStackOverflowError();
|
|
266
270
|
}
|
|
267
271
|
return expand(
|
|
268
272
|
definition.body,
|
|
269
273
|
undefined,
|
|
270
|
-
(!isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
271
|
-
|
|
274
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
275
|
+
definition.name,
|
|
276
|
+
new Set([...expansion.expanding, definition]),
|
|
272
277
|
definition,
|
|
273
278
|
);
|
|
274
279
|
}
|
|
@@ -290,13 +295,13 @@ export const expandTemporal = (
|
|
|
290
295
|
operator?.kind === "Closure" &&
|
|
291
296
|
operator.params.length === expression.args.length &&
|
|
292
297
|
!definition?.isRecursive &&
|
|
293
|
-
(!isSubstituted || isOwnArgumentFree);
|
|
298
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
294
299
|
if (isExpandable) {
|
|
295
300
|
return expand(
|
|
296
301
|
operator.body,
|
|
297
302
|
bindOperatorArguments(operator, expression.args, context),
|
|
298
|
-
isSubstituted && definition ? definition.name : expression.operator,
|
|
299
|
-
expanding,
|
|
303
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
304
|
+
expansion.expanding,
|
|
300
305
|
definition,
|
|
301
306
|
);
|
|
302
307
|
}
|
|
@@ -315,7 +320,7 @@ export const expandTemporal = (
|
|
|
315
320
|
if (expanded.length === 0) throw createTautologyError();
|
|
316
321
|
return expanded;
|
|
317
322
|
}
|
|
318
|
-
return [{ expression, scope, name, path }];
|
|
323
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
319
324
|
};
|
|
320
325
|
|
|
321
326
|
const bindLetDefinitions = (
|
|
@@ -483,42 +488,16 @@ export const toLiveExpression = (
|
|
|
483
488
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
484
489
|
};
|
|
485
490
|
|
|
486
|
-
|
|
487
|
-
expression.kind === "Label" ||
|
|
488
|
-
expression.kind === "Let" ||
|
|
489
|
-
expression.kind === "And" ||
|
|
490
|
-
expression.kind === "Or" ||
|
|
491
|
-
expression.kind === "Forall" ||
|
|
492
|
-
expression.kind === "Exists" ||
|
|
493
|
-
expression.kind === "If" ||
|
|
494
|
-
(expression.kind === "Apply" &&
|
|
495
|
-
((expression.operator === "~" && !isLocallyResolved(expression)) ||
|
|
496
|
-
expression.operator === "=>"));
|
|
497
|
-
|
|
491
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
498
492
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
499
493
|
const level = getLevel(expression, scope, environment);
|
|
500
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
501
|
-
return toAtom(expression, scope, level);
|
|
502
|
-
}
|
|
503
494
|
switch (expression.kind) {
|
|
504
495
|
case "Label":
|
|
505
496
|
return convert(expression.body, scope);
|
|
506
497
|
case "Let":
|
|
507
498
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
508
|
-
case "Identifier":
|
|
509
|
-
return convertCall(expression, scope);
|
|
510
499
|
case "Apply": {
|
|
511
500
|
const args = expression.args;
|
|
512
|
-
if (expression.operator === "~>") {
|
|
513
|
-
return createUnary(
|
|
514
|
-
"Always",
|
|
515
|
-
createPair(
|
|
516
|
-
"Or",
|
|
517
|
-
createUnary("Not", convert(args[0], scope)),
|
|
518
|
-
createUnary("Eventually", convert(args[1], scope)),
|
|
519
|
-
),
|
|
520
|
-
);
|
|
521
|
-
}
|
|
522
501
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
523
502
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
524
503
|
}
|
|
@@ -529,7 +508,7 @@ export const toLiveExpression = (
|
|
|
529
508
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
530
509
|
);
|
|
531
510
|
}
|
|
532
|
-
|
|
511
|
+
break;
|
|
533
512
|
}
|
|
534
513
|
case "And":
|
|
535
514
|
case "Or":
|
|
@@ -566,6 +545,22 @@ export const toLiveExpression = (
|
|
|
566
545
|
),
|
|
567
546
|
);
|
|
568
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);
|
|
569
564
|
case "Always":
|
|
570
565
|
case "Eventually":
|
|
571
566
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -606,15 +601,50 @@ export const toLiveExpression = (
|
|
|
606
601
|
return convert(root, rootScope);
|
|
607
602
|
};
|
|
608
603
|
|
|
609
|
-
|
|
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>(
|
|
610
640
|
expression: LiveExpression,
|
|
611
|
-
state:
|
|
612
|
-
next:
|
|
613
|
-
|
|
641
|
+
state: State,
|
|
642
|
+
next: State | undefined,
|
|
643
|
+
atoms: LiveAtoms<State>,
|
|
614
644
|
stateCache: Map<LiveExpression, boolean>,
|
|
615
645
|
): boolean => {
|
|
616
646
|
const recurse = (operand: LiveExpression) =>
|
|
617
|
-
evaluateLive(operand, state, next,
|
|
647
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
618
648
|
switch (expression.kind) {
|
|
619
649
|
case "Boolean":
|
|
620
650
|
return expression.value;
|
|
@@ -622,35 +652,13 @@ export const evaluateLive = (
|
|
|
622
652
|
case "Enabled": {
|
|
623
653
|
const cached = stateCache.get(expression);
|
|
624
654
|
if (cached !== undefined) return cached;
|
|
625
|
-
const
|
|
626
|
-
const value =
|
|
627
|
-
expression.kind === "State"
|
|
628
|
-
? evaluate(expression.expression, context)
|
|
629
|
-
: isEnabled(expression.step, context);
|
|
630
|
-
if (typeof value !== "boolean") {
|
|
631
|
-
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
632
|
-
}
|
|
655
|
+
const value = atoms.holdsState(expression, state);
|
|
633
656
|
stateCache.set(expression, value);
|
|
634
657
|
return value;
|
|
635
658
|
}
|
|
636
|
-
case "Action":
|
|
659
|
+
case "Action":
|
|
637
660
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
638
|
-
|
|
639
|
-
const subscript = expression.subscript;
|
|
640
|
-
if (
|
|
641
|
-
subscript &&
|
|
642
|
-
isEqualLikeTlc(
|
|
643
|
-
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
644
|
-
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
645
|
-
)
|
|
646
|
-
)
|
|
647
|
-
return false;
|
|
648
|
-
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
649
|
-
if (typeof value !== "boolean") {
|
|
650
|
-
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
651
|
-
}
|
|
652
|
-
return value;
|
|
653
|
-
}
|
|
661
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
654
662
|
case "Not":
|
|
655
663
|
return !recurse(expression.body);
|
|
656
664
|
case "And":
|
|
@@ -658,7 +666,7 @@ export const evaluateLive = (
|
|
|
658
666
|
case "Or":
|
|
659
667
|
return expression.operands.some(recurse);
|
|
660
668
|
case "Next":
|
|
661
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
669
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
662
670
|
case "Always":
|
|
663
671
|
case "Eventually":
|
|
664
672
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -695,7 +703,7 @@ export const evaluateOnLasso = (
|
|
|
695
703
|
expression,
|
|
696
704
|
path[position],
|
|
697
705
|
path[getNext(position)],
|
|
698
|
-
environment,
|
|
706
|
+
getInterpretedAtoms(environment),
|
|
699
707
|
new Map(),
|
|
700
708
|
);
|
|
701
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 = (
|
|
@@ -1,25 +1,28 @@
|
|
|
1
|
-
// A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon).
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
4
2
|
import { consSubstitution, normalizeApply, shift, shiftExpr, substituteExpr } from "./substitution";
|
|
5
3
|
import { isEqualExpr } from "./equality";
|
|
6
4
|
import {
|
|
5
|
+
AT_NOWHERE,
|
|
7
6
|
adjoin,
|
|
8
7
|
adjoinAll,
|
|
9
8
|
applyBuiltin,
|
|
10
9
|
at,
|
|
11
10
|
exprifySequent,
|
|
12
11
|
findNamed,
|
|
12
|
+
getScopeHyps,
|
|
13
13
|
getBoundFresh,
|
|
14
14
|
getErrorNote,
|
|
15
|
+
getErrorSetting,
|
|
15
16
|
getFresh,
|
|
16
17
|
getLocalDefn,
|
|
17
18
|
getLocusPrefix,
|
|
18
19
|
getScopeAt,
|
|
20
|
+
getTrue,
|
|
19
21
|
mapAccumulate,
|
|
20
22
|
mapBoundDomains,
|
|
21
23
|
mapScoped,
|
|
22
24
|
mapSelectorArgs,
|
|
25
|
+
warnError,
|
|
23
26
|
type Bound,
|
|
24
27
|
type Defn,
|
|
25
28
|
type ExceptPoint,
|
|
@@ -33,12 +36,12 @@ import {
|
|
|
33
36
|
type Sequent,
|
|
34
37
|
type WhereDefined,
|
|
35
38
|
} from "./expression";
|
|
39
|
+
import { renderDoc } from "./format";
|
|
40
|
+
import { printExpression } from "./printer";
|
|
36
41
|
import { resolveSubexpression } from "./subexpression";
|
|
37
42
|
import { getTime } from "./temporal";
|
|
38
43
|
import {
|
|
39
44
|
getStepName,
|
|
40
|
-
getUnique,
|
|
41
|
-
type Counter,
|
|
42
45
|
type Proof,
|
|
43
46
|
type Step,
|
|
44
47
|
type StepNumber,
|
|
@@ -48,7 +51,7 @@ import {
|
|
|
48
51
|
|
|
49
52
|
const DUMMY_FACT: Hyp = {
|
|
50
53
|
kind: "Fact",
|
|
51
|
-
expression:
|
|
54
|
+
expression: AT_NOWHERE,
|
|
52
55
|
visibility: "Visible",
|
|
53
56
|
time: "Always",
|
|
54
57
|
};
|
|
@@ -73,7 +76,7 @@ interface AnonContext {
|
|
|
73
76
|
}
|
|
74
77
|
|
|
75
78
|
export const createAnonymizer = (
|
|
76
|
-
|
|
79
|
+
getStepLabel: () => string,
|
|
77
80
|
expandInstance: (
|
|
78
81
|
scope: Scope | undefined,
|
|
79
82
|
definition: Extract<Defn, { kind: "Instance" }>,
|
|
@@ -137,7 +140,7 @@ export const createAnonymizer = (
|
|
|
137
140
|
const found = findNamed(context.scope, name);
|
|
138
141
|
if (!found) {
|
|
139
142
|
const message = `Operator "${name}" not found`;
|
|
140
|
-
onWarning
|
|
143
|
+
warnError(onWarning, from.location, message);
|
|
141
144
|
throw new TlaProofError(message, { failure: "Expr.Anon: 4" });
|
|
142
145
|
}
|
|
143
146
|
const index = found.depth + 1;
|
|
@@ -148,15 +151,20 @@ export const createAnonymizer = (
|
|
|
148
151
|
if (definition.kind === "Operator") {
|
|
149
152
|
return createStandardForm(index, hyp.whereDefined, definition.body, args, from);
|
|
150
153
|
}
|
|
151
|
-
if (definition.kind === "Recursive")
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
});
|
|
154
|
+
if (definition.kind === "Recursive") {
|
|
155
|
+
const message = "Recursive operators not supported by TLAPS";
|
|
156
|
+
onWarning(getErrorSetting(hyp.location, message));
|
|
157
|
+
throw new TlaProofError(message, { failure: "Expr.Anon: Recursive" });
|
|
158
|
+
}
|
|
155
159
|
return createAnonApply(index, args, from);
|
|
156
160
|
}
|
|
157
161
|
case "Fresh":
|
|
158
162
|
return createAnonApply(index, args, from);
|
|
159
163
|
case "Flex":
|
|
164
|
+
if (args.length > 0)
|
|
165
|
+
throw new TlapmBugError(
|
|
166
|
+
'File "src/expr/e_anon.ml", line 224, characters 24-30: Assertion failed',
|
|
167
|
+
);
|
|
160
168
|
return at({ kind: "Ix", index }, from);
|
|
161
169
|
case "Fact":
|
|
162
170
|
throw new TlapmBugError(
|
|
@@ -189,6 +197,7 @@ export const createAnonymizer = (
|
|
|
189
197
|
}
|
|
190
198
|
const message = `Operator "${prefix}" not found`;
|
|
191
199
|
if (selector) onWarning(getErrorNote(from.location, message));
|
|
200
|
+
onWarning(getErrorSetting(from.location, message));
|
|
192
201
|
throw new TlaProofError(message, {
|
|
193
202
|
failure: `Expr.Anon: ${selector ? ANON_SELECTOR_FAILURES[selector.kind] : "1EMPTY"}`,
|
|
194
203
|
});
|
|
@@ -198,7 +207,14 @@ export const createAnonymizer = (
|
|
|
198
207
|
hyp.kind !== "Defn" ||
|
|
199
208
|
(hyp.definition.kind !== "Operator" && hyp.definition.kind !== "Bpragma")
|
|
200
209
|
) {
|
|
201
|
-
|
|
210
|
+
onWarning(
|
|
211
|
+
getErrorNote(
|
|
212
|
+
from.location,
|
|
213
|
+
`invalid subexpression reference in: ${renderDoc(printExpression([], from))}`,
|
|
214
|
+
),
|
|
215
|
+
);
|
|
216
|
+
onWarning(getErrorSetting(from.location, "invalid subexpression reference"));
|
|
217
|
+
throw new TlaProofError("invalid subexpression reference", { failure: "Expr.Anon: 3" });
|
|
202
218
|
}
|
|
203
219
|
const index = found.depth + 1;
|
|
204
220
|
if (selectors.length === 0 && isInstance) {
|
|
@@ -207,7 +223,8 @@ export const createAnonymizer = (
|
|
|
207
223
|
: createStandardForm(index, hyp.whereDefined, hyp.definition.body, args, from);
|
|
208
224
|
}
|
|
209
225
|
const body = withLocus(shiftExpr(index, hyp.definition.body), from);
|
|
210
|
-
|
|
226
|
+
const hyps = getScopeHyps(context.scope);
|
|
227
|
+
return withLocus(resolveSubexpression(onWarning, hyps, body, args, selectors), from);
|
|
211
228
|
};
|
|
212
229
|
|
|
213
230
|
const anonymizeCore = (context: AnonContext, expression: Expr): Expr => {
|
|
@@ -235,7 +252,7 @@ export const createAnonymizer = (
|
|
|
235
252
|
text: `${getLocusPrefix(expression.location)}Warning: ${name} does not introduce any assumptions. It does not make sense to use it here.\n`,
|
|
236
253
|
channel: "toolbox",
|
|
237
254
|
});
|
|
238
|
-
return
|
|
255
|
+
return getTrue(expression);
|
|
239
256
|
}
|
|
240
257
|
const args = expression.args.map((arg) => anonymizeExpr(context, arg));
|
|
241
258
|
return resolveName(context, name, args, expression);
|
|
@@ -264,7 +281,11 @@ export const createAnonymizer = (
|
|
|
264
281
|
label: form.label,
|
|
265
282
|
indices: form.names.map((name) => {
|
|
266
283
|
const found = findNamed(context.scope, name);
|
|
267
|
-
if (!found)
|
|
284
|
+
if (!found) {
|
|
285
|
+
const message = `Identifier "${name}" in label parameters not found`;
|
|
286
|
+
warnError(onWarning, form.location, message);
|
|
287
|
+
throw new TlaProofError(message, { failure: "Expr.Anon" });
|
|
288
|
+
}
|
|
268
289
|
return { name, index: found.depth + 1 };
|
|
269
290
|
}),
|
|
270
291
|
};
|
|
@@ -448,7 +469,7 @@ export const createAnonymizer = (
|
|
|
448
469
|
? {
|
|
449
470
|
kind: "Named",
|
|
450
471
|
level: original.step.level,
|
|
451
|
-
label:
|
|
472
|
+
label: getStepLabel(),
|
|
452
473
|
isAnonymous: true,
|
|
453
474
|
}
|
|
454
475
|
: original.step;
|