tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- 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 +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- 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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- 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 +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +4 -11
- 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 +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- 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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- 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 +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- 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 +483 -116
- 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 +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- 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 +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -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 +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- 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 +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -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 +109 -36
- 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 +0 -2
- 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 +0 -1
- 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 +66 -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 +167 -85
- 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 +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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 +118 -88
- 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 +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -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 +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- 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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -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 +311 -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 +281 -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 +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- 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 +1096 -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 +1499 -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 +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- 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 +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -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 +44 -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 +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -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 +2012 -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 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.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 +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- 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 +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- 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
|
|
|
@@ -599,15 +601,50 @@ export const toLiveExpression = (
|
|
|
599
601
|
return convert(root, rootScope);
|
|
600
602
|
};
|
|
601
603
|
|
|
602
|
-
|
|
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
|
+
const evaluateLive = <State>(
|
|
603
640
|
expression: LiveExpression,
|
|
604
|
-
state:
|
|
605
|
-
next:
|
|
606
|
-
|
|
641
|
+
state: State,
|
|
642
|
+
next: State | undefined,
|
|
643
|
+
atoms: LiveAtoms<State>,
|
|
607
644
|
stateCache: Map<LiveExpression, boolean>,
|
|
608
645
|
): boolean => {
|
|
609
646
|
const recurse = (operand: LiveExpression) =>
|
|
610
|
-
evaluateLive(operand, state, next,
|
|
647
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
611
648
|
switch (expression.kind) {
|
|
612
649
|
case "Boolean":
|
|
613
650
|
return expression.value;
|
|
@@ -615,35 +652,13 @@ export const evaluateLive = (
|
|
|
615
652
|
case "Enabled": {
|
|
616
653
|
const cached = stateCache.get(expression);
|
|
617
654
|
if (cached !== undefined) return cached;
|
|
618
|
-
const
|
|
619
|
-
const value =
|
|
620
|
-
expression.kind === "State"
|
|
621
|
-
? evaluate(expression.expression, context)
|
|
622
|
-
: isEnabled(expression.step, context);
|
|
623
|
-
if (typeof value !== "boolean") {
|
|
624
|
-
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
625
|
-
}
|
|
655
|
+
const value = atoms.holdsState(expression, state);
|
|
626
656
|
stateCache.set(expression, value);
|
|
627
657
|
return value;
|
|
628
658
|
}
|
|
629
|
-
case "Action":
|
|
659
|
+
case "Action":
|
|
630
660
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
631
|
-
|
|
632
|
-
const subscript = expression.subscript;
|
|
633
|
-
if (
|
|
634
|
-
subscript &&
|
|
635
|
-
isEqualLikeTlc(
|
|
636
|
-
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
637
|
-
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
638
|
-
)
|
|
639
|
-
)
|
|
640
|
-
return false;
|
|
641
|
-
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
642
|
-
if (typeof value !== "boolean") {
|
|
643
|
-
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
644
|
-
}
|
|
645
|
-
return value;
|
|
646
|
-
}
|
|
661
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
647
662
|
case "Not":
|
|
648
663
|
return !recurse(expression.body);
|
|
649
664
|
case "And":
|
|
@@ -651,7 +666,7 @@ export const evaluateLive = (
|
|
|
651
666
|
case "Or":
|
|
652
667
|
return expression.operands.some(recurse);
|
|
653
668
|
case "Next":
|
|
654
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
669
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
655
670
|
case "Always":
|
|
656
671
|
case "Eventually":
|
|
657
672
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -688,7 +703,7 @@ export const evaluateOnLasso = (
|
|
|
688
703
|
expression,
|
|
689
704
|
path[position],
|
|
690
705
|
path[getNext(position)],
|
|
691
|
-
environment,
|
|
706
|
+
getInterpretedAtoms(environment),
|
|
692
707
|
new Map(),
|
|
693
708
|
);
|
|
694
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 {
|
|
@@ -23,7 +21,7 @@ import {
|
|
|
23
21
|
type Scope,
|
|
24
22
|
} from "./expression";
|
|
25
23
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
26
|
-
import { rewriteUnchanged } from "./temporal";
|
|
24
|
+
import { expandFairness, rewriteUnchanged } from "./temporal";
|
|
27
25
|
|
|
28
26
|
interface ActionOptions {
|
|
29
27
|
isEnabled: boolean;
|
|
@@ -163,7 +161,7 @@ const expandDefinitions = (
|
|
|
163
161
|
if (hyp.kind === "Fresh") {
|
|
164
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}`;
|
|
165
163
|
onWarning(getErrorNote(expression.location, message));
|
|
166
|
-
throw new
|
|
164
|
+
throw new TlaProverError(message);
|
|
167
165
|
}
|
|
168
166
|
const definition = hyp.definition;
|
|
169
167
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
@@ -420,7 +418,13 @@ export const lambdify = (
|
|
|
420
418
|
expression: Expr,
|
|
421
419
|
options = LAMBDIFY_ALL,
|
|
422
420
|
) => {
|
|
423
|
-
const expanded = expandDefinitions(
|
|
421
|
+
const expanded = expandDefinitions(
|
|
422
|
+
options,
|
|
423
|
+
onWarning,
|
|
424
|
+
scope,
|
|
425
|
+
options.isEnabled ? expandFairness(expression) : expression,
|
|
426
|
+
undefined,
|
|
427
|
+
);
|
|
424
428
|
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
425
429
|
};
|
|
426
430
|
|
|
@@ -1,5 +1,3 @@
|
|
|
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";
|
|
@@ -11,8 +9,10 @@ import {
|
|
|
11
9
|
at,
|
|
12
10
|
exprifySequent,
|
|
13
11
|
findNamed,
|
|
12
|
+
getScopeHyps,
|
|
14
13
|
getBoundFresh,
|
|
15
14
|
getErrorNote,
|
|
15
|
+
getErrorSetting,
|
|
16
16
|
getFresh,
|
|
17
17
|
getLocalDefn,
|
|
18
18
|
getLocusPrefix,
|
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
mapBoundDomains,
|
|
23
23
|
mapScoped,
|
|
24
24
|
mapSelectorArgs,
|
|
25
|
+
warnError,
|
|
25
26
|
type Bound,
|
|
26
27
|
type Defn,
|
|
27
28
|
type ExceptPoint,
|
|
@@ -35,12 +36,12 @@ import {
|
|
|
35
36
|
type Sequent,
|
|
36
37
|
type WhereDefined,
|
|
37
38
|
} from "./expression";
|
|
39
|
+
import { renderDoc } from "./format";
|
|
40
|
+
import { printExpression } from "./printer";
|
|
38
41
|
import { resolveSubexpression } from "./subexpression";
|
|
39
42
|
import { getTime } from "./temporal";
|
|
40
43
|
import {
|
|
41
44
|
getStepName,
|
|
42
|
-
getUnique,
|
|
43
|
-
type Counter,
|
|
44
45
|
type Proof,
|
|
45
46
|
type Step,
|
|
46
47
|
type StepNumber,
|
|
@@ -75,7 +76,7 @@ interface AnonContext {
|
|
|
75
76
|
}
|
|
76
77
|
|
|
77
78
|
export const createAnonymizer = (
|
|
78
|
-
|
|
79
|
+
getStepLabel: () => string,
|
|
79
80
|
expandInstance: (
|
|
80
81
|
scope: Scope | undefined,
|
|
81
82
|
definition: Extract<Defn, { kind: "Instance" }>,
|
|
@@ -139,7 +140,7 @@ export const createAnonymizer = (
|
|
|
139
140
|
const found = findNamed(context.scope, name);
|
|
140
141
|
if (!found) {
|
|
141
142
|
const message = `Operator "${name}" not found`;
|
|
142
|
-
onWarning
|
|
143
|
+
warnError(onWarning, from.location, message);
|
|
143
144
|
throw new TlaProofError(message, { failure: "Expr.Anon: 4" });
|
|
144
145
|
}
|
|
145
146
|
const index = found.depth + 1;
|
|
@@ -150,15 +151,20 @@ export const createAnonymizer = (
|
|
|
150
151
|
if (definition.kind === "Operator") {
|
|
151
152
|
return createStandardForm(index, hyp.whereDefined, definition.body, args, from);
|
|
152
153
|
}
|
|
153
|
-
if (definition.kind === "Recursive")
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
});
|
|
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
|
+
}
|
|
157
159
|
return createAnonApply(index, args, from);
|
|
158
160
|
}
|
|
159
161
|
case "Fresh":
|
|
160
162
|
return createAnonApply(index, args, from);
|
|
161
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
|
+
);
|
|
162
168
|
return at({ kind: "Ix", index }, from);
|
|
163
169
|
case "Fact":
|
|
164
170
|
throw new TlapmBugError(
|
|
@@ -191,6 +197,7 @@ export const createAnonymizer = (
|
|
|
191
197
|
}
|
|
192
198
|
const message = `Operator "${prefix}" not found`;
|
|
193
199
|
if (selector) onWarning(getErrorNote(from.location, message));
|
|
200
|
+
onWarning(getErrorSetting(from.location, message));
|
|
194
201
|
throw new TlaProofError(message, {
|
|
195
202
|
failure: `Expr.Anon: ${selector ? ANON_SELECTOR_FAILURES[selector.kind] : "1EMPTY"}`,
|
|
196
203
|
});
|
|
@@ -200,7 +207,14 @@ export const createAnonymizer = (
|
|
|
200
207
|
hyp.kind !== "Defn" ||
|
|
201
208
|
(hyp.definition.kind !== "Operator" && hyp.definition.kind !== "Bpragma")
|
|
202
209
|
) {
|
|
203
|
-
|
|
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" });
|
|
204
218
|
}
|
|
205
219
|
const index = found.depth + 1;
|
|
206
220
|
if (selectors.length === 0 && isInstance) {
|
|
@@ -209,7 +223,8 @@ export const createAnonymizer = (
|
|
|
209
223
|
: createStandardForm(index, hyp.whereDefined, hyp.definition.body, args, from);
|
|
210
224
|
}
|
|
211
225
|
const body = withLocus(shiftExpr(index, hyp.definition.body), from);
|
|
212
|
-
|
|
226
|
+
const hyps = getScopeHyps(context.scope);
|
|
227
|
+
return withLocus(resolveSubexpression(onWarning, hyps, body, args, selectors), from);
|
|
213
228
|
};
|
|
214
229
|
|
|
215
230
|
const anonymizeCore = (context: AnonContext, expression: Expr): Expr => {
|
|
@@ -266,7 +281,11 @@ export const createAnonymizer = (
|
|
|
266
281
|
label: form.label,
|
|
267
282
|
indices: form.names.map((name) => {
|
|
268
283
|
const found = findNamed(context.scope, name);
|
|
269
|
-
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
|
+
}
|
|
270
289
|
return { name, index: found.depth + 1 };
|
|
271
290
|
}),
|
|
272
291
|
};
|
|
@@ -450,7 +469,7 @@ export const createAnonymizer = (
|
|
|
450
469
|
? {
|
|
451
470
|
kind: "Named",
|
|
452
471
|
level: original.step.level,
|
|
453
|
-
label:
|
|
472
|
+
label: getStepLabel(),
|
|
454
473
|
isAnonymous: true,
|
|
455
474
|
}
|
|
456
475
|
: original.step;
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
// Module.Elab's check_enabled_axioms_usage and check_enabled_axioms_map.
|
|
2
|
+
|
|
3
|
+
import { TlapmBugError } from "../errors";
|
|
4
|
+
import {
|
|
5
|
+
adjoin,
|
|
6
|
+
adjoinAll,
|
|
7
|
+
AT_NOWHERE,
|
|
8
|
+
getErrorNote,
|
|
9
|
+
getFact,
|
|
10
|
+
mapAccumulate,
|
|
11
|
+
type Expr,
|
|
12
|
+
type Hyp,
|
|
13
|
+
type Scope,
|
|
14
|
+
type Warn,
|
|
15
|
+
} from "./expression";
|
|
16
|
+
import { getDefineHyp, getStepDefinition, setDefinition, setExpression } from "./generate";
|
|
17
|
+
import { getContextLevel, getLevelInfo } from "./levels";
|
|
18
|
+
import { getStepName, type Proof, type Step } from "./proof";
|
|
19
|
+
|
|
20
|
+
// level is shared with the enclosing proof, which an assertion overwrites.
|
|
21
|
+
interface CheckState {
|
|
22
|
+
context: Hyp[];
|
|
23
|
+
level: { value: number };
|
|
24
|
+
stepLevels: Map<string, number>;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
const DUMMY_FACT = getFact(AT_NOWHERE, "Visible", "Always", undefined);
|
|
28
|
+
|
|
29
|
+
const getTarget = (context: Hyp[], index: number, expression: Expr) =>
|
|
30
|
+
expression.kind === "Ix" ? context[index - expression.index] : undefined;
|
|
31
|
+
|
|
32
|
+
const isDirective = (hyp: Hyp | undefined) =>
|
|
33
|
+
hyp?.kind === "Defn" &&
|
|
34
|
+
hyp.definition.kind === "Bpragma" &&
|
|
35
|
+
hyp.definition.name === "ENABLEDaxioms";
|
|
36
|
+
|
|
37
|
+
const visitTheorem = (context: Hyp[], proof: Proof, onWarning: Warn, isChecking: boolean) => {
|
|
38
|
+
const usage = { isUsed: false };
|
|
39
|
+
|
|
40
|
+
const getLevels = (context: Hyp[], step: Extract<Step, { kind: "Assert" | "Suffices" }>) => {
|
|
41
|
+
if (!isChecking) return { hyps: 0, sequent: 0 };
|
|
42
|
+
const hyps = getContextLevel(adjoinAll(undefined, context), step.sequent.context);
|
|
43
|
+
return {
|
|
44
|
+
hyps: hyps.level,
|
|
45
|
+
sequent: Math.max(hyps.level, getLevelInfo(hyps.scope, step.sequent.active).level),
|
|
46
|
+
};
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
const checkLeaf = (state: CheckState, proof: Proof, isOnly: boolean): Proof => {
|
|
50
|
+
const context = state.context;
|
|
51
|
+
if (!isChecking) {
|
|
52
|
+
usage.isUsed ||= context.some(
|
|
53
|
+
(hyp, index) =>
|
|
54
|
+
hyp.kind === "Fact" && isDirective(getTarget(context, index, hyp.expression)),
|
|
55
|
+
);
|
|
56
|
+
return proof;
|
|
57
|
+
}
|
|
58
|
+
const scopes = mapAccumulate<Scope | undefined, Hyp, Scope | undefined>(
|
|
59
|
+
undefined,
|
|
60
|
+
context,
|
|
61
|
+
(scope, hyp) => [adjoin(scope, hyp), scope],
|
|
62
|
+
)[1];
|
|
63
|
+
const facts = context.flatMap((hyp, index) =>
|
|
64
|
+
hyp.kind === "Fact" && hyp.visibility === "Visible" && hyp.expression.kind !== "At"
|
|
65
|
+
? [{ expression: hyp.expression, index }]
|
|
66
|
+
: [],
|
|
67
|
+
);
|
|
68
|
+
const isFound = facts.some((fact) =>
|
|
69
|
+
isDirective(getTarget(context, fact.index, fact.expression)),
|
|
70
|
+
);
|
|
71
|
+
if (isOnly && !isFound) return { ...proof, isEnabledAxiomsSound: true };
|
|
72
|
+
const level = Math.max(
|
|
73
|
+
0,
|
|
74
|
+
...facts.map((fact) => {
|
|
75
|
+
const target = getTarget(context, fact.index, fact.expression);
|
|
76
|
+
if (!target) return getLevelInfo(scopes[fact.index], fact.expression).level;
|
|
77
|
+
if (!isOnly && target.kind === "Fact" && target.visibility === "Visible")
|
|
78
|
+
throw new TlapmBugError();
|
|
79
|
+
return target.kind === "Defn" &&
|
|
80
|
+
target.definition.kind === "Operator" &&
|
|
81
|
+
target.visibility === "Visible"
|
|
82
|
+
? (state.stepLevels.get(target.definition.name) ?? 0)
|
|
83
|
+
: 0;
|
|
84
|
+
}),
|
|
85
|
+
);
|
|
86
|
+
if (!isOnly) state.level.value = Math.max(state.level.value, level);
|
|
87
|
+
if (!isFound || level <= 1) return { ...proof, isEnabledAxiomsSound: true };
|
|
88
|
+
onWarning(
|
|
89
|
+
getErrorNote(proof.location, "ENABLEDaxioms depends on assumption of expression level > 1"),
|
|
90
|
+
);
|
|
91
|
+
return { ...proof, isEnabledAxiomsSound: false };
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
const visitStep = (state: CheckState, step: Step): [CheckState, Step] => {
|
|
95
|
+
if (!step.step) throw new TlapmBugError();
|
|
96
|
+
const name = getStepName(step.step);
|
|
97
|
+
const stepLevels = new Map(state.stepLevels);
|
|
98
|
+
stepLevels.delete(name);
|
|
99
|
+
const definition = getStepDefinition(step, AT_NOWHERE, "Always");
|
|
100
|
+
switch (step.kind) {
|
|
101
|
+
case "Forget": {
|
|
102
|
+
const count = state.context.length;
|
|
103
|
+
const context = state.context.map((hyp, index): Hyp =>
|
|
104
|
+
hyp.kind === "Fact" && hyp.visibility === "Visible" && step.count + index < count
|
|
105
|
+
? { ...hyp, visibility: "Hidden" }
|
|
106
|
+
: hyp,
|
|
107
|
+
);
|
|
108
|
+
return [{ ...state, stepLevels, context }, step];
|
|
109
|
+
}
|
|
110
|
+
case "Hide": {
|
|
111
|
+
const hidden = step.usable.defs.reduce(
|
|
112
|
+
(current, def) => setDefinition("Hidden", current, def),
|
|
113
|
+
state.context,
|
|
114
|
+
);
|
|
115
|
+
const context = step.usable.facts.reduceRight(
|
|
116
|
+
(current, fact) => setExpression(onWarning, "Hidden", fact, current),
|
|
117
|
+
hidden,
|
|
118
|
+
);
|
|
119
|
+
return [{ ...state, stepLevels, context }, step];
|
|
120
|
+
}
|
|
121
|
+
case "Assert": {
|
|
122
|
+
const levels = getLevels(state.context, step);
|
|
123
|
+
const proofLevel = { value: 0 };
|
|
124
|
+
const proof = visitProof(
|
|
125
|
+
{
|
|
126
|
+
context: [
|
|
127
|
+
...state.context,
|
|
128
|
+
...step.sequent.context,
|
|
129
|
+
DUMMY_FACT,
|
|
130
|
+
definition,
|
|
131
|
+
DUMMY_FACT,
|
|
132
|
+
],
|
|
133
|
+
level: proofLevel,
|
|
134
|
+
stepLevels: new Map(stepLevels).set(name, levels.hyps),
|
|
135
|
+
},
|
|
136
|
+
step.proof,
|
|
137
|
+
);
|
|
138
|
+
state.level.value =
|
|
139
|
+
proofLevel.value < 2 ? proofLevel.value : Math.min(levels.sequent, proofLevel.value);
|
|
140
|
+
return [
|
|
141
|
+
{
|
|
142
|
+
context: [...state.context, definition, DUMMY_FACT],
|
|
143
|
+
level: state.level,
|
|
144
|
+
stepLevels: stepLevels.set(name, state.level.value),
|
|
145
|
+
},
|
|
146
|
+
{ ...step, proof },
|
|
147
|
+
];
|
|
148
|
+
}
|
|
149
|
+
case "Suffices": {
|
|
150
|
+
const levels = getLevels(state.context, step);
|
|
151
|
+
state.level.value = levels.sequent;
|
|
152
|
+
const proofLevel = { value: 0 };
|
|
153
|
+
const proof = visitProof(
|
|
154
|
+
{
|
|
155
|
+
context: [...state.context, definition, DUMMY_FACT],
|
|
156
|
+
level: proofLevel,
|
|
157
|
+
stepLevels: new Map(stepLevels).set(name, levels.sequent),
|
|
158
|
+
},
|
|
159
|
+
step.proof,
|
|
160
|
+
);
|
|
161
|
+
return [
|
|
162
|
+
{
|
|
163
|
+
context: [
|
|
164
|
+
...state.context,
|
|
165
|
+
...step.sequent.context,
|
|
166
|
+
DUMMY_FACT,
|
|
167
|
+
definition,
|
|
168
|
+
DUMMY_FACT,
|
|
169
|
+
],
|
|
170
|
+
level: proofLevel,
|
|
171
|
+
stepLevels: stepLevels.set(name, levels.hyps),
|
|
172
|
+
},
|
|
173
|
+
{ ...step, proof },
|
|
174
|
+
];
|
|
175
|
+
}
|
|
176
|
+
case "Use": {
|
|
177
|
+
const facts = step.usable.facts;
|
|
178
|
+
if (step.usable.defs.length === 0 && facts.length === 1) {
|
|
179
|
+
const fact = getFact(facts[0], "Visible", "Always", facts[0].location);
|
|
180
|
+
return [{ ...state, stepLevels, context: [...state.context, fact] }, step];
|
|
181
|
+
}
|
|
182
|
+
const context = [...state.context, ...facts.map(() => DUMMY_FACT)];
|
|
183
|
+
return [{ ...state, stepLevels: stepLevels.set(name, 1), context }, step];
|
|
184
|
+
}
|
|
185
|
+
case "Define": {
|
|
186
|
+
const context = [...state.context, ...step.definitions.map(getDefineHyp)];
|
|
187
|
+
return [{ ...state, stepLevels: stepLevels.set(name, 1), context }, step];
|
|
188
|
+
}
|
|
189
|
+
default:
|
|
190
|
+
throw new TlapmBugError();
|
|
191
|
+
}
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
const visitProof = (state: CheckState, proof: Proof): Proof => {
|
|
195
|
+
switch (proof.kind) {
|
|
196
|
+
case "Omitted":
|
|
197
|
+
case "Error":
|
|
198
|
+
return proof;
|
|
199
|
+
case "Obvious":
|
|
200
|
+
return checkLeaf(state, proof, false);
|
|
201
|
+
case "By":
|
|
202
|
+
return checkLeaf(state, proof, proof.isOnly);
|
|
203
|
+
case "Steps": {
|
|
204
|
+
const [inner, steps] = mapAccumulate(state, proof.steps, visitStep);
|
|
205
|
+
const qed = { ...proof.qed, proof: visitProof(inner, proof.qed.proof) };
|
|
206
|
+
return { ...proof, steps, qed };
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
};
|
|
210
|
+
|
|
211
|
+
const visited = visitProof({ context, level: { value: 0 }, stepLevels: new Map() }, proof);
|
|
212
|
+
return { isUsed: usage.isUsed, proof: visited };
|
|
213
|
+
};
|
|
214
|
+
|
|
215
|
+
export const checkEnabledAxioms = (context: Hyp[], proof: Proof, onWarning: Warn) =>
|
|
216
|
+
visitTheorem(context, proof, onWarning, false).isUsed
|
|
217
|
+
? visitTheorem(context, proof, onWarning, true).proof
|
|
218
|
+
: proof;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's E_eq.
|
|
2
|
-
|
|
3
1
|
import type { Bound, Defn, Expr, Field, Hyp, Selector, Sequent } from "./expression";
|
|
4
2
|
|
|
5
3
|
const isEqualList = <Item>(
|
|
@@ -93,7 +91,7 @@ export const isEqualHyp = (left: Hyp, right: Hyp): boolean => {
|
|
|
93
91
|
const isEqualSequent = (left: Sequent, right: Sequent) =>
|
|
94
92
|
isEqualList(left.context, right.context, isEqualHyp) && isEqualExpr(left.active, right.active);
|
|
95
93
|
|
|
96
|
-
//
|
|
94
|
+
// Includes E_eq's quirk of comparing only the first CASE arm.
|
|
97
95
|
export const isEqualExpr = (left: Expr, right: Expr): boolean => {
|
|
98
96
|
if (left.kind === "Parens") return isEqualExpr(left.expression, right);
|
|
99
97
|
if (right.kind === "Parens") return isEqualExpr(left, right.expression);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's expression IR (E_t) and its visitors (Visit).
|
|
2
|
-
|
|
3
1
|
import type { OldMethod, PragmaSetting } from "./pragma";
|
|
4
2
|
|
|
5
3
|
export interface Locus {
|
|
@@ -10,9 +8,10 @@ export interface Locus {
|
|
|
10
8
|
endColumn: number;
|
|
11
9
|
}
|
|
12
10
|
|
|
13
|
-
interface ObligationWarning {
|
|
11
|
+
export interface ObligationWarning {
|
|
14
12
|
text: string;
|
|
15
|
-
channel: "toolbox" | "toolboxOnly" | "stderr" | "stdout";
|
|
13
|
+
channel: "toolbox" | "toolboxOnly" | "stderr" | "stdout" | "error";
|
|
14
|
+
locus?: Locus;
|
|
16
15
|
}
|
|
17
16
|
|
|
18
17
|
export type Warn = (warning: ObligationWarning) => void;
|
|
@@ -39,6 +38,17 @@ export const getErrorNote = (locus: Locus | undefined, message: string): Obligat
|
|
|
39
38
|
channel: "stderr",
|
|
40
39
|
});
|
|
41
40
|
|
|
41
|
+
export const getErrorSetting = (locus: Locus | undefined, message: string): ObligationWarning => ({
|
|
42
|
+
text: message,
|
|
43
|
+
channel: "error",
|
|
44
|
+
locus,
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
export const warnError = (onWarning: Warn, locus: Locus | undefined, message: string) => {
|
|
48
|
+
onWarning(getErrorNote(locus, message));
|
|
49
|
+
onWarning(getErrorSetting(locus, message));
|
|
50
|
+
};
|
|
51
|
+
|
|
42
52
|
export const getLocusPrefix = (locus: Locus | undefined) =>
|
|
43
53
|
locus ? `${getLocusText(locus)} :\n` : "";
|
|
44
54
|
|
|
@@ -129,6 +139,7 @@ export interface Bound {
|
|
|
129
139
|
name: string;
|
|
130
140
|
level: Level;
|
|
131
141
|
domain: BoundDomain;
|
|
142
|
+
location?: Locus;
|
|
132
143
|
}
|
|
133
144
|
|
|
134
145
|
export type Selector =
|
|
@@ -149,7 +160,7 @@ interface ExceptSpec {
|
|
|
149
160
|
|
|
150
161
|
export type ParenForm =
|
|
151
162
|
| { kind: "Syntax" }
|
|
152
|
-
| { kind: "Nlabel"; label: string; names: string[] }
|
|
163
|
+
| { kind: "Nlabel"; label: string; names: string[]; location?: Locus }
|
|
153
164
|
| { kind: "Xlabel"; label: string; indices: { name: string; index: number }[] };
|
|
154
165
|
|
|
155
166
|
export interface Param {
|
|
@@ -209,8 +220,9 @@ export interface Field {
|
|
|
209
220
|
export interface InstanceDefinition {
|
|
210
221
|
args: string[];
|
|
211
222
|
module: string;
|
|
212
|
-
substitutions: { name: string; expression: Expr }[];
|
|
223
|
+
substitutions: { name: string; expression: Expr; location?: Locus }[];
|
|
213
224
|
location?: Locus;
|
|
225
|
+
instanceLocation?: Locus;
|
|
214
226
|
}
|
|
215
227
|
|
|
216
228
|
export type Defn = DefnCore & { location?: Locus };
|