tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Provers/classical.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { revcutRl, thinRl, zeroVarIndexes, makeElim } from "../pure/drule";
|
|
5
3
|
import { selectGoal } from "../pure/goal";
|
|
@@ -7,13 +5,14 @@ import { aconv, sizeOfTerm, type Term } from "../pure/term";
|
|
|
7
5
|
import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
|
|
8
6
|
import { listOfSeq, seqHead } from "../pure/seq";
|
|
9
7
|
import { trade } from "../pure/variable";
|
|
10
|
-
import { atomizePremsTac } from "../pure/object-logic";
|
|
8
|
+
import { atomizePremsTac, flatRule } from "../pure/object-logic";
|
|
11
9
|
import { bestFirst } from "../pure/search";
|
|
12
10
|
import {
|
|
13
11
|
allGoals,
|
|
14
12
|
allTac,
|
|
15
13
|
appendGoal,
|
|
16
14
|
condTac,
|
|
15
|
+
depthSolve,
|
|
17
16
|
firstGoal,
|
|
18
17
|
firstGoalTac,
|
|
19
18
|
hasFewerPrems,
|
|
@@ -53,6 +52,7 @@ import {
|
|
|
53
52
|
type BiresRule,
|
|
54
53
|
type Thm,
|
|
55
54
|
} from "../pure/thm";
|
|
55
|
+
import type { ContextRule } from "../tools/intuitionistic";
|
|
56
56
|
|
|
57
57
|
export interface ClassicalRule {
|
|
58
58
|
readonly rule: Thm;
|
|
@@ -78,6 +78,7 @@ export interface Claset {
|
|
|
78
78
|
readonly safep: NetPair<TaggedRule>;
|
|
79
79
|
readonly unsafe: NetPair<TaggedRule>;
|
|
80
80
|
readonly dup: NetPair<TaggedRule>;
|
|
81
|
+
readonly extra: NetPair<ContextRule>;
|
|
81
82
|
}
|
|
82
83
|
|
|
83
84
|
export interface ClassicalData {
|
|
@@ -167,25 +168,29 @@ const insertRules = (
|
|
|
167
168
|
...intros.map((rule) => ({ isElim: false, rule })),
|
|
168
169
|
]).reduceRight((result, tagged) => insertTaggedBrl(tagged, result), netpair);
|
|
169
170
|
|
|
171
|
+
// insert' with the default weight of an unsafe rule.
|
|
172
|
+
const insertExtra = (
|
|
173
|
+
counts: readonly [number, number],
|
|
174
|
+
isElim: boolean,
|
|
175
|
+
rule: Thm,
|
|
176
|
+
netpair: NetPair<ContextRule>,
|
|
177
|
+
) => insertTaggedBrl({ weight: 1, tag: -(counts[0] + counts[1]), isElim, rule }, netpair);
|
|
178
|
+
|
|
170
179
|
const isMember = (rules: readonly ClassicalRule[], rule: ClassicalRule) =>
|
|
171
180
|
rules.some((other) => aconv(other.rule.prop, rule.rule.prop));
|
|
172
181
|
|
|
173
|
-
export const addUnsafeIntro = (
|
|
182
|
+
export const addUnsafeIntro = (
|
|
183
|
+
context: ClassicalContext,
|
|
184
|
+
rule: Thm,
|
|
185
|
+
atomizeRules: readonly Thm[],
|
|
186
|
+
): Claset => {
|
|
174
187
|
const claset = context.claset;
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
(premise) =>
|
|
178
|
-
premise.kind === "App" &&
|
|
179
|
-
premise.fun.kind === "Const" &&
|
|
180
|
-
premise.fun.name.startsWith("Pure."),
|
|
181
|
-
)
|
|
182
|
-
)
|
|
183
|
-
throw new TlaIsabelleError("ERROR", "Rules with meta-level premises are not supported");
|
|
184
|
-
const dup = dupIntr(context.data, rule);
|
|
188
|
+
const flat = flatRule(context.limits, atomizeRules, rule);
|
|
189
|
+
const dup = dupIntr(context.data, flat);
|
|
185
190
|
const entry: ClassicalRule = {
|
|
186
191
|
rule,
|
|
187
|
-
internal:
|
|
188
|
-
swapped: swapify(context.data, [
|
|
192
|
+
internal: flat,
|
|
193
|
+
swapped: swapify(context.data, [flat]),
|
|
189
194
|
dup,
|
|
190
195
|
dupSwapped: swapify(context.data, [dup]),
|
|
191
196
|
};
|
|
@@ -196,13 +201,22 @@ export const addUnsafeIntro = (context: ClassicalContext, rule: Thm): Claset =>
|
|
|
196
201
|
unsafeIs: [entry, ...claset.unsafeIs],
|
|
197
202
|
unsafe: insertRules(counts, [entry.internal], entry.swapped, claset.unsafe),
|
|
198
203
|
dup: insertRules(counts, [entry.dup], entry.dupSwapped, claset.dup),
|
|
204
|
+
extra: insertExtra(counts, false, rule, claset.extra),
|
|
199
205
|
};
|
|
200
206
|
};
|
|
201
207
|
|
|
202
|
-
const addUnsafeElim = (
|
|
208
|
+
export const addUnsafeElim = (
|
|
209
|
+
context: ClassicalContext,
|
|
210
|
+
rule: Thm,
|
|
211
|
+
atomizeRules: readonly Thm[],
|
|
212
|
+
): Claset => {
|
|
203
213
|
const claset = context.claset;
|
|
204
214
|
if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed elimination rule");
|
|
205
|
-
const internal = classicalRule(
|
|
215
|
+
const internal = classicalRule(
|
|
216
|
+
context.data,
|
|
217
|
+
flatRule(context.limits, atomizeRules, rule),
|
|
218
|
+
context.limits,
|
|
219
|
+
);
|
|
206
220
|
const entry: ClassicalRule = {
|
|
207
221
|
rule,
|
|
208
222
|
internal,
|
|
@@ -217,12 +231,17 @@ const addUnsafeElim = (context: ClassicalContext, rule: Thm): Claset => {
|
|
|
217
231
|
unsafeEs: [entry, ...claset.unsafeEs],
|
|
218
232
|
unsafe: insertRules(counts, [], [entry.internal], claset.unsafe),
|
|
219
233
|
dup: insertRules(counts, [], [entry.dup], claset.dup),
|
|
234
|
+
extra: insertExtra(counts, true, rule, claset.extra),
|
|
220
235
|
};
|
|
221
236
|
};
|
|
222
237
|
|
|
223
|
-
export const addUnsafeDest = (
|
|
238
|
+
export const addUnsafeDest = (
|
|
239
|
+
context: ClassicalContext,
|
|
240
|
+
rule: Thm,
|
|
241
|
+
atomizeRules: readonly Thm[],
|
|
242
|
+
): Claset => {
|
|
224
243
|
if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed destruction rule");
|
|
225
|
-
return addUnsafeElim(context, makeElim(rule));
|
|
244
|
+
return addUnsafeElim(context, makeElim(rule), atomizeRules);
|
|
226
245
|
};
|
|
227
246
|
|
|
228
247
|
const updateWrappers = (wrappers: readonly Wrapper[], wrapper: Wrapper) =>
|
|
@@ -348,6 +367,12 @@ const stepTac =
|
|
|
348
367
|
appWrappers(context, orElseGoal(instStepTac(context), unsafeStepTac(context)))(index),
|
|
349
368
|
);
|
|
350
369
|
|
|
370
|
+
export const fastTac = (context: ClassicalContext, atomizeRules: readonly Thm[]): GoalTactic =>
|
|
371
|
+
thenGoal(
|
|
372
|
+
atomizePremsTac(context.limits, atomizeRules),
|
|
373
|
+
selectGoal(depthSolve(stepTac(context)(1))),
|
|
374
|
+
);
|
|
375
|
+
|
|
351
376
|
const sizeOfThm = (thm: Thm) =>
|
|
352
377
|
thm.tpairs.reduce(
|
|
353
378
|
(size, pair) => size + 2 + sizeOfTerm(pair[0]) + sizeOfTerm(pair[1]),
|
|
@@ -1,12 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { TlaIsabelleError } from "../../../errors";
|
|
1
|
+
import { isIsabelleError, TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { asmRl, compIncr, revcutRl, thinRl, zeroVarIndexes } from "../pure/drule";
|
|
5
3
|
import { aeconv, etaContract } from "../pure/envir";
|
|
6
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
isAllAbs,
|
|
6
|
+
isImplies,
|
|
7
|
+
occs,
|
|
8
|
+
stripAssumsConcl,
|
|
9
|
+
stripAssumsHyp,
|
|
10
|
+
stripParams,
|
|
11
|
+
} from "../pure/logic";
|
|
7
12
|
import { isBoundName } from "../pure/name";
|
|
8
13
|
import { emptySimpset, type SimpContext } from "../pure/raw-simplifier";
|
|
9
|
-
import {
|
|
14
|
+
import { seqHead } from "../pure/seq";
|
|
10
15
|
import { asmLrSimpTac } from "../pure/simplifier";
|
|
11
16
|
import {
|
|
12
17
|
determ,
|
|
@@ -77,11 +82,6 @@ interface HypsubstContext {
|
|
|
77
82
|
class NoMatch {}
|
|
78
83
|
class EqVar {}
|
|
79
84
|
|
|
80
|
-
const isTermError = (error: unknown) =>
|
|
81
|
-
error instanceof TlaIsabelleError && error.exception === "TERM";
|
|
82
|
-
const isThmError = (error: unknown) =>
|
|
83
|
-
error instanceof TlaIsabelleError && error.exception === "THM";
|
|
84
|
-
|
|
85
85
|
const inspectContract = (term: Term) => {
|
|
86
86
|
const contracted = etaContract(term);
|
|
87
87
|
return contracted.kind === "Free" && isBoundName(contracted.name) ? mkBound(0) : contracted;
|
|
@@ -141,19 +141,8 @@ const eqVar = (
|
|
|
141
141
|
term: Term,
|
|
142
142
|
hyps: readonly Term[],
|
|
143
143
|
): [number, [boolean, boolean]] => {
|
|
144
|
-
if (
|
|
145
|
-
|
|
146
|
-
term.fun.kind === "Const" &&
|
|
147
|
-
term.fun.name === "Pure.all" &&
|
|
148
|
-
term.arg.kind === "Abs"
|
|
149
|
-
)
|
|
150
|
-
return visit(count, term.arg.body, hyps);
|
|
151
|
-
if (
|
|
152
|
-
term.kind === "App" &&
|
|
153
|
-
term.fun.kind === "App" &&
|
|
154
|
-
term.fun.fun.kind === "Const" &&
|
|
155
|
-
term.fun.fun.name === "Pure.imp"
|
|
156
|
-
) {
|
|
144
|
+
if (isAllAbs(term)) return visit(count, term.arg.body, hyps);
|
|
145
|
+
if (isImplies(term)) {
|
|
157
146
|
const premise = term.fun.arg;
|
|
158
147
|
const conclusion = term.arg;
|
|
159
148
|
try {
|
|
@@ -161,7 +150,7 @@ const eqVar = (
|
|
|
161
150
|
const [orientation, variable] = inspectPair(isBound, isNoVars, left, right);
|
|
162
151
|
return [count, checkFree([conclusion, ...hyps], orientation, variable)];
|
|
163
152
|
} catch (error) {
|
|
164
|
-
if (!
|
|
153
|
+
if (!isIsabelleError(error, "TERM") && !(error instanceof NoMatch)) throw error;
|
|
165
154
|
return visit(count + 1, conclusion, [premise, ...hyps]);
|
|
166
155
|
}
|
|
167
156
|
}
|
|
@@ -175,7 +164,7 @@ const withEqVar = (build: (goal: Term, index: number) => Tactic): GoalTactic =>
|
|
|
175
164
|
try {
|
|
176
165
|
return build(goal, index);
|
|
177
166
|
} catch (error) {
|
|
178
|
-
if (error instanceof EqVar ||
|
|
167
|
+
if (error instanceof EqVar || isIsabelleError(error, "THM")) return noTac;
|
|
179
168
|
throw error;
|
|
180
169
|
}
|
|
181
170
|
});
|
|
@@ -187,7 +176,7 @@ const mkEqs = (data: HypsubstData, isBound: boolean, thm: Thm): Thm[] => {
|
|
|
187
176
|
? [rs(thm, data.eqReflection)]
|
|
188
177
|
: [symmetric(rs(thm, data.eqReflection))];
|
|
189
178
|
} catch (error) {
|
|
190
|
-
if (
|
|
179
|
+
if (isIsabelleError(error, "TERM") || error instanceof NoMatch) return [];
|
|
191
180
|
throw error;
|
|
192
181
|
}
|
|
193
182
|
};
|
|
@@ -228,7 +217,7 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
|
|
|
228
217
|
const [left, right] = data.destEq(data.destTrueprop(hyp));
|
|
229
218
|
return [etaContract(left), etaContract(right)] as const;
|
|
230
219
|
} catch (error) {
|
|
231
|
-
if (
|
|
220
|
+
if (isIsabelleError(error, "TERM")) return undefined;
|
|
232
221
|
throw error;
|
|
233
222
|
}
|
|
234
223
|
})();
|
|
@@ -340,7 +329,7 @@ const varsGenHypSubstTac = (context: HypsubstContext, isBound: boolean): GoalTac
|
|
|
340
329
|
});
|
|
341
330
|
|
|
342
331
|
const revDupElim = (thm: Thm) => {
|
|
343
|
-
const result =
|
|
332
|
+
const result = seqHead(assumption(undefined, 2, rsn(thm, 2, revcutRl)));
|
|
344
333
|
if (result === undefined) throw new TlaIsabelleError("THM", "rev_dup_elim");
|
|
345
334
|
return result;
|
|
346
335
|
};
|
|
@@ -1,34 +1,16 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { normTerm, type Envir } from "./envir";
|
|
5
|
-
import { allConst, mkImplies } from "./logic";
|
|
3
|
+
import { allConst, isAllAbs, isImplies, mkImplies } from "./logic";
|
|
6
4
|
import { unifyTypesEnvir } from "./pattern";
|
|
7
5
|
import type { Thm } from "./thm";
|
|
8
6
|
import { normType } from "./type";
|
|
9
7
|
import { eqTyp, foldVars, matchBvars, mkAbs, mkApp, mkVar, type Term, type Typ } from "./term";
|
|
10
8
|
import type { Tpair } from "./unify";
|
|
11
9
|
|
|
12
|
-
const isImpApp = (
|
|
13
|
-
term: Term,
|
|
14
|
-
): term is Extract<Term, { kind: "App" }> & { fun: Extract<Term, { kind: "App" }> } =>
|
|
15
|
-
term.kind === "App" &&
|
|
16
|
-
term.fun.kind === "App" &&
|
|
17
|
-
term.fun.fun.kind === "Const" &&
|
|
18
|
-
term.fun.fun.name === "Pure.imp";
|
|
19
|
-
|
|
20
|
-
const isAllApp = (
|
|
21
|
-
term: Term,
|
|
22
|
-
): term is Extract<Term, { kind: "App" }> & { arg: Extract<Term, { kind: "Abs" }> } =>
|
|
23
|
-
term.kind === "App" &&
|
|
24
|
-
term.fun.kind === "Const" &&
|
|
25
|
-
term.fun.name === "Pure.all" &&
|
|
26
|
-
term.arg.kind === "Abs";
|
|
27
|
-
|
|
28
10
|
export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term): Term => {
|
|
29
|
-
if (
|
|
11
|
+
if (isImplies(lifted) && isImplies(term))
|
|
30
12
|
return mkApp(mkApp(lifted.fun.fun, term.fun.arg), stripApply(apply, lifted.arg, term.arg));
|
|
31
|
-
if (
|
|
13
|
+
if (isAllAbs(lifted) && isAllAbs(term))
|
|
32
14
|
return mkApp(
|
|
33
15
|
lifted.fun,
|
|
34
16
|
mkAbs(term.arg.name, term.arg.type, stripApply(apply, lifted.arg.body, term.arg.body)),
|
|
@@ -37,8 +19,8 @@ export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term
|
|
|
37
19
|
};
|
|
38
20
|
|
|
39
21
|
const stripLifted = (lifted: Term, term: Term): Term => {
|
|
40
|
-
if (
|
|
41
|
-
if (
|
|
22
|
+
if (isImplies(lifted) && isImplies(term)) return stripLifted(lifted.arg, term.arg);
|
|
23
|
+
if (isAllAbs(lifted) && isAllAbs(term)) return stripLifted(lifted.arg.body, term.arg.body);
|
|
42
24
|
return term;
|
|
43
25
|
};
|
|
44
26
|
|
|
@@ -125,8 +107,8 @@ export const renameBvars = (
|
|
|
125
107
|
};
|
|
126
108
|
|
|
127
109
|
export const stripAssums2 = (lifted: Term, goal: Term): Tpair => {
|
|
128
|
-
if (
|
|
129
|
-
if (
|
|
110
|
+
if (isImplies(lifted) && isImplies(goal)) return stripAssums2(lifted.arg, goal.arg);
|
|
111
|
+
if (isAllAbs(lifted) && isAllAbs(goal)) {
|
|
130
112
|
const [left, right] = stripAssums2(lifted.arg.body, goal.arg.body);
|
|
131
113
|
return [
|
|
132
114
|
mkAbs(lifted.arg.name, lifted.arg.type, left),
|
|
@@ -138,14 +120,14 @@ export const stripAssums2 = (lifted: Term, goal: Term): Tpair => {
|
|
|
138
120
|
|
|
139
121
|
export const normTermSkip = (envir: Envir, count: number, term: Term): Term => {
|
|
140
122
|
if (count === 0) return normTerm(envir, term);
|
|
141
|
-
if (
|
|
123
|
+
if (isAllAbs(term)) {
|
|
142
124
|
const type = normType(envir.tyenv, term.arg.type);
|
|
143
125
|
return mkApp(
|
|
144
126
|
allConst(type),
|
|
145
127
|
mkAbs(term.arg.name, type, normTermSkip(envir, count, term.arg.body)),
|
|
146
128
|
);
|
|
147
129
|
}
|
|
148
|
-
if (
|
|
130
|
+
if (isImplies(term)) return mkImplies(term.fun.arg, normTermSkip(envir, count - 1, term.arg));
|
|
149
131
|
throw new TlaIsabelleError("ERROR", "norm_term_skip: too few assumptions??");
|
|
150
132
|
};
|
|
151
133
|
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
|
-
import { destEquals, destImplies, implies, isImplies } from "./logic";
|
|
2
|
+
import { destEquals, destImplies, implies, isAllAbs, isImplies } from "./logic";
|
|
5
3
|
import { declareName, makeNameContext, variantName, type NameContext } from "./name";
|
|
6
4
|
import { aconv, addFreeNames, mkFree, substBound, type Term } from "./term";
|
|
7
5
|
import {
|
|
@@ -36,13 +34,7 @@ export const paramsConv = (convert: Conversion): Conversion => {
|
|
|
36
34
|
const under =
|
|
37
35
|
(names: NameContext): Conversion =>
|
|
38
36
|
(term) => {
|
|
39
|
-
if (
|
|
40
|
-
term.kind !== "App" ||
|
|
41
|
-
term.fun.kind !== "Const" ||
|
|
42
|
-
term.fun.name !== "Pure.all" ||
|
|
43
|
-
term.arg.kind !== "Abs"
|
|
44
|
-
)
|
|
45
|
-
return convert(term);
|
|
37
|
+
if (!isAllAbs(term)) return convert(term);
|
|
46
38
|
const abs = term.arg;
|
|
47
39
|
const [name, nextNames] = variantName(abs.name, names);
|
|
48
40
|
const free = mkFree(name, abs.type);
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import {
|
|
2
|
+
cleanName,
|
|
3
|
+
emptyNameContext,
|
|
4
|
+
isBoundName,
|
|
5
|
+
variantList,
|
|
6
|
+
variantName,
|
|
7
|
+
type NameContext,
|
|
8
|
+
} from "./name";
|
|
4
9
|
import {
|
|
5
10
|
emptyTable,
|
|
6
11
|
fastIndexnameOrd,
|
|
@@ -10,10 +15,12 @@ import {
|
|
|
10
15
|
type IndexKey,
|
|
11
16
|
} from "./table";
|
|
12
17
|
import { TlaIsabelleError } from "../../../errors";
|
|
13
|
-
import { allConst, isProtected, mkEquals, mkImplies, mkTerm, protect } from "./logic";
|
|
14
|
-
import {
|
|
18
|
+
import { allConst, destEquals, isProtected, mkEquals, mkImplies, mkTerm, protect } from "./logic";
|
|
19
|
+
import type { Limits } from "./interrupt";
|
|
20
|
+
import { emptySeq, listOfSeq, mapsSeq, seqOfList, singleSeq, type Seq } from "./seq";
|
|
15
21
|
import { distinctThms } from "./tactical";
|
|
16
22
|
import {
|
|
23
|
+
aconv,
|
|
17
24
|
foldVars,
|
|
18
25
|
foldAtyps,
|
|
19
26
|
foldTypes,
|
|
@@ -31,14 +38,21 @@ import {
|
|
|
31
38
|
} from "./term";
|
|
32
39
|
import { normType, type TyEnv } from "./type";
|
|
33
40
|
import {
|
|
41
|
+
abstractRule,
|
|
34
42
|
axiomThm,
|
|
43
|
+
betaConversion,
|
|
35
44
|
bicompose,
|
|
45
|
+
biresolution,
|
|
46
|
+
etaConversion,
|
|
36
47
|
forallElim,
|
|
37
48
|
forallIntr,
|
|
38
49
|
incrIndexesThm,
|
|
39
50
|
instantiate,
|
|
40
51
|
instantiateTypes,
|
|
52
|
+
nprems,
|
|
41
53
|
rs,
|
|
54
|
+
symmetric,
|
|
55
|
+
transitive,
|
|
42
56
|
type Instantiation,
|
|
43
57
|
type Thm,
|
|
44
58
|
} from "./thm";
|
|
@@ -55,6 +69,13 @@ export const remdupsRl = axiomThm(
|
|
|
55
69
|
);
|
|
56
70
|
export const protectI = axiomThm(mkImplies(propVar("A"), protect(propVar("A"))));
|
|
57
71
|
export const protectD = axiomThm(mkImplies(protect(propVar("A")), propVar("A")));
|
|
72
|
+
export const protectCong = axiomThm(mkEquals(protect(propVar("A")), protect(propVar("A"))));
|
|
73
|
+
export const equalsCong = axiomThm(
|
|
74
|
+
mkEquals(
|
|
75
|
+
mkEquals(mkVar("x", 0, mkTVar("'a", 0)), mkVar("y", 0, mkTVar("'a", 0))),
|
|
76
|
+
mkEquals(mkVar("x", 0, mkTVar("'a", 0)), mkVar("y", 0, mkTVar("'a", 0))),
|
|
77
|
+
),
|
|
78
|
+
);
|
|
58
79
|
export const reflexiveThm = axiomThm(
|
|
59
80
|
mkEquals(mkVar("x", 0, mkTVar("'a", 0)), mkVar("x", 0, mkTVar("'a", 0))),
|
|
60
81
|
);
|
|
@@ -157,7 +178,7 @@ export const forallIntrVars = (thm: Thm) => {
|
|
|
157
178
|
};
|
|
158
179
|
|
|
159
180
|
const variantBound = (name: string, used: NameContext) =>
|
|
160
|
-
variantName(name
|
|
181
|
+
variantName(isBoundName(name) ? "u" : name, used);
|
|
161
182
|
|
|
162
183
|
const fullProps = (thm: Thm) => [...thm.tpairs.flatMap((pair) => [pair[0], pair[1]]), thm.prop];
|
|
163
184
|
|
|
@@ -228,6 +249,30 @@ const compose = (tha: Thm, index: number, thb: Thm): Thm => {
|
|
|
228
249
|
return results[0];
|
|
229
250
|
};
|
|
230
251
|
|
|
252
|
+
export const betaEtaConversion = (term: Term) => {
|
|
253
|
+
const beta = betaConversion(true, term);
|
|
254
|
+
return transitive(beta, etaConversion(destEquals(beta.prop)[1]));
|
|
255
|
+
};
|
|
256
|
+
|
|
257
|
+
// f ?x1 ... ?xn == u becomes f == %x1 ... xn. u.
|
|
258
|
+
export const absDef = (thm: Thm): Thm => {
|
|
259
|
+
const contractLhs = (current: Thm) =>
|
|
260
|
+
transitive(symmetric(betaEtaConversion(destEquals(current.prop)[0])), current);
|
|
261
|
+
const varArgs = (term: Term): Term[] => {
|
|
262
|
+
if (term.kind !== "App" || term.arg.kind !== "Var") return [];
|
|
263
|
+
const variable = term.arg;
|
|
264
|
+
return [variable, ...varArgs(term.fun).filter((other) => !aconv(other, variable))];
|
|
265
|
+
};
|
|
266
|
+
const contracted = contractLhs(thm);
|
|
267
|
+
return contractLhs(
|
|
268
|
+
varArgs(destEquals(contracted.prop)[0]).reduce(
|
|
269
|
+
(current, variable) =>
|
|
270
|
+
abstractRule(variable.kind === "Var" ? variable.name : "", variable, current),
|
|
271
|
+
contracted,
|
|
272
|
+
),
|
|
273
|
+
);
|
|
274
|
+
};
|
|
275
|
+
|
|
231
276
|
export const compIncr = (tha: Thm, thb: Thm) =>
|
|
232
277
|
compose(tha, 1, incrIndexesThm(tha.maxidx + 1, thb));
|
|
233
278
|
|
|
@@ -246,3 +291,24 @@ export const compNoFlatten = (thm: Thm, count: number, index: number, rule: Thm)
|
|
|
246
291
|
if (results.length !== 1) throw new TlaIsabelleError("THM", `comp_no_flatten ${index}`);
|
|
247
292
|
return results[0];
|
|
248
293
|
};
|
|
294
|
+
|
|
295
|
+
export const multiResolves = (
|
|
296
|
+
limits: Limits,
|
|
297
|
+
facts: readonly Thm[],
|
|
298
|
+
rules: readonly Thm[],
|
|
299
|
+
): Seq<Thm> =>
|
|
300
|
+
mapsSeq(
|
|
301
|
+
(rule) =>
|
|
302
|
+
facts.reduceRight<Seq<Thm>>(
|
|
303
|
+
(results, fact, index) =>
|
|
304
|
+
mapsSeq(
|
|
305
|
+
(thm) =>
|
|
306
|
+
index + 1 > nprems(thm)
|
|
307
|
+
? emptySeq
|
|
308
|
+
: biresolution(limits, false, [{ isElim: false, rule: fact }], index + 1, thm),
|
|
309
|
+
results,
|
|
310
|
+
),
|
|
311
|
+
singleSeq(rule),
|
|
312
|
+
),
|
|
313
|
+
seqOfList(rules),
|
|
314
|
+
);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/goal.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { compNoFlatten, protectD, protectI } from "./drule";
|
|
5
3
|
import { emptySeq } from "./seq";
|
|
@@ -8,7 +6,7 @@ import { nprems, permutePrems, type Thm } from "./thm";
|
|
|
8
6
|
|
|
9
7
|
const protect = (count: number, thm: Thm) => compNoFlatten(thm, count, 1, protectI);
|
|
10
8
|
|
|
11
|
-
const conclude = (thm: Thm) => compNoFlatten(thm, nprems(thm), 1, protectD);
|
|
9
|
+
export const conclude = (thm: Thm) => compNoFlatten(thm, nprems(thm), 1, protectD);
|
|
12
10
|
|
|
13
11
|
const restrict = (index: number, count: number, state: Thm) => {
|
|
14
12
|
if (index < 1 || count < 1 || index + count - 1 > nprems(state))
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/logic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { variantList } from "./name";
|
|
5
3
|
import {
|
|
@@ -183,7 +181,7 @@ const incrIndexesFixed = (
|
|
|
183
181
|
export const incrIndexes = (types: readonly Typ[], increment: number, term: Term) =>
|
|
184
182
|
incrIndexesFixed([], types, increment, 0, term);
|
|
185
183
|
|
|
186
|
-
const isAllAbs = (
|
|
184
|
+
export const isAllAbs = (
|
|
187
185
|
term: Term,
|
|
188
186
|
): term is Extract<Term, { kind: "App" }> & {
|
|
189
187
|
arg: Extract<Term, { kind: "Abs" }>;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/name.ML and Pure/General/symbol.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
const explodeSymbols = (text: string): string[] => text.match(/\\<\^?[A-Za-z0-9_']*>|[^]/gu) ?? [];
|
|
4
2
|
|
|
5
3
|
const isRawSymbolic = (symbol: string) => symbol.startsWith("\\<") && !symbol.startsWith("\\<^");
|
|
@@ -1,27 +1,33 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/Isar/object_logic.ML and Pure/tactic.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
|
-
import { gconvRule, paramsConv, premsConv } from "./conv";
|
|
2
|
+
import { fconvRule, gconvRule, paramsConv, premsConv } from "./conv";
|
|
5
3
|
import { hasMetaPrems } from "./logic";
|
|
6
4
|
import { makeSimpContext } from "./raw-simplifier";
|
|
7
5
|
import { rewriteCterm, simpleProver } from "./rewriter";
|
|
8
6
|
import { emptySeq, singleSeq } from "./seq";
|
|
9
7
|
import type { Limits } from "./interrupt";
|
|
10
8
|
import type { GoalTactic } from "./tactical";
|
|
9
|
+
import type { Term } from "./term";
|
|
11
10
|
import { reflexive, type Thm } from "./thm";
|
|
12
11
|
|
|
13
|
-
|
|
12
|
+
// The atomize rules apply newest first, as Object_Logic keeps them.
|
|
13
|
+
const atomizePrems = (limits: Limits, rules: readonly Thm[]) => {
|
|
14
14
|
const context = makeSimpContext(limits, rules);
|
|
15
15
|
const atomize = paramsConv(
|
|
16
16
|
premsConv((term) =>
|
|
17
17
|
rewriteCterm({ simprem: true, useprem: false, mutsimp: false }, simpleProver, context, term),
|
|
18
18
|
),
|
|
19
19
|
);
|
|
20
|
+
return (term: Term) => (hasMetaPrems(term) ? atomize(term) : reflexive(term));
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
export const flatRule = (limits: Limits, rules: readonly Thm[], rule: Thm) =>
|
|
24
|
+
fconvRule(premsConv(atomizePrems(limits, rules)), rule);
|
|
25
|
+
|
|
26
|
+
export const atomizePremsTac = (limits: Limits, rules: readonly Thm[]): GoalTactic => {
|
|
27
|
+
const atomize = atomizePrems(limits, rules);
|
|
20
28
|
return (index) => (state) => {
|
|
21
29
|
try {
|
|
22
|
-
return singleSeq(
|
|
23
|
-
gconvRule((term) => (hasMetaPrems(term) ? atomize(term) : reflexive(term)), index, state),
|
|
24
|
-
);
|
|
30
|
+
return singleSeq(gconvRule(atomize, index, state));
|
|
25
31
|
} catch (error) {
|
|
26
32
|
if (
|
|
27
33
|
error instanceof TlaIsabelleError &&
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/pattern.ML and Pure/more_pattern.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { aeconv, genvar, headNorm, lookup, lookup1, update, type Envir, type TEnv } from "./envir";
|
|
5
3
|
import type { Binder } from "./logic";
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Pure/raw_simplifier.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { emptyTEnv, etaContract } from "./envir";
|
|
5
3
|
import { symmetricThm } from "./drule";
|
|
6
4
|
import { destEquals, isEquals, occs, stripImpConcl, stripImpPrems } from "./logic";
|
|
7
5
|
import { emptyNet, insertNet, keyOfTerm, type Net } from "./net";
|
|
8
6
|
import { isFirstOrder, isPattern, matches } from "./pattern";
|
|
9
|
-
import { emptyTable, type Table } from "./table";
|
|
7
|
+
import { emptyTable, stringOrd, type Table } from "./table";
|
|
10
8
|
import { emptyTyEnv } from "./type";
|
|
11
9
|
import {
|
|
12
10
|
aconv,
|
|
@@ -20,7 +18,7 @@ import {
|
|
|
20
18
|
type Typ,
|
|
21
19
|
type Var,
|
|
22
20
|
} from "./term";
|
|
23
|
-
import { rs, type Thm } from "./thm";
|
|
21
|
+
import { catchThm, rs, type Thm } from "./thm";
|
|
24
22
|
import { eqThmProp, noTac, type GoalTactic } from "./tactical";
|
|
25
23
|
import type { Limits } from "./interrupt";
|
|
26
24
|
|
|
@@ -227,14 +225,7 @@ const orientRrule = (context: SimpContext, thm: Thm): RawRrule[] => {
|
|
|
227
225
|
return rruleEqTrue(context, thm, decomposed.lhs, decomposed.elhs, decomposed.rhs, thm);
|
|
228
226
|
if (defaultReorient(decomposed.prems, decomposed.rhs, decomposed.lhs))
|
|
229
227
|
return mkEqTrue(context, thm);
|
|
230
|
-
const symmetric = (() =>
|
|
231
|
-
try {
|
|
232
|
-
return rs(thm, symmetricThm);
|
|
233
|
-
} catch (error) {
|
|
234
|
-
if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
|
|
235
|
-
throw error;
|
|
236
|
-
}
|
|
237
|
-
})();
|
|
228
|
+
const symmetric = catchThm(() => rs(thm, symmetricThm));
|
|
238
229
|
if (symmetric === undefined) return [];
|
|
239
230
|
const flipped = decompSimp(symmetric);
|
|
240
231
|
return rruleEqTrue(context, symmetric, flipped.lhs, flipped.elhs, flipped.rhs, thm);
|
|
@@ -275,9 +266,7 @@ export const rulesFromEntries = (thms: readonly Thm[]): Net<Rrule> =>
|
|
|
275
266
|
return insertNet(() => false, keyOfTerm(rrule.elhs), rrule, net) ?? net;
|
|
276
267
|
}, emptyNet);
|
|
277
268
|
|
|
278
|
-
export const emptyCongs: Table<string, Thm> = emptyTable(
|
|
279
|
-
left === right ? 0 : left < right ? -1 : 1,
|
|
280
|
-
);
|
|
269
|
+
export const emptyCongs: Table<string, Thm> = emptyTable(stringOrd);
|
|
281
270
|
|
|
282
271
|
export const emptySimpset: Simpset = {
|
|
283
272
|
rules: emptyNet,
|