tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.7a3bb1545
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 +58 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -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 +45 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- 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 +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- 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/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +30 -3
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +3 -2
- 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 +36 -6
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +24 -13
- 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 +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 +633 -186
- 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 +1 -8
- 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 +0 -2
- 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/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 +1448 -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 +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 +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 +348 -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 +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3154 -326
- package/src/prover/smt/solver/smtlib-script.ts +1702 -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 +1995 -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 +29 -8
- 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 +72 -36
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +1 -1
- package/src/sany/generator-expressions.ts +9 -17
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +1 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +4 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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
|
@@ -16,6 +16,8 @@ import {
|
|
|
16
16
|
type Typ,
|
|
17
17
|
} from "../pure/term";
|
|
18
18
|
import { typargsOf, type TypargPosition } from "../pure/consts";
|
|
19
|
+
import type { NamedCasesRule } from "../isar/induct";
|
|
20
|
+
import type { Tags } from "../isar/rule-cases";
|
|
19
21
|
import { LOGIC_DATA } from "./logic-data";
|
|
20
22
|
|
|
21
23
|
type TypeNode = [0, number, ...number[]] | [1, number] | [2, number, number];
|
|
@@ -29,6 +31,7 @@ type TermNode =
|
|
|
29
31
|
type NetItem = [number, 0 | 1, number];
|
|
30
32
|
type ExtraNetItem = [number, number, 0 | 1, number];
|
|
31
33
|
type RawRule = [number, number, number[], number, number[]];
|
|
34
|
+
type RawCasesRule = [string, number, [string, string][]];
|
|
32
35
|
|
|
33
36
|
interface LogicJson {
|
|
34
37
|
strings: string[];
|
|
@@ -52,8 +55,15 @@ interface LogicJson {
|
|
|
52
55
|
safep: [NetItem[], NetItem[]];
|
|
53
56
|
unsafe: [NetItem[], NetItem[]];
|
|
54
57
|
dup: [NetItem[], NetItem[]];
|
|
58
|
+
extra: [ExtraNetItem[], ExtraNetItem[]];
|
|
55
59
|
};
|
|
56
|
-
contextRules: {
|
|
60
|
+
contextRules: {
|
|
61
|
+
bang: [ExtraNetItem[], ExtraNetItem[]];
|
|
62
|
+
plain: [ExtraNetItem[], ExtraNetItem[]];
|
|
63
|
+
query: [number[], number[]];
|
|
64
|
+
};
|
|
65
|
+
factTags: [string, number, [string, string][]][];
|
|
66
|
+
casesRules: { type: RawCasesRule[]; pred: RawCasesRule[] };
|
|
57
67
|
}
|
|
58
68
|
|
|
59
69
|
export interface ConstInfo {
|
|
@@ -89,10 +99,19 @@ export interface TlaLogic {
|
|
|
89
99
|
readonly safep: LogicNetPair<TaggedRule>;
|
|
90
100
|
readonly unsafe: LogicNetPair<TaggedRule>;
|
|
91
101
|
readonly dup: LogicNetPair<TaggedRule>;
|
|
102
|
+
readonly extra: LogicNetPair<ContextRule>;
|
|
92
103
|
};
|
|
93
104
|
readonly contextRules: {
|
|
94
105
|
readonly bang: LogicNetPair<ContextRule>;
|
|
95
106
|
readonly plain: LogicNetPair<ContextRule>;
|
|
107
|
+
readonly query: LogicNetPair<ContextRule>;
|
|
108
|
+
};
|
|
109
|
+
// The Rule_Cases tags of the facts that have them, by name and position.
|
|
110
|
+
readonly factTags: ReadonlyMap<string, ReadonlyMap<number, Tags>>;
|
|
111
|
+
// Induct's cases rules for types and for predicates or sets, newest first.
|
|
112
|
+
readonly casesRules: {
|
|
113
|
+
readonly type: readonly NamedCasesRule[];
|
|
114
|
+
readonly pred: readonly NamedCasesRule[];
|
|
96
115
|
};
|
|
97
116
|
}
|
|
98
117
|
|
|
@@ -157,6 +176,19 @@ const parseLogic = (): TlaLogic => {
|
|
|
157
176
|
);
|
|
158
177
|
return { intro, elim };
|
|
159
178
|
};
|
|
179
|
+
// Isabelle hides the weights of the rules declared with "?", so their order stands in for their
|
|
180
|
+
// tags, which is all their unweighted retrieval reads.
|
|
181
|
+
const toOrderedItems = (pair: [number[], number[]]): LogicNetPair<ContextRule> => {
|
|
182
|
+
const [intro, elim] = pair.map((side, isElim) =>
|
|
183
|
+
side.map((id, tag) => ({ weight: 0, tag, isElim: isElim === 1, rule: thms[id] })),
|
|
184
|
+
);
|
|
185
|
+
return { intro, elim };
|
|
186
|
+
};
|
|
187
|
+
const toCasesRules = (rules: RawCasesRule[]) =>
|
|
188
|
+
rules.map((entry) => ({ name: entry[0], rule: { rule: thms[entry[1]], tags: entry[2] } }));
|
|
189
|
+
const factTags = new Map<string, Map<number, Tags>>();
|
|
190
|
+
for (const entry of data.factTags)
|
|
191
|
+
factTags.set(entry[0], new Map([...(factTags.get(entry[0]) ?? []), [entry[1], entry[2]]]));
|
|
160
192
|
return {
|
|
161
193
|
consts: new Map(
|
|
162
194
|
data.consts.map((entry) => [
|
|
@@ -184,10 +216,17 @@ const parseLogic = (): TlaLogic => {
|
|
|
184
216
|
safep: toItems(data.claset.safep),
|
|
185
217
|
unsafe: toItems(data.claset.unsafe),
|
|
186
218
|
dup: toItems(data.claset.dup),
|
|
219
|
+
extra: toExtraItems(data.claset.extra),
|
|
187
220
|
},
|
|
188
221
|
contextRules: {
|
|
189
222
|
bang: toExtraItems(data.contextRules.bang),
|
|
190
223
|
plain: toExtraItems(data.contextRules.plain),
|
|
224
|
+
query: toOrderedItems(data.contextRules.query),
|
|
225
|
+
},
|
|
226
|
+
factTags,
|
|
227
|
+
casesRules: {
|
|
228
|
+
type: toCasesRules(data.casesRules.type),
|
|
229
|
+
pred: toCasesRules(data.casesRules.pred),
|
|
191
230
|
},
|
|
192
231
|
};
|
|
193
232
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle/TLA+'s simplifier_setup.ML and PredicateLogic.thy, BSD licensed, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { genAll, reflexiveThm } from "../pure/drule";
|
|
5
3
|
import { emptyNet, insertTermNet, type Net } from "../pure/net";
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/intuitionistic.ML and Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { remdupsRl } from "../pure/drule";
|
|
4
2
|
import { selectGoal } from "../pure/goal";
|
|
3
|
+
import { unifyTermNet } from "../pure/net";
|
|
5
4
|
import { deepen } from "../pure/search";
|
|
6
5
|
import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
|
|
7
6
|
import type { Limits } from "../pure/interrupt";
|
|
@@ -45,20 +44,37 @@ interface Visited {
|
|
|
45
44
|
readonly concl: Term;
|
|
46
45
|
}
|
|
47
46
|
|
|
48
|
-
|
|
47
|
+
// orderlist_no_weight sorts by tag alone.
|
|
48
|
+
const orderContextRules = (rules: readonly ContextRule[], isWeighted: boolean) => {
|
|
49
49
|
const sorted = [...rules].sort(
|
|
50
|
-
(left, right) => left.weight - right.weight || left.tag - right.tag,
|
|
50
|
+
(left, right) => (isWeighted ? left.weight - right.weight : 0) || left.tag - right.tag,
|
|
51
|
+
);
|
|
52
|
+
return sorted.filter(
|
|
53
|
+
(rule, index) =>
|
|
54
|
+
index + 1 >= sorted.length ||
|
|
55
|
+
sorted[index + 1].weight !== rule.weight ||
|
|
56
|
+
sorted[index + 1].tag !== rule.tag,
|
|
51
57
|
);
|
|
52
|
-
return sorted
|
|
53
|
-
.filter(
|
|
54
|
-
(rule, index) =>
|
|
55
|
-
index + 1 >= sorted.length ||
|
|
56
|
-
sorted[index + 1].weight !== rule.weight ||
|
|
57
|
-
sorted[index + 1].tag !== rule.tag,
|
|
58
|
-
)
|
|
59
|
-
.map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
60
58
|
};
|
|
61
59
|
|
|
60
|
+
const orderRules = (rules: ContextRule[]): BiresRule[] =>
|
|
61
|
+
orderContextRules(rules, true).map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
62
|
+
|
|
63
|
+
// Context_Rules.find_rules_netpair: the elimination rules for the first fact, then the
|
|
64
|
+
// introduction rules for the goal.
|
|
65
|
+
export const findRulesNetpair = (
|
|
66
|
+
isWeighted: boolean,
|
|
67
|
+
facts: readonly Thm[],
|
|
68
|
+
goal: Term,
|
|
69
|
+
netpair: NetPair<ContextRule>,
|
|
70
|
+
): Thm[] =>
|
|
71
|
+
[
|
|
72
|
+
...(facts.length === 0
|
|
73
|
+
? []
|
|
74
|
+
: orderContextRules(unifyTermNet(netpair.elim, stripAssumsConcl(facts[0].prop)), isWeighted)),
|
|
75
|
+
...orderContextRules(unifyTermNet(netpair.intro, stripAssumsConcl(goal)), isWeighted),
|
|
76
|
+
].map((rule) => rule.rule);
|
|
77
|
+
|
|
62
78
|
const countDistinct = (terms: readonly Term[]) =>
|
|
63
79
|
terms.reduce<Term[]>(
|
|
64
80
|
(result, term) => (result.some((other) => aconv(other, term)) ? result : [...result, term]),
|
package/src/prover/ocaml.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
// A bigint is an OCaml int beyond what a number holds exactly.
|
|
2
|
+
type OcamlValue = number | bigint | string | OcamlValue[];
|
|
2
3
|
|
|
3
4
|
export const compareStrings = (left: string, right: string) =>
|
|
4
5
|
left < right ? -1 : left > right ? 1 : 0;
|
|
5
6
|
|
|
6
7
|
export const compareValues = (left: OcamlValue, right: OcamlValue): number => {
|
|
7
8
|
if (typeof left === "number" && typeof right === "number") return left - right;
|
|
9
|
+
if (typeof left === "bigint" && typeof right === "bigint")
|
|
10
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
8
11
|
if (typeof left === "string" && typeof right === "string") return compareStrings(left, right);
|
|
9
12
|
if (!Array.isArray(left) || !Array.isArray(right)) return 0;
|
|
10
13
|
const index = left.findIndex(
|
|
@@ -426,28 +426,33 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
426
426
|
const hypScope = getScopeAt(scope, operator.index - 1);
|
|
427
427
|
const hyp = hypScope?.hyp;
|
|
428
428
|
if (!hyp) throw new TlapmBugError();
|
|
429
|
+
const applyCoalesced = (applied: Expr) =>
|
|
430
|
+
at(
|
|
431
|
+
{ kind: "Apply", operator: applied, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
432
|
+
expression,
|
|
433
|
+
);
|
|
429
434
|
if (hyp.kind === "Defn" && hyp.definition.kind === "Operator") {
|
|
430
435
|
const substitutive = getSubstitutiveArgs(hypScope.rest, hyp.definition);
|
|
431
436
|
const isKept = args.every(
|
|
432
437
|
(inner, position) => getLevel(scope, inner) === 0 || substitutive[args.length - position - 1],
|
|
433
438
|
);
|
|
434
439
|
if (isKept) return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
{ kind: "Apply", operator: opaque, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
438
|
-
expression,
|
|
440
|
+
return applyCoalesced(
|
|
441
|
+
coalesceOperator(scope, hyp.definition.name, substitutive, operator, args),
|
|
439
442
|
);
|
|
440
443
|
}
|
|
441
444
|
if (hyp.kind === "Flex") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
442
445
|
if (hyp.kind === "Fresh") {
|
|
443
|
-
if (hyp.level === "Constant")
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
446
|
+
if (hyp.level === "Constant") return applyCoalesced(operator);
|
|
447
|
+
return applyCoalesced(
|
|
448
|
+
coalesceOperator(
|
|
449
|
+
scope,
|
|
450
|
+
hyp.name,
|
|
451
|
+
args.map(() => false),
|
|
452
|
+
operator,
|
|
453
|
+
args,
|
|
454
|
+
),
|
|
455
|
+
);
|
|
451
456
|
}
|
|
452
457
|
throw new TlapmBugError();
|
|
453
458
|
};
|
|
@@ -461,6 +466,8 @@ const commuteSequent = createSequentMap(commuteSymbols, "all");
|
|
|
461
466
|
const coalesceSequent = createSequentMap(coalesceModal, "visible");
|
|
462
467
|
|
|
463
468
|
export const processObligation = (sequent: Sequent): Sequent => {
|
|
469
|
+
// Levels.compute_level, whose levels the passes below read on demand: only its errors matter.
|
|
470
|
+
getLevelInfo(undefined, { kind: "Sequent", sequent });
|
|
464
471
|
const keys = sequent.context;
|
|
465
472
|
const expanded = expandUnchangedSequent(keys, expandActionSequent(keys, sequent));
|
|
466
473
|
const commuted = commuteSequent(keys, expanded);
|
|
@@ -6,10 +6,13 @@ import {
|
|
|
6
6
|
adjoinAll,
|
|
7
7
|
getScopeAt,
|
|
8
8
|
mapScoped,
|
|
9
|
+
getAtPrefix,
|
|
9
10
|
type Builtin,
|
|
10
11
|
type Expr,
|
|
12
|
+
type Locus,
|
|
11
13
|
type Scope,
|
|
12
14
|
type Sequent,
|
|
15
|
+
type Warn,
|
|
13
16
|
} from "../../obligations/expression";
|
|
14
17
|
import { getLevelInfo } from "../../obligations/levels";
|
|
15
18
|
|
|
@@ -129,7 +132,12 @@ const getRule = (scope: Scope | undefined, goal: Expr): Rule | undefined => {
|
|
|
129
132
|
return implication && { name: "implies", left: implication[0], right: implication[1] };
|
|
130
133
|
};
|
|
131
134
|
|
|
132
|
-
|
|
135
|
+
// When no rule applies, tlapm records the obligation as not tried.
|
|
136
|
+
export const implicationToEnabled = (
|
|
137
|
+
sequent: Sequent,
|
|
138
|
+
locus: Locus | undefined,
|
|
139
|
+
onWarning: Warn,
|
|
140
|
+
): Sequent => {
|
|
133
141
|
const goalScope = adjoinAll(undefined, sequent.context);
|
|
134
142
|
const rule = getRule(goalScope, sequent.active);
|
|
135
143
|
let isPremise = false;
|
|
@@ -175,8 +183,9 @@ export const implicationToEnabled = (sequent: Sequent): Sequent => {
|
|
|
175
183
|
isPremise = true;
|
|
176
184
|
}
|
|
177
185
|
});
|
|
178
|
-
if (!isPremise || !isLeftBoolean || !isRightBoolean) {
|
|
186
|
+
if (!rule || !isPremise || !isLeftBoolean || !isRightBoolean) {
|
|
179
187
|
throw new TlaProverError("ENABLEDaxioms proof directive did not succeed.\n");
|
|
180
188
|
}
|
|
189
|
+
onWarning({ text: `${getAtPrefix(locus)}[INFO]\nProved ${rule.name}\n`, channel: "stdout" });
|
|
181
190
|
return { ...sequent, active: TRUE };
|
|
182
191
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
1
|
+
import { TlaMethodError, TlapmBugError, TlaProverError } from "../../errors";
|
|
2
2
|
import type { Expr, Locus, Sequent } from "../../obligations/expression";
|
|
3
3
|
import type { OldMethod, PragmaSetting } from "../../obligations/pragma";
|
|
4
4
|
import type { Backend } from "../verdict";
|
|
@@ -6,7 +6,7 @@ import type { Backend } from "../verdict";
|
|
|
6
6
|
type Prover =
|
|
7
7
|
| Backend
|
|
8
8
|
| "yices"
|
|
9
|
-
| "
|
|
9
|
+
| "cvc4"
|
|
10
10
|
| "cooper"
|
|
11
11
|
| "fail"
|
|
12
12
|
| "verit"
|
|
@@ -30,7 +30,7 @@ export interface Method {
|
|
|
30
30
|
|
|
31
31
|
export const getBudget = (method: Method) => method.rlimit ?? method.timeLimitMs / 1000;
|
|
32
32
|
|
|
33
|
-
const FRONTENDS = new Set<Prover>([
|
|
33
|
+
export const FRONTENDS = new Set<Prover>([
|
|
34
34
|
"expandenabled",
|
|
35
35
|
"expandcdot",
|
|
36
36
|
"autouse",
|
|
@@ -60,14 +60,14 @@ const PROVERS: Record<string, { prover: Prover; seconds: number; isBudgeted?: bo
|
|
|
60
60
|
ls4: { prover: "ls4", seconds: LS4_SECONDS },
|
|
61
61
|
z3: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
62
62
|
smt: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
63
|
-
cvc3: { prover: "
|
|
64
|
-
cooper: { prover: "cooper", seconds:
|
|
65
|
-
fail: { prover: "fail", seconds:
|
|
63
|
+
cvc3: { prover: "cvc4", seconds: SMT_SECONDS },
|
|
64
|
+
cooper: { prover: "cooper", seconds: Infinity },
|
|
65
|
+
fail: { prover: "fail", seconds: Infinity },
|
|
66
66
|
smt2lib: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
67
67
|
smt2z3: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
68
68
|
smt3: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
69
69
|
z33: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
70
|
-
cvc33: { prover: "
|
|
70
|
+
cvc33: { prover: "cvc4", seconds: SMT_SECONDS },
|
|
71
71
|
yices3: { prover: "yices", seconds: SMT_SECONDS },
|
|
72
72
|
verit: { prover: "verit", seconds: SMT_SECONDS },
|
|
73
73
|
zipper: { prover: "zipper", seconds: 30 },
|
|
@@ -77,77 +77,152 @@ const PROVERS: Record<string, { prover: Prover; seconds: number; isBudgeted?: bo
|
|
|
77
77
|
...Object.fromEntries([...FRONTENDS].map((name) => [name, { prover: name, seconds: 0 }])),
|
|
78
78
|
};
|
|
79
79
|
|
|
80
|
+
const UNTIMED_PROVERS = new Set<Prover>(["cooper", "fail", "trivial", ...FRONTENDS]);
|
|
81
|
+
|
|
80
82
|
const getProverMethod = (
|
|
81
83
|
name: string,
|
|
82
84
|
timeout: number | undefined,
|
|
83
85
|
rlimit: number | undefined,
|
|
84
86
|
tactic: string | undefined,
|
|
85
87
|
): Method => {
|
|
86
|
-
const known = PROVERS[name];
|
|
88
|
+
const known = Object.hasOwn(PROVERS, name) ? PROVERS[name] : undefined;
|
|
87
89
|
if (!known) throw new TlaProverError(`Unknown prover: ${name}`);
|
|
88
|
-
if (rlimit !== undefined && !known.isBudgeted)
|
|
89
|
-
throw new TlaProverError(
|
|
90
|
-
'A Z3 rlimit budget ("rN") is only supported by the SMT and Z3 backends.',
|
|
91
|
-
);
|
|
92
90
|
return {
|
|
93
91
|
prover: known.prover,
|
|
94
|
-
timeLimitMs:
|
|
92
|
+
timeLimitMs:
|
|
93
|
+
rlimit !== undefined
|
|
94
|
+
? Infinity
|
|
95
|
+
: ((UNTIMED_PROVERS.has(known.prover) ? undefined : timeout) ?? known.seconds) * 1000,
|
|
95
96
|
...(rlimit !== undefined && { rlimit }),
|
|
96
97
|
...(known.prover === "isabelle" && { tactic: tactic ?? "auto" }),
|
|
97
98
|
};
|
|
98
99
|
};
|
|
99
100
|
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
101
|
+
const BUDGET_FORMS =
|
|
102
|
+
'a number of seconds (wall-clock timeout), or a deterministic Z3 rlimit budget of the form "rN" (e.g. "r5")';
|
|
103
|
+
|
|
104
|
+
const HEX_FLOAT =
|
|
105
|
+
/^[\t-\r ]*[+-]?0x(?=\.?[\da-f])([\da-f]*)\.?([\da-f]*)(?:p([\t-\r ]*[+-]?\d+))?$/i;
|
|
106
|
+
const DECIMAL_FLOAT = /^[\t-\r ]*[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
|
|
107
|
+
const SPECIAL_FLOAT = /^[\t-\r ]*[+-]?(?:(inf(?:inity)?)|nan(?:\([^)]*\))?)$/i;
|
|
108
|
+
|
|
109
|
+
// OCaml's float_of_string_opt: caml_float_of_string drops underscores, then reads a C99 float.
|
|
110
|
+
export const parseOcamlFloat = (text: string) => {
|
|
111
|
+
const digits = text.replaceAll("_", "");
|
|
112
|
+
const sign = digits.trimStart().startsWith("-") ? -1 : 1;
|
|
113
|
+
const hex = HEX_FLOAT.exec(digits);
|
|
114
|
+
if (hex) {
|
|
115
|
+
const mantissa = Number(BigInt(`0x${hex[1]}${hex[2]}`));
|
|
116
|
+
return mantissa === 0 ? 0 : sign * mantissa * 2 ** (Number(hex[3] ?? 0) - 4 * hex[2].length);
|
|
117
|
+
}
|
|
118
|
+
const special = SPECIAL_FLOAT.exec(digits);
|
|
119
|
+
if (special) return special[1] === undefined ? NaN : sign * Infinity;
|
|
120
|
+
return DECIMAL_FLOAT.test(digits) ? Number(digits) : undefined;
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
const OCAML_INT =
|
|
124
|
+
/^([+-]?)(?:0x([\da-f][\da-f_]*)|0o([0-7][0-7_]*)|0b([01][01_]*)|(0u)?(\d[\d_]*))$/i;
|
|
125
|
+
|
|
126
|
+
// OCaml's int_of_string_opt: only an unprefixed decimal is range-checked as a signed 63-bit integer.
|
|
127
|
+
export const parseOcamlInt = (text: string) => {
|
|
128
|
+
const match = OCAML_INT.exec(text);
|
|
129
|
+
if (!match) return undefined;
|
|
130
|
+
const isNegative = match[1] === "-";
|
|
131
|
+
const prefixed =
|
|
132
|
+
match[2] === undefined
|
|
133
|
+
? match[3] === undefined
|
|
134
|
+
? match[4] === undefined
|
|
135
|
+
? match[6]
|
|
136
|
+
: `0b${match[4]}`
|
|
137
|
+
: `0o${match[3]}`
|
|
138
|
+
: `0x${match[2]}`;
|
|
139
|
+
const magnitude = BigInt(prefixed.replaceAll("_", ""));
|
|
140
|
+
const isSigned = prefixed === match[6] && match[5] === undefined;
|
|
141
|
+
if (magnitude > (isSigned ? 2n ** 62n - (isNegative ? 0n : 1n) : 2n ** 63n - 1n))
|
|
142
|
+
return undefined;
|
|
143
|
+
return Number(BigInt.asIntN(63, isNegative ? -magnitude : magnitude));
|
|
144
|
+
};
|
|
145
|
+
|
|
146
|
+
const getRlimit = (budget: string, locus: Locus | undefined) => {
|
|
147
|
+
const count = parseOcamlFloat(budget.slice(1));
|
|
148
|
+
if (!/^[rR]./s.test(budget) || count === undefined || !Number.isFinite(count) || count <= 0)
|
|
149
|
+
throw new TlaMethodError(
|
|
150
|
+
`Invalid SMT budget ${JSON.stringify(budget)}: expected ${BUDGET_FORMS}.`,
|
|
151
|
+
locus,
|
|
152
|
+
);
|
|
104
153
|
return Math.max(1, Math.trunc(Math.min(count * RLIMIT_BASE, MAX_RLIMIT)));
|
|
105
154
|
};
|
|
106
155
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
156
|
+
interface MethodValues {
|
|
157
|
+
args: Expr[];
|
|
158
|
+
prover?: string;
|
|
159
|
+
proverLocus?: Locus;
|
|
160
|
+
timeout?: number;
|
|
161
|
+
rlimit?: number;
|
|
162
|
+
tactic?: string;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// Each @ takes the next argument the pragma is applied to at the use.
|
|
166
|
+
const computeMethod = (settings: PragmaSetting[], args: Expr[], use: Locus | undefined): Method => {
|
|
167
|
+
const values = settings.reduce<MethodValues>(
|
|
115
168
|
(state, setting) => {
|
|
116
169
|
const value = setting.value;
|
|
117
170
|
const argument = value.kind === "Default" ? state.args[0] : undefined;
|
|
118
171
|
const rest = value.kind === "Default" ? state.args.slice(1) : state.args;
|
|
172
|
+
if (setting.hint !== "prover" && setting.hint !== "tactic" && setting.hint !== "timeout")
|
|
173
|
+
throw new TlaMethodError(
|
|
174
|
+
`Unknown keyword in proof method definition: ${setting.hint}`,
|
|
175
|
+
setting.location,
|
|
176
|
+
);
|
|
119
177
|
if (value.kind === "Default" && !argument)
|
|
120
|
-
throw new
|
|
121
|
-
|
|
122
|
-
value.kind === "
|
|
123
|
-
|
|
124
|
-
:
|
|
125
|
-
|
|
126
|
-
: undefined;
|
|
127
|
-
switch (setting.hint) {
|
|
128
|
-
case "prover":
|
|
129
|
-
case "tactic":
|
|
130
|
-
if (text === undefined) throw new TlaProverError(`This argument should be a string`);
|
|
131
|
-
return { ...state, args: rest, [setting.hint]: text };
|
|
132
|
-
case "timeout": {
|
|
133
|
-
if (value.kind === "Float") return { ...state, args: rest, timeout: value.value };
|
|
134
|
-
if (text !== undefined) return { ...state, args: rest, rlimit: getRlimit(text) };
|
|
135
|
-
if (argument?.kind !== "Num")
|
|
136
|
-
throw new TlaProverError("This argument should be a number of seconds");
|
|
178
|
+
throw new TlaMethodError("Some arguments are missing", use);
|
|
179
|
+
if (setting.hint === "timeout") {
|
|
180
|
+
if (value.kind === "Float") return { ...state, timeout: value.value };
|
|
181
|
+
if (value.kind === "String")
|
|
182
|
+
return { ...state, rlimit: getRlimit(value.value, setting.location) };
|
|
183
|
+
if (argument?.kind === "Num")
|
|
137
184
|
return {
|
|
138
185
|
...state,
|
|
139
186
|
args: rest,
|
|
140
187
|
timeout: Number(`${argument.integer}.${argument.fraction}`),
|
|
141
188
|
};
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
189
|
+
if (argument?.kind === "String")
|
|
190
|
+
return { ...state, args: rest, rlimit: getRlimit(argument.value, argument.location) };
|
|
191
|
+
throw new TlaMethodError(`This argument should be ${BUDGET_FORMS}`, argument?.location);
|
|
145
192
|
}
|
|
193
|
+
if (value.kind === "Float")
|
|
194
|
+
throw new TlaMethodError("Argument should be a string or @", setting.location);
|
|
195
|
+
const text =
|
|
196
|
+
value.kind === "String"
|
|
197
|
+
? value.value
|
|
198
|
+
: argument?.kind === "String"
|
|
199
|
+
? argument.value
|
|
200
|
+
: undefined;
|
|
201
|
+
if (text === undefined)
|
|
202
|
+
throw new TlaMethodError(
|
|
203
|
+
`This argument should be a string (${setting.hint === "prover" ? "prover name" : "proof tactic"})`,
|
|
204
|
+
argument?.location,
|
|
205
|
+
);
|
|
206
|
+
if (setting.hint === "tactic") return { ...state, args: rest, tactic: text };
|
|
207
|
+
return {
|
|
208
|
+
...state,
|
|
209
|
+
args: rest,
|
|
210
|
+
prover: text,
|
|
211
|
+
proverLocus: value.kind === "Default" ? use : setting.location,
|
|
212
|
+
};
|
|
146
213
|
},
|
|
147
214
|
{ args },
|
|
148
215
|
);
|
|
149
|
-
if (values.args.length > 0) throw new
|
|
150
|
-
if (values.prover === undefined)
|
|
216
|
+
if (values.args.length > 0) throw new TlaMethodError("Too many arguments", use);
|
|
217
|
+
if (values.prover === undefined)
|
|
218
|
+
throw new TlaMethodError("Missing prover name", settings[0].location);
|
|
219
|
+
const known = Object.hasOwn(PROVERS, values.prover) ? PROVERS[values.prover] : undefined;
|
|
220
|
+
if (!known) throw new TlaMethodError(`Unknown prover: ${values.prover}`, values.proverLocus);
|
|
221
|
+
if (values.rlimit !== undefined && !known.isBudgeted)
|
|
222
|
+
throw new TlaMethodError(
|
|
223
|
+
'A Z3 rlimit budget ("rN") is only supported by the SMT and Z3 backends.',
|
|
224
|
+
use,
|
|
225
|
+
);
|
|
151
226
|
return getProverMethod(values.prover, values.timeout, values.rlimit, values.tactic);
|
|
152
227
|
};
|
|
153
228
|
|
|
@@ -190,7 +265,7 @@ const getCitedMethods = (sequent: Sequent) => {
|
|
|
190
265
|
useLocation = hyp.useLocation;
|
|
191
266
|
}
|
|
192
267
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
193
|
-
methods.push(...entry.groups.map((group) => computeMethod(group, args)));
|
|
268
|
+
methods.push(...entry.groups.map((group) => computeMethod(group, args, expression.location)));
|
|
194
269
|
return;
|
|
195
270
|
}
|
|
196
271
|
if (entry?.kind !== "Meth") return;
|
|
@@ -200,7 +275,10 @@ const getCitedMethods = (sequent: Sequent) => {
|
|
|
200
275
|
return methods;
|
|
201
276
|
};
|
|
202
277
|
|
|
203
|
-
export const findMethods = (
|
|
278
|
+
export const findMethods = (
|
|
279
|
+
obligation: { sequent: Sequent; method?: OldMethod },
|
|
280
|
+
defaultMethods = DEFAULT_METHODS,
|
|
281
|
+
) => {
|
|
204
282
|
const methods =
|
|
205
283
|
obligation.method === undefined
|
|
206
284
|
? getCitedMethods(obligation.sequent)
|
|
@@ -210,6 +288,37 @@ export const findMethods = (obligation: { sequent: Sequent; method?: OldMethod }
|
|
|
210
288
|
frontends: new Set(
|
|
211
289
|
methods.flatMap((method) => (FRONTENDS.has(method.prover) ? [method.prover] : [])),
|
|
212
290
|
),
|
|
213
|
-
provers: provers.length > 0 ? provers :
|
|
291
|
+
provers: provers.length > 0 ? provers : defaultMethods,
|
|
214
292
|
};
|
|
215
293
|
};
|
|
294
|
+
|
|
295
|
+
const DEFAULT_METHOD_NAMES: Record<string, string> = {
|
|
296
|
+
zenon: "zenon",
|
|
297
|
+
smt: "smt",
|
|
298
|
+
z3: "z3",
|
|
299
|
+
cvc4: "cvc33",
|
|
300
|
+
yices: "yices3",
|
|
301
|
+
verit: "verit",
|
|
302
|
+
zipper: "zipper",
|
|
303
|
+
spass: "spass",
|
|
304
|
+
tptp: "tptp",
|
|
305
|
+
ls4: "ls4",
|
|
306
|
+
};
|
|
307
|
+
|
|
308
|
+
export const parseDefaultMethods = (text: string) =>
|
|
309
|
+
text.split(",").map((entry): Method => {
|
|
310
|
+
const separator = entry.indexOf(":");
|
|
311
|
+
const name = separator === -1 ? entry : entry.slice(0, separator);
|
|
312
|
+
const seconds = separator === -1 ? undefined : Number.parseFloat(entry.slice(separator + 1));
|
|
313
|
+
if (Number.isNaN(seconds))
|
|
314
|
+
throw new TlaProverError("--method: bad timeout specification: not a number");
|
|
315
|
+
if (name === "auto" || name === "blast" || name === "force")
|
|
316
|
+
return getProverMethod("isabelle", seconds, undefined, name);
|
|
317
|
+
if (name === "fail") return { prover: "fail", timeLimitMs: Infinity };
|
|
318
|
+
const known = Object.hasOwn(DEFAULT_METHOD_NAMES, name)
|
|
319
|
+
? DEFAULT_METHOD_NAMES[name]
|
|
320
|
+
: undefined;
|
|
321
|
+
if (known === undefined)
|
|
322
|
+
throw new TlaProverError(`--method: unknown method ${JSON.stringify(name)}`);
|
|
323
|
+
return getProverMethod(known, seconds, undefined, undefined);
|
|
324
|
+
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TlapmBugError, TlaProofError } from "../../errors";
|
|
1
|
+
import { TlapmBugError, TlaProofError, TlaProverError } from "../../errors";
|
|
2
2
|
import { expandActionOperators, lambdify } from "../../obligations/action";
|
|
3
3
|
import { createAnonymizer } from "../../obligations/anonymize";
|
|
4
4
|
import { isEqualExpr } from "../../obligations/equality";
|
|
@@ -14,7 +14,9 @@ import {
|
|
|
14
14
|
type ExceptPoint,
|
|
15
15
|
type Expr,
|
|
16
16
|
type Hyp,
|
|
17
|
+
type Locus,
|
|
17
18
|
type Sequent,
|
|
19
|
+
type Warn,
|
|
18
20
|
} from "../../obligations/expression";
|
|
19
21
|
import {
|
|
20
22
|
bumpBy,
|
|
@@ -178,18 +180,32 @@ export const normalizeSequent = (sequent: Sequent): Sequent => {
|
|
|
178
180
|
: { context: inlined.context, active };
|
|
179
181
|
};
|
|
180
182
|
|
|
181
|
-
|
|
183
|
+
// Only the first frontend the methods cite, in tlapm's order, transforms the obligation.
|
|
184
|
+
const expandEnabledCdot = (
|
|
185
|
+
sequent: Sequent,
|
|
186
|
+
locus: Locus | undefined,
|
|
187
|
+
isEnabledAxiomsSound: boolean | undefined,
|
|
188
|
+
frontends: Set<string>,
|
|
189
|
+
onWarning: Warn,
|
|
190
|
+
): Sequent => {
|
|
182
191
|
const isEnabled = frontends.has("expandenabled");
|
|
183
192
|
const isCdot = frontends.has("expandcdot");
|
|
184
193
|
const isAutoUse = frontends.has("autouse");
|
|
185
194
|
const isLambdify = frontends.has("lambdify");
|
|
186
195
|
if (!isEnabled && !isCdot && !isLambdify) {
|
|
187
196
|
if (frontends.has("levelcomparison")) return checkLevelChange(sequent);
|
|
188
|
-
if (frontends.has("enabledaxioms")) return
|
|
189
|
-
|
|
197
|
+
if (!frontends.has("enabledaxioms")) return sequent;
|
|
198
|
+
if (isEnabledAxiomsSound !== undefined)
|
|
199
|
+
onWarning({ text: "expr has ENABLEDaxioms property ===", channel: "stdout" });
|
|
200
|
+
if (isEnabledAxiomsSound === false)
|
|
201
|
+
throw new TlaProverError("ENABLEDaxioms depends on assumptions of level > 1 \n\n");
|
|
202
|
+
return implicationToEnabled(sequent, locus, onWarning);
|
|
190
203
|
}
|
|
204
|
+
// An obligation has no proof step to label and no instance to expand.
|
|
191
205
|
const anonymizer = createAnonymizer(
|
|
192
|
-
|
|
206
|
+
() => {
|
|
207
|
+
throw new TlapmBugError();
|
|
208
|
+
},
|
|
193
209
|
() => {
|
|
194
210
|
throw new TlapmBugError();
|
|
195
211
|
},
|
|
@@ -198,12 +214,12 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
198
214
|
const expression: Expr = { kind: "Sequent", sequent };
|
|
199
215
|
const result =
|
|
200
216
|
isEnabled || isCdot
|
|
201
|
-
? expandActionOperators(anonymizer,
|
|
217
|
+
? expandActionOperators(anonymizer, onWarning, undefined, expression, {
|
|
202
218
|
isEnabled,
|
|
203
219
|
isCdot,
|
|
204
220
|
isAutoUse,
|
|
205
221
|
})
|
|
206
|
-
: lambdify(anonymizer,
|
|
222
|
+
: lambdify(anonymizer, onWarning, undefined, expression, {
|
|
207
223
|
isEnabled: true,
|
|
208
224
|
isCdot: true,
|
|
209
225
|
isAutoUse,
|
|
@@ -213,9 +229,22 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
213
229
|
};
|
|
214
230
|
|
|
215
231
|
export const normalizeExpand = (
|
|
216
|
-
obligation: {
|
|
232
|
+
obligation: {
|
|
233
|
+
sequent: Sequent;
|
|
234
|
+
method?: OldMethod;
|
|
235
|
+
locus?: Locus;
|
|
236
|
+
isEnabledAxiomsSound?: boolean;
|
|
237
|
+
},
|
|
217
238
|
methods = findMethods(obligation),
|
|
218
|
-
) =>
|
|
239
|
+
onWarning: Warn = () => {},
|
|
240
|
+
) =>
|
|
241
|
+
expandEnabledCdot(
|
|
242
|
+
normalizeSequent(expandDefs(obligation.sequent)),
|
|
243
|
+
obligation.locus,
|
|
244
|
+
obligation.isEnabledAxiomsSound,
|
|
245
|
+
methods.frontends,
|
|
246
|
+
onWarning,
|
|
247
|
+
);
|
|
219
248
|
|
|
220
249
|
export const isTrivial = (sequent: Sequent) =>
|
|
221
250
|
(sequent.active.kind === "Internal" && sequent.active.builtin === "TRUE") ||
|