tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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 +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- 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 -16
- 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 +626 -56
- 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 +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- 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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +179 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- 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 +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +21 -26
- 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 +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- 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 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- 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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +1210 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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
|
@@ -1,23 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
// prover with its time limit, or a frontend that rewrites the obligation first. A malformed method
|
|
3
|
-
// throws a TlaProverError, since Prep.ship catches compute_meth's failure and fails only that
|
|
4
|
-
// obligation.
|
|
5
|
-
|
|
6
|
-
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
1
|
+
import { TlaMethodError, TlapmBugError, TlaProverError } from "../../errors";
|
|
7
2
|
import type { Expr, Locus, Sequent } from "../../obligations/expression";
|
|
8
3
|
import type { OldMethod, PragmaSetting } from "../../obligations/pragma";
|
|
4
|
+
import type { Backend } from "../verdict";
|
|
5
|
+
|
|
6
|
+
type Prover =
|
|
7
|
+
| Backend
|
|
8
|
+
| "yices"
|
|
9
|
+
| "cvc4"
|
|
10
|
+
| "cooper"
|
|
11
|
+
| "fail"
|
|
12
|
+
| "verit"
|
|
13
|
+
| "zipper"
|
|
14
|
+
| "spass"
|
|
15
|
+
| "tptp"
|
|
16
|
+
| "trivial"
|
|
17
|
+
| "expandenabled"
|
|
18
|
+
| "expandcdot"
|
|
19
|
+
| "autouse"
|
|
20
|
+
| "lambdify"
|
|
21
|
+
| "enabledaxioms"
|
|
22
|
+
| "levelcomparison";
|
|
9
23
|
|
|
10
|
-
// A method, named after the Method.t constructor tlapm reports it by. A Z3 resource budget turns
|
|
11
|
-
// the time limit off.
|
|
12
24
|
export interface Method {
|
|
13
|
-
prover:
|
|
25
|
+
prover: Prover;
|
|
14
26
|
timeLimitMs: number;
|
|
15
27
|
rlimit?: number;
|
|
16
28
|
tactic?: string;
|
|
17
29
|
}
|
|
18
30
|
|
|
19
|
-
|
|
20
|
-
|
|
31
|
+
export const getBudget = (method: Method) => method.rlimit ?? method.timeLimitMs / 1000;
|
|
32
|
+
|
|
33
|
+
export const FRONTENDS = new Set<Prover>([
|
|
21
34
|
"expandenabled",
|
|
22
35
|
"expandcdot",
|
|
23
36
|
"autouse",
|
|
@@ -26,40 +39,35 @@ const FRONTENDS = new Set([
|
|
|
26
39
|
"levelcomparison",
|
|
27
40
|
]);
|
|
28
41
|
|
|
29
|
-
// Method.default_*_timeout, in seconds.
|
|
30
42
|
const SMT_SECONDS = 5;
|
|
31
43
|
const ZENON_SECONDS = 10;
|
|
32
44
|
const ISABELLE_SECONDS = 30;
|
|
33
45
|
const LS4_SECONDS = 10;
|
|
34
46
|
|
|
35
|
-
// Method.rlimit_base and Method.max_rlimit.
|
|
36
47
|
const RLIMIT_BASE = 3_000_000;
|
|
37
48
|
const MAX_RLIMIT = 0xffff_ffff;
|
|
38
49
|
|
|
39
|
-
// Params.default_method: what tlapm tries when a step cites no prover.
|
|
40
50
|
const DEFAULT_METHODS: Method[] = [
|
|
41
51
|
{ prover: "smt", timeLimitMs: SMT_SECONDS * 1000 },
|
|
42
52
|
{ prover: "zenon", timeLimitMs: ZENON_SECONDS * 1000 },
|
|
43
53
|
{ prover: "isabelle", timeLimitMs: ISABELLE_SECONDS * 1000, tactic: "auto" },
|
|
44
54
|
];
|
|
45
55
|
|
|
46
|
-
|
|
47
|
-
// selects. The SMT solvers take a resource budget.
|
|
48
|
-
const PROVERS: Record<string, { prover: string; seconds: number; isBudgeted?: boolean }> = {
|
|
56
|
+
const PROVERS: Record<string, { prover: Prover; seconds: number; isBudgeted?: boolean }> = {
|
|
49
57
|
zenon: { prover: "zenon", seconds: ZENON_SECONDS },
|
|
50
58
|
isabelle: { prover: "isabelle", seconds: ISABELLE_SECONDS },
|
|
51
59
|
yices: { prover: "yices", seconds: 30 },
|
|
52
60
|
ls4: { prover: "ls4", seconds: LS4_SECONDS },
|
|
53
61
|
z3: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
54
62
|
smt: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
55
|
-
cvc3: { prover: "
|
|
56
|
-
cooper: { prover: "cooper", seconds:
|
|
57
|
-
fail: { prover: "fail", seconds:
|
|
63
|
+
cvc3: { prover: "cvc4", seconds: SMT_SECONDS },
|
|
64
|
+
cooper: { prover: "cooper", seconds: Infinity },
|
|
65
|
+
fail: { prover: "fail", seconds: Infinity },
|
|
58
66
|
smt2lib: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
59
67
|
smt2z3: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
60
68
|
smt3: { prover: "smt", seconds: SMT_SECONDS, isBudgeted: true },
|
|
61
69
|
z33: { prover: "z3", seconds: SMT_SECONDS, isBudgeted: true },
|
|
62
|
-
cvc33: { prover: "
|
|
70
|
+
cvc33: { prover: "cvc4", seconds: SMT_SECONDS },
|
|
63
71
|
yices3: { prover: "yices", seconds: SMT_SECONDS },
|
|
64
72
|
verit: { prover: "verit", seconds: SMT_SECONDS },
|
|
65
73
|
zipper: { prover: "zipper", seconds: 30 },
|
|
@@ -69,84 +77,155 @@ const PROVERS: Record<string, { prover: string; seconds: number; isBudgeted?: bo
|
|
|
69
77
|
...Object.fromEntries([...FRONTENDS].map((name) => [name, { prover: name, seconds: 0 }])),
|
|
70
78
|
};
|
|
71
79
|
|
|
80
|
+
const UNTIMED_PROVERS = new Set<Prover>(["cooper", "fail", "trivial", ...FRONTENDS]);
|
|
81
|
+
|
|
72
82
|
const getProverMethod = (
|
|
73
83
|
name: string,
|
|
74
84
|
timeout: number | undefined,
|
|
75
85
|
rlimit: number | undefined,
|
|
76
86
|
tactic: string | undefined,
|
|
77
87
|
): Method => {
|
|
78
|
-
const known = PROVERS[name];
|
|
88
|
+
const known = Object.hasOwn(PROVERS, name) ? PROVERS[name] : undefined;
|
|
79
89
|
if (!known) throw new TlaProverError(`Unknown prover: ${name}`);
|
|
80
|
-
if (rlimit !== undefined && !known.isBudgeted)
|
|
81
|
-
throw new TlaProverError(
|
|
82
|
-
'A Z3 rlimit budget ("rN") is only supported by the SMT and Z3 backends.',
|
|
83
|
-
);
|
|
84
90
|
return {
|
|
85
91
|
prover: known.prover,
|
|
86
|
-
timeLimitMs:
|
|
92
|
+
timeLimitMs:
|
|
93
|
+
rlimit !== undefined
|
|
94
|
+
? Infinity
|
|
95
|
+
: ((UNTIMED_PROVERS.has(known.prover) ? undefined : timeout) ?? known.seconds) * 1000,
|
|
87
96
|
...(rlimit !== undefined && { rlimit }),
|
|
88
97
|
...(known.prover === "isabelle" && { tactic: tactic ?? "auto" }),
|
|
89
98
|
};
|
|
90
99
|
};
|
|
91
100
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
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
|
+
);
|
|
97
153
|
return Math.max(1, Math.trunc(Math.min(count * RLIMIT_BASE, MAX_RLIMIT)));
|
|
98
154
|
};
|
|
99
155
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
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>(
|
|
110
168
|
(state, setting) => {
|
|
111
169
|
const value = setting.value;
|
|
112
170
|
const argument = value.kind === "Default" ? state.args[0] : undefined;
|
|
113
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
|
+
);
|
|
114
177
|
if (value.kind === "Default" && !argument)
|
|
115
|
-
throw new
|
|
116
|
-
|
|
117
|
-
value.kind === "
|
|
118
|
-
|
|
119
|
-
:
|
|
120
|
-
|
|
121
|
-
: undefined;
|
|
122
|
-
switch (setting.hint) {
|
|
123
|
-
case "prover":
|
|
124
|
-
case "tactic":
|
|
125
|
-
if (text === undefined) throw new TlaProverError(`This argument should be a string`);
|
|
126
|
-
return { ...state, args: rest, [setting.hint]: text };
|
|
127
|
-
case "timeout": {
|
|
128
|
-
if (value.kind === "Float") return { ...state, args: rest, timeout: value.value };
|
|
129
|
-
if (text !== undefined) return { ...state, args: rest, rlimit: getRlimit(text) };
|
|
130
|
-
if (argument?.kind !== "Num")
|
|
131
|
-
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")
|
|
132
184
|
return {
|
|
133
185
|
...state,
|
|
134
186
|
args: rest,
|
|
135
187
|
timeout: Number(`${argument.integer}.${argument.fraction}`),
|
|
136
188
|
};
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
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);
|
|
140
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
|
+
};
|
|
141
213
|
},
|
|
142
214
|
{ args },
|
|
143
215
|
);
|
|
144
|
-
if (values.args.length > 0) throw new
|
|
145
|
-
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
|
+
);
|
|
146
226
|
return getProverMethod(values.prover, values.timeout, values.rlimit, values.tactic);
|
|
147
227
|
};
|
|
148
228
|
|
|
149
|
-
// An old-style method, as Method_prs reads it, with its default time unless it names one.
|
|
150
229
|
const getOldMethod = (method: OldMethod) =>
|
|
151
230
|
getProverMethod(method.name, method.timeout, undefined, method.tactic);
|
|
152
231
|
|
|
@@ -155,21 +234,14 @@ type Cited =
|
|
|
155
234
|
| { kind: "Meth"; method: OldMethod }
|
|
156
235
|
| undefined;
|
|
157
236
|
|
|
158
|
-
// find_meth: an obligation whose proof names a method keeps it. Otherwise each visible fact that
|
|
159
|
-
// cites a pragma, alone or applied to arguments, adds the methods its groups compute, and each that
|
|
160
|
-
// cites a theorem or carries an old-style method adds that method. A pragma that a fact from
|
|
161
|
-
// another BY or USE cites drops the methods found so far: tlapm compares the USE locations
|
|
162
|
-
// physically, as tla-ts compares the objects.
|
|
163
237
|
const getCitedMethods = (sequent: Sequent) => {
|
|
164
238
|
const cited: Cited[] = [];
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
useLocation: null,
|
|
168
|
-
};
|
|
239
|
+
let methods: Method[] = [];
|
|
240
|
+
let useLocation: Locus | undefined | null = null;
|
|
169
241
|
sequent.context.forEach((hyp, index) => {
|
|
170
242
|
const expression = hyp.kind === "Fact" && hyp.visibility === "Visible" && hyp.expression;
|
|
171
243
|
if (expression && expression.kind === "With") {
|
|
172
|
-
|
|
244
|
+
methods.push(getOldMethod(expression.method));
|
|
173
245
|
cited.push(undefined);
|
|
174
246
|
return;
|
|
175
247
|
}
|
|
@@ -188,25 +260,25 @@ const getCitedMethods = (sequent: Sequent) => {
|
|
|
188
260
|
if (operator.kind !== "Ix") return;
|
|
189
261
|
const entry = cited[index - operator.index];
|
|
190
262
|
if (entry?.kind === "Premeth") {
|
|
191
|
-
if (hyp.useLocation !==
|
|
192
|
-
|
|
193
|
-
|
|
263
|
+
if (hyp.useLocation !== useLocation) {
|
|
264
|
+
methods = [];
|
|
265
|
+
useLocation = hyp.useLocation;
|
|
194
266
|
}
|
|
195
267
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
196
|
-
|
|
268
|
+
methods.push(...entry.groups.map((group) => computeMethod(group, args, expression.location)));
|
|
197
269
|
return;
|
|
198
270
|
}
|
|
199
271
|
if (entry?.kind !== "Meth") return;
|
|
200
|
-
// find_meth asserts that a theorem with a method is not applied to arguments.
|
|
201
272
|
if (expression.kind === "Apply") throw new TlapmBugError();
|
|
202
|
-
|
|
273
|
+
methods.push(getOldMethod(entry.method));
|
|
203
274
|
});
|
|
204
|
-
return
|
|
275
|
+
return methods;
|
|
205
276
|
};
|
|
206
277
|
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
278
|
+
export const findMethods = (
|
|
279
|
+
obligation: { sequent: Sequent; method?: OldMethod },
|
|
280
|
+
defaultMethods = DEFAULT_METHODS,
|
|
281
|
+
) => {
|
|
210
282
|
const methods =
|
|
211
283
|
obligation.method === undefined
|
|
212
284
|
? getCitedMethods(obligation.sequent)
|
|
@@ -216,6 +288,37 @@ export const findMethods = (obligation: { sequent: Sequent; method?: OldMethod }
|
|
|
216
288
|
frontends: new Set(
|
|
217
289
|
methods.flatMap((method) => (FRONTENDS.has(method.prover) ? [method.prover] : [])),
|
|
218
290
|
),
|
|
219
|
-
provers: provers.length > 0 ? provers :
|
|
291
|
+
provers: provers.length > 0 ? provers : defaultMethods,
|
|
220
292
|
};
|
|
221
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,8 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
// expands definitions, runs Expr.Elab.normalize and the frontend methods the obligation cites, then
|
|
3
|
-
// trivial and flatten.
|
|
4
|
-
|
|
5
|
-
import { TlapmBugError, TlaProofError } from "../../errors";
|
|
1
|
+
import { TlapmBugError, TlaProofError, TlaProverError } from "../../errors";
|
|
6
2
|
import { expandActionOperators, lambdify } from "../../obligations/action";
|
|
7
3
|
import { createAnonymizer } from "../../obligations/anonymize";
|
|
8
4
|
import { isEqualExpr } from "../../obligations/equality";
|
|
@@ -18,7 +14,9 @@ import {
|
|
|
18
14
|
type ExceptPoint,
|
|
19
15
|
type Expr,
|
|
20
16
|
type Hyp,
|
|
17
|
+
type Locus,
|
|
21
18
|
type Sequent,
|
|
19
|
+
type Warn,
|
|
22
20
|
} from "../../obligations/expression";
|
|
23
21
|
import {
|
|
24
22
|
bumpBy,
|
|
@@ -50,9 +48,6 @@ const expandDefinitionsAndPragmas = createDefinitionExpander(true);
|
|
|
50
48
|
|
|
51
49
|
const expandDefinitions = createDefinitionExpander(false);
|
|
52
50
|
|
|
53
|
-
// expand_defs: each visible operator definition and each pragma, whatever its visibility,
|
|
54
|
-
// substitutes into the rest of the obligation and leaves the context. Toolbox.expand_defs leaves
|
|
55
|
-
// the pragmas.
|
|
56
51
|
export const expandDefs = (sequent: Sequent, isPragmaExpanded = true): Sequent => {
|
|
57
52
|
const expanded = (isPragmaExpanded ? expandDefinitionsAndPragmas : expandDefinitions)(
|
|
58
53
|
sequent.context,
|
|
@@ -64,7 +59,6 @@ type ExceptSpec = Extract<Expr, { kind: "Except" }>["specs"][number];
|
|
|
64
59
|
|
|
65
60
|
const TEMPORAL_BUILTINS = new Set(["BoxTrue", "BoxFalse", "Diamond", "Actplus", "Leadsto", "Cdot"]);
|
|
66
61
|
|
|
67
|
-
// The expressions of a hypothesis that Visit.iter visits, none for a hidden one.
|
|
68
62
|
const getVisitedExprs = (hyp: Hyp): Expr[] => {
|
|
69
63
|
switch (hyp.kind) {
|
|
70
64
|
case "Fresh":
|
|
@@ -81,7 +75,6 @@ const getVisitedExprs = (hyp: Hyp): Expr[] => {
|
|
|
81
75
|
}
|
|
82
76
|
};
|
|
83
77
|
|
|
84
|
-
// Elab.non_temporal: no temporal operator, but in hidden hypotheses.
|
|
85
78
|
const isNonTemporal = (expression: Expr): boolean => {
|
|
86
79
|
if (expression.kind === "Tsub" || expression.kind === "Fair") return false;
|
|
87
80
|
if (
|
|
@@ -97,10 +90,9 @@ const isNonTemporal = (expression: Expr): boolean => {
|
|
|
97
90
|
return getChildren(expression).every(isNonTemporal);
|
|
98
91
|
};
|
|
99
92
|
|
|
100
|
-
// Elab.let_normalize: each LET definition is substituted into the rest of the LET.
|
|
101
93
|
const normalizeLet = (expression: Expr): Expr => {
|
|
102
94
|
if (expression.kind !== "Let") return mapChildren(expression, normalizeLet);
|
|
103
|
-
const
|
|
95
|
+
const definition = expression.definitions[0];
|
|
104
96
|
if (!definition) return normalizeLet(expression.body);
|
|
105
97
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
106
98
|
throw new TlaProofError(
|
|
@@ -110,7 +102,7 @@ const normalizeLet = (expression: Expr): Expr => {
|
|
|
110
102
|
);
|
|
111
103
|
}
|
|
112
104
|
const operator = normalizeLet(definition.body);
|
|
113
|
-
const rest: Expr = { ...expression, definitions };
|
|
105
|
+
const rest: Expr = { ...expression, definitions: expression.definitions.slice(1) };
|
|
114
106
|
return normalizeLet(substituteExpr(consSubstitution(operator, shift(0)), rest));
|
|
115
107
|
};
|
|
116
108
|
|
|
@@ -124,7 +116,6 @@ const isSameHead = (left: ExceptPoint, right: ExceptPoint) =>
|
|
|
124
116
|
? right.kind === "Dot" && left.field === right.field
|
|
125
117
|
: right.kind === "Apply" && isEqualExpr(left.expression, right.expression);
|
|
126
118
|
|
|
127
|
-
// The field of a record constructor that a point names, as a field or as a string argument.
|
|
128
119
|
const getRecordField = (record: Expr, point: ExceptPoint) => {
|
|
129
120
|
const name =
|
|
130
121
|
point.kind === "Dot"
|
|
@@ -137,8 +128,6 @@ const getRecordField = (record: Expr, point: ExceptPoint) => {
|
|
|
137
128
|
: undefined;
|
|
138
129
|
};
|
|
139
130
|
|
|
140
|
-
// Elab.except_normalize: [f EXCEPT p1 = b1, ...] folds left to right into f, sharing each prefix of
|
|
141
|
-
// adjacent updates and updating a record constructor in place on a field it has.
|
|
142
131
|
const normalizeExcept = (expression: Expr): Expr => {
|
|
143
132
|
if (expression.kind !== "Except") return mapChildren(expression, normalizeExcept);
|
|
144
133
|
const except = expression;
|
|
@@ -154,9 +143,9 @@ const normalizeExcept = (expression: Expr): Expr => {
|
|
|
154
143
|
return at({ kind: "Record", fields }, base);
|
|
155
144
|
};
|
|
156
145
|
const apply = (base: Expr, specs: ExceptSpec[]): Expr => {
|
|
157
|
-
const
|
|
146
|
+
const first = specs[0];
|
|
158
147
|
if (!first) return base;
|
|
159
|
-
if (first.trail.length === 0) return apply(first.value,
|
|
148
|
+
if (first.trail.length === 0) return apply(first.value, specs.slice(1));
|
|
160
149
|
const head = first.trail[0];
|
|
161
150
|
const end = specs.findIndex(
|
|
162
151
|
(spec) => spec.trail.length === 0 || !isSameHead(spec.trail[0], head),
|
|
@@ -170,7 +159,6 @@ const normalizeExcept = (expression: Expr): Expr => {
|
|
|
170
159
|
return apply(normalizeExcept(except.function), mapExceptSpecs(except.specs, normalizeExcept));
|
|
171
160
|
};
|
|
172
161
|
|
|
173
|
-
// let_normalize on each hypothesis, and whether the context so far is non_temporal.
|
|
174
162
|
const normalizeLetContext = createContextMap(true, (isContextNonTemporal, hyp) => [
|
|
175
163
|
isContextNonTemporal && getVisitedExprs(hyp).every(isNonTemporal),
|
|
176
164
|
mapHyp(hyp, normalizeLet, "all"),
|
|
@@ -181,8 +169,6 @@ const normalizeExceptContext = createContextMap(undefined, (_state, hyp) => [
|
|
|
181
169
|
mapHyp(hyp, normalizeExcept, "all"),
|
|
182
170
|
]);
|
|
183
171
|
|
|
184
|
-
// Elab.normalize, on an obligation as a sequent expression, as Prep.normalize_expr calls it: LET
|
|
185
|
-
// definitions inline, and the updates of an EXCEPT fold into the function they update.
|
|
186
172
|
export const normalizeSequent = (sequent: Sequent): Sequent => {
|
|
187
173
|
const inlined = normalizeLetContext(sequent.context);
|
|
188
174
|
const active = normalizeLet(sequent.active);
|
|
@@ -194,21 +180,32 @@ export const normalizeSequent = (sequent: Sequent): Sequent => {
|
|
|
194
180
|
: { context: inlined.context, active };
|
|
195
181
|
};
|
|
196
182
|
|
|
197
|
-
//
|
|
198
|
-
|
|
199
|
-
|
|
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 => {
|
|
200
191
|
const isEnabled = frontends.has("expandenabled");
|
|
201
192
|
const isCdot = frontends.has("expandcdot");
|
|
202
193
|
const isAutoUse = frontends.has("autouse");
|
|
203
194
|
const isLambdify = frontends.has("lambdify");
|
|
204
195
|
if (!isEnabled && !isCdot && !isLambdify) {
|
|
205
196
|
if (frontends.has("levelcomparison")) return checkLevelChange(sequent);
|
|
206
|
-
if (frontends.has("enabledaxioms")) return
|
|
207
|
-
|
|
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);
|
|
208
203
|
}
|
|
209
|
-
//
|
|
204
|
+
// An obligation has no proof step to label and no instance to expand.
|
|
210
205
|
const anonymizer = createAnonymizer(
|
|
211
|
-
|
|
206
|
+
() => {
|
|
207
|
+
throw new TlapmBugError();
|
|
208
|
+
},
|
|
212
209
|
() => {
|
|
213
210
|
throw new TlapmBugError();
|
|
214
211
|
},
|
|
@@ -217,12 +214,12 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
217
214
|
const expression: Expr = { kind: "Sequent", sequent };
|
|
218
215
|
const result =
|
|
219
216
|
isEnabled || isCdot
|
|
220
|
-
? expandActionOperators(anonymizer,
|
|
217
|
+
? expandActionOperators(anonymizer, onWarning, undefined, expression, {
|
|
221
218
|
isEnabled,
|
|
222
219
|
isCdot,
|
|
223
220
|
isAutoUse,
|
|
224
221
|
})
|
|
225
|
-
: lambdify(anonymizer,
|
|
222
|
+
: lambdify(anonymizer, onWarning, undefined, expression, {
|
|
226
223
|
isEnabled: true,
|
|
227
224
|
isCdot: true,
|
|
228
225
|
isAutoUse,
|
|
@@ -231,14 +228,24 @@ const expandEnabledCdot = (sequent: Sequent, frontends: Set<string>): Sequent =>
|
|
|
231
228
|
return result.sequent;
|
|
232
229
|
};
|
|
233
230
|
|
|
234
|
-
// normalize_expand: expand_defs, Elab.normalize, then the frontends the obligation cites.
|
|
235
231
|
export const normalizeExpand = (
|
|
236
|
-
obligation: {
|
|
232
|
+
obligation: {
|
|
233
|
+
sequent: Sequent;
|
|
234
|
+
method?: OldMethod;
|
|
235
|
+
locus?: Locus;
|
|
236
|
+
isEnabledAxiomsSound?: boolean;
|
|
237
|
+
},
|
|
237
238
|
methods = findMethods(obligation),
|
|
238
|
-
) =>
|
|
239
|
+
onWarning: Warn = () => {},
|
|
240
|
+
) =>
|
|
241
|
+
expandEnabledCdot(
|
|
242
|
+
normalizeSequent(expandDefs(obligation.sequent)),
|
|
243
|
+
obligation.locus,
|
|
244
|
+
obligation.isEnabledAxiomsSound,
|
|
245
|
+
methods.frontends,
|
|
246
|
+
onWarning,
|
|
247
|
+
);
|
|
239
248
|
|
|
240
|
-
// trivial: the goal is TRUE, or find_fact finds it as a hypothesis, visible or not: a fact
|
|
241
|
-
// alpha-equivalent to it, or the x \in S of a declaration NEW x \in S.
|
|
242
249
|
export const isTrivial = (sequent: Sequent) =>
|
|
243
250
|
(sequent.active.kind === "Internal" && sequent.active.builtin === "TRUE") ||
|
|
244
251
|
sequent.context.some((hyp, index) => {
|
|
@@ -253,7 +260,6 @@ export const isTrivial = (sequent: Sequent) =>
|
|
|
253
260
|
|
|
254
261
|
const isUnbounded = (bound: Bound) => bound.domain.kind === "NoDomain";
|
|
255
262
|
|
|
256
|
-
// extract_equalities: the equalities in a conjunction, apart from the rest of it.
|
|
257
263
|
const extractEqualities = (expression: Expr): [Expr[], Expr | undefined] => {
|
|
258
264
|
if (expression.kind === "List" && (expression.bullet === "And" || expression.bullet === "Refs")) {
|
|
259
265
|
const parts = expression.items.map(extractEqualities);
|
|
@@ -290,7 +296,6 @@ const extractEqualities = (expression: Expr): [Expr[], Expr | undefined] => {
|
|
|
290
296
|
return [[], expression];
|
|
291
297
|
};
|
|
292
298
|
|
|
293
|
-
// flatten: each visible fact becomes the rest of it, then its equalities.
|
|
294
299
|
export const flatten = (sequent: Sequent): Sequent => {
|
|
295
300
|
const context: Hyp[] = [];
|
|
296
301
|
const substitution = sequent.context.reduce<Substitution>((current, hyp) => {
|