tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.37a75eb5b
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 +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- 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/bags.ts +47 -28
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +476 -590
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +60 -708
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +25 -18
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +14 -7
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +42 -44
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +597 -240
- 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 +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +652 -220
- 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 +93 -15
- 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 +536 -117
- 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 +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +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 +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +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 +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- 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 +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- 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 +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1407 -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 +315 -97
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +464 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2410 -683
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +40 -19
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +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 +22 -25
- 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 +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +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 +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 +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 +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1704 -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 +1995 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -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 +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -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 +2 -3
- 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 +127 -108
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +382 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1092 -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 +6 -13
- 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 +243 -52
- package/src/simulate.ts +160 -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 +2 -9
- package/src/subexpressions.ts +3 -1
- 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/jar-data.ts +12 -0
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +16 -12
- 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 +61 -16
- package/src/tlc/trace-spec.ts +26 -47
- 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 +63 -158
- 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,7 @@
|
|
|
1
1
|
import { axiomThm, type Thm } from "../pure/thm";
|
|
2
2
|
import type { ClassicalRule } from "../provers/classical";
|
|
3
|
+
import type { TaggedRule } from "../pure/tactic";
|
|
4
|
+
import type { ContextRule } from "../tools/intuitionistic";
|
|
3
5
|
import {
|
|
4
6
|
mkAbs,
|
|
5
7
|
mkApp,
|
|
@@ -14,6 +16,8 @@ import {
|
|
|
14
16
|
type Typ,
|
|
15
17
|
} from "../pure/term";
|
|
16
18
|
import { typargsOf, type TypargPosition } from "../pure/consts";
|
|
19
|
+
import type { NamedCasesRule } from "../isar/induct";
|
|
20
|
+
import type { Tags } from "../isar/rule-cases";
|
|
17
21
|
import { LOGIC_DATA } from "./logic-data";
|
|
18
22
|
|
|
19
23
|
type TypeNode = [0, number, ...number[]] | [1, number] | [2, number, number];
|
|
@@ -27,6 +31,7 @@ type TermNode =
|
|
|
27
31
|
type NetItem = [number, 0 | 1, number];
|
|
28
32
|
type ExtraNetItem = [number, number, 0 | 1, number];
|
|
29
33
|
type RawRule = [number, number, number[], number, number[]];
|
|
34
|
+
type RawCasesRule = [string, number, [string, string][]];
|
|
30
35
|
|
|
31
36
|
interface LogicJson {
|
|
32
37
|
strings: string[];
|
|
@@ -52,7 +57,13 @@ interface LogicJson {
|
|
|
52
57
|
dup: [NetItem[], NetItem[]];
|
|
53
58
|
extra: [ExtraNetItem[], ExtraNetItem[]];
|
|
54
59
|
};
|
|
55
|
-
contextRules: {
|
|
60
|
+
contextRules: {
|
|
61
|
+
bang: [ExtraNetItem[], ExtraNetItem[]];
|
|
62
|
+
plain: [ExtraNetItem[], ExtraNetItem[]];
|
|
63
|
+
query: [number[], number[]];
|
|
64
|
+
};
|
|
65
|
+
factTags: [string, number, [string, string][]][];
|
|
66
|
+
casesRules: { type: RawCasesRule[]; pred: RawCasesRule[] };
|
|
56
67
|
}
|
|
57
68
|
|
|
58
69
|
export interface ConstInfo {
|
|
@@ -61,16 +72,6 @@ export interface ConstInfo {
|
|
|
61
72
|
readonly abbreviation: Term | undefined;
|
|
62
73
|
}
|
|
63
74
|
|
|
64
|
-
export interface LogicNetItem {
|
|
65
|
-
readonly tag: number;
|
|
66
|
-
readonly isElim: boolean;
|
|
67
|
-
readonly rule: Thm;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
export interface LogicExtraNetItem extends LogicNetItem {
|
|
71
|
-
readonly weight: number;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
75
|
export interface LogicNetPair<Item> {
|
|
75
76
|
readonly intro: readonly Item[];
|
|
76
77
|
readonly elim: readonly Item[];
|
|
@@ -94,14 +95,23 @@ export interface TlaLogic {
|
|
|
94
95
|
readonly safeEs: readonly ClassicalRule[];
|
|
95
96
|
readonly unsafeIs: readonly ClassicalRule[];
|
|
96
97
|
readonly unsafeEs: readonly ClassicalRule[];
|
|
97
|
-
readonly safe0: LogicNetPair<
|
|
98
|
-
readonly safep: LogicNetPair<
|
|
99
|
-
readonly unsafe: LogicNetPair<
|
|
100
|
-
readonly dup: LogicNetPair<
|
|
98
|
+
readonly safe0: LogicNetPair<TaggedRule>;
|
|
99
|
+
readonly safep: LogicNetPair<TaggedRule>;
|
|
100
|
+
readonly unsafe: LogicNetPair<TaggedRule>;
|
|
101
|
+
readonly dup: LogicNetPair<TaggedRule>;
|
|
102
|
+
readonly extra: LogicNetPair<ContextRule>;
|
|
101
103
|
};
|
|
102
104
|
readonly contextRules: {
|
|
103
|
-
readonly bang: LogicNetPair<
|
|
104
|
-
readonly plain: LogicNetPair<
|
|
105
|
+
readonly bang: LogicNetPair<ContextRule>;
|
|
106
|
+
readonly plain: LogicNetPair<ContextRule>;
|
|
107
|
+
readonly query: LogicNetPair<ContextRule>;
|
|
108
|
+
};
|
|
109
|
+
// The Rule_Cases tags of the facts that have them, by name and position.
|
|
110
|
+
readonly factTags: ReadonlyMap<string, ReadonlyMap<number, Tags>>;
|
|
111
|
+
// Induct's cases rules for types and for predicates or sets, newest first.
|
|
112
|
+
readonly casesRules: {
|
|
113
|
+
readonly type: readonly NamedCasesRule[];
|
|
114
|
+
readonly pred: readonly NamedCasesRule[];
|
|
105
115
|
};
|
|
106
116
|
}
|
|
107
117
|
|
|
@@ -149,15 +159,13 @@ const parseLogic = (): TlaLogic => {
|
|
|
149
159
|
dup: thms[raw[3]],
|
|
150
160
|
dupSwapped: raw[4].map((id) => thms[id]),
|
|
151
161
|
});
|
|
152
|
-
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<
|
|
162
|
+
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<TaggedRule> => {
|
|
153
163
|
const [intro, elim] = pair.map((side) =>
|
|
154
164
|
side.map((item) => ({ tag: item[0], isElim: item[1] === 1, rule: thms[item[2]] })),
|
|
155
165
|
);
|
|
156
166
|
return { intro, elim };
|
|
157
167
|
};
|
|
158
|
-
const toExtraItems = (
|
|
159
|
-
pair: [ExtraNetItem[], ExtraNetItem[]],
|
|
160
|
-
): LogicNetPair<LogicExtraNetItem> => {
|
|
168
|
+
const toExtraItems = (pair: [ExtraNetItem[], ExtraNetItem[]]): LogicNetPair<ContextRule> => {
|
|
161
169
|
const [intro, elim] = pair.map((side) =>
|
|
162
170
|
side.map((item) => ({
|
|
163
171
|
weight: item[0],
|
|
@@ -168,6 +176,19 @@ const parseLogic = (): TlaLogic => {
|
|
|
168
176
|
);
|
|
169
177
|
return { intro, elim };
|
|
170
178
|
};
|
|
179
|
+
// Isabelle hides the weights of the rules declared with "?", so their order stands in for their
|
|
180
|
+
// tags, which is all their unweighted retrieval reads.
|
|
181
|
+
const toOrderedItems = (pair: [number[], number[]]): LogicNetPair<ContextRule> => {
|
|
182
|
+
const [intro, elim] = pair.map((side, isElim) =>
|
|
183
|
+
side.map((id, tag) => ({ weight: 0, tag, isElim: isElim === 1, rule: thms[id] })),
|
|
184
|
+
);
|
|
185
|
+
return { intro, elim };
|
|
186
|
+
};
|
|
187
|
+
const toCasesRules = (rules: RawCasesRule[]) =>
|
|
188
|
+
rules.map((entry) => ({ name: entry[0], rule: { rule: thms[entry[1]], tags: entry[2] } }));
|
|
189
|
+
const factTags = new Map<string, Map<number, Tags>>();
|
|
190
|
+
for (const entry of data.factTags)
|
|
191
|
+
factTags.set(entry[0], new Map([...(factTags.get(entry[0]) ?? []), [entry[1], entry[2]]]));
|
|
171
192
|
return {
|
|
172
193
|
consts: new Map(
|
|
173
194
|
data.consts.map((entry) => [
|
|
@@ -195,10 +216,17 @@ const parseLogic = (): TlaLogic => {
|
|
|
195
216
|
safep: toItems(data.claset.safep),
|
|
196
217
|
unsafe: toItems(data.claset.unsafe),
|
|
197
218
|
dup: toItems(data.claset.dup),
|
|
219
|
+
extra: toExtraItems(data.claset.extra),
|
|
198
220
|
},
|
|
199
221
|
contextRules: {
|
|
200
222
|
bang: toExtraItems(data.contextRules.bang),
|
|
201
223
|
plain: toExtraItems(data.contextRules.plain),
|
|
224
|
+
query: toOrderedItems(data.contextRules.query),
|
|
225
|
+
},
|
|
226
|
+
factTags,
|
|
227
|
+
casesRules: {
|
|
228
|
+
type: toCasesRules(data.casesRules.type),
|
|
229
|
+
pred: toCasesRules(data.casesRules.pred),
|
|
202
230
|
},
|
|
203
231
|
};
|
|
204
232
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Isabelle/TLA+'s simplifier_setup.ML and PredicateLogic.thy, BSD licensed, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
4
2
|
import { genAll, reflexiveThm } from "../pure/drule";
|
|
5
3
|
import { emptyNet, insertTermNet, type Net } from "../pure/net";
|
|
@@ -32,7 +30,7 @@ import {
|
|
|
32
30
|
type GoalTactic,
|
|
33
31
|
} from "../pure/tactical";
|
|
34
32
|
import { aconv, eqTerm, headOf, type Term } from "../pure/term";
|
|
35
|
-
import { conclOf, rs, type Thm } from "../pure/thm";
|
|
33
|
+
import { catchThm, conclOf, rs, type Thm } from "../pure/thm";
|
|
36
34
|
import { trade } from "../pure/variable";
|
|
37
35
|
import { getFact } from "./classical-setup";
|
|
38
36
|
import type { TlaLogic } from "./logic";
|
|
@@ -45,15 +43,6 @@ const isConstApp = (name: string, arity: number, term: Term): boolean =>
|
|
|
45
43
|
const getPredicateFact = (logic: TlaLogic, name: string) =>
|
|
46
44
|
getFact(logic, `PredicateLogic.${name}`);
|
|
47
45
|
|
|
48
|
-
const catchThm = <Result>(derive: () => Result): Result | undefined => {
|
|
49
|
-
try {
|
|
50
|
-
return derive();
|
|
51
|
-
} catch (error) {
|
|
52
|
-
if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
|
|
53
|
-
throw error;
|
|
54
|
-
}
|
|
55
|
-
};
|
|
56
|
-
|
|
57
46
|
const getRewriting = (logic: TlaLogic) => {
|
|
58
47
|
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
59
48
|
const eqTrueI = getPredicateFact(logic, "eqTrueI");
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/intuitionistic.ML and Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { remdupsRl } from "../pure/drule";
|
|
4
2
|
import { selectGoal } from "../pure/goal";
|
|
3
|
+
import { unifyTermNet } from "../pure/net";
|
|
5
4
|
import { deepen } from "../pure/search";
|
|
6
5
|
import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
|
|
7
6
|
import type { Limits } from "../pure/interrupt";
|
|
@@ -45,20 +44,37 @@ interface Visited {
|
|
|
45
44
|
readonly concl: Term;
|
|
46
45
|
}
|
|
47
46
|
|
|
48
|
-
|
|
47
|
+
// orderlist_no_weight sorts by tag alone.
|
|
48
|
+
const orderContextRules = (rules: readonly ContextRule[], isWeighted: boolean) => {
|
|
49
49
|
const sorted = [...rules].sort(
|
|
50
|
-
(left, right) => left.weight - right.weight || left.tag - right.tag,
|
|
50
|
+
(left, right) => (isWeighted ? left.weight - right.weight : 0) || left.tag - right.tag,
|
|
51
|
+
);
|
|
52
|
+
return sorted.filter(
|
|
53
|
+
(rule, index) =>
|
|
54
|
+
index + 1 >= sorted.length ||
|
|
55
|
+
sorted[index + 1].weight !== rule.weight ||
|
|
56
|
+
sorted[index + 1].tag !== rule.tag,
|
|
51
57
|
);
|
|
52
|
-
return sorted
|
|
53
|
-
.filter(
|
|
54
|
-
(rule, index) =>
|
|
55
|
-
index + 1 >= sorted.length ||
|
|
56
|
-
sorted[index + 1].weight !== rule.weight ||
|
|
57
|
-
sorted[index + 1].tag !== rule.tag,
|
|
58
|
-
)
|
|
59
|
-
.map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
60
58
|
};
|
|
61
59
|
|
|
60
|
+
const orderRules = (rules: ContextRule[]): BiresRule[] =>
|
|
61
|
+
orderContextRules(rules, true).map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
62
|
+
|
|
63
|
+
// Context_Rules.find_rules_netpair: the elimination rules for the first fact, then the
|
|
64
|
+
// introduction rules for the goal.
|
|
65
|
+
export const findRulesNetpair = (
|
|
66
|
+
isWeighted: boolean,
|
|
67
|
+
facts: readonly Thm[],
|
|
68
|
+
goal: Term,
|
|
69
|
+
netpair: NetPair<ContextRule>,
|
|
70
|
+
): Thm[] =>
|
|
71
|
+
[
|
|
72
|
+
...(facts.length === 0
|
|
73
|
+
? []
|
|
74
|
+
: orderContextRules(unifyTermNet(netpair.elim, stripAssumsConcl(facts[0].prop)), isWeighted)),
|
|
75
|
+
...orderContextRules(unifyTermNet(netpair.intro, stripAssumsConcl(goal)), isWeighted),
|
|
76
|
+
].map((rule) => rule.rule);
|
|
77
|
+
|
|
62
78
|
const countDistinct = (terms: readonly Term[]) =>
|
|
63
79
|
terms.reduce<Term[]>(
|
|
64
80
|
(result, term) => (result.some((other) => aconv(other, term)) ? result : [...result, term]),
|
package/src/prover/ocaml.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
// A bigint is an OCaml int beyond what a number holds exactly.
|
|
2
|
+
type OcamlValue = number | bigint | string | OcamlValue[];
|
|
2
3
|
|
|
3
4
|
export const compareStrings = (left: string, right: string) =>
|
|
4
5
|
left < right ? -1 : left > right ? 1 : 0;
|
|
5
6
|
|
|
6
7
|
export const compareValues = (left: OcamlValue, right: OcamlValue): number => {
|
|
7
8
|
if (typeof left === "number" && typeof right === "number") return left - right;
|
|
9
|
+
if (typeof left === "bigint" && typeof right === "bigint")
|
|
10
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
8
11
|
if (typeof left === "string" && typeof right === "string") return compareStrings(left, right);
|
|
9
12
|
if (!Array.isArray(left) || !Array.isArray(right)) return 0;
|
|
10
13
|
const index = left.findIndex(
|
|
@@ -40,7 +40,10 @@ const getHyp = (scope: Scope | undefined, index: number) => {
|
|
|
40
40
|
const getLevel = (scope: Scope | undefined, expression: Expr) =>
|
|
41
41
|
getLevelInfo(scope, expression).level;
|
|
42
42
|
|
|
43
|
-
const isBuiltin = (
|
|
43
|
+
const isBuiltin = (
|
|
44
|
+
expression: Expr,
|
|
45
|
+
builtins: Builtin[],
|
|
46
|
+
): expression is Extract<Expr, { kind: "Apply" }> =>
|
|
44
47
|
expression.kind === "Apply" &&
|
|
45
48
|
expression.operator.kind === "Internal" &&
|
|
46
49
|
builtins.includes(expression.operator.builtin);
|
|
@@ -72,9 +75,7 @@ const expandAction: Rewrite = (scope, expression) => {
|
|
|
72
75
|
};
|
|
73
76
|
|
|
74
77
|
const expandUnchanged: Rewrite = (scope, expression) =>
|
|
75
|
-
expression
|
|
76
|
-
isBuiltin(expression, ["UNCHANGED"]) &&
|
|
77
|
-
expression.args.length === 1
|
|
78
|
+
isBuiltin(expression, ["UNCHANGED"]) && expression.args.length === 1
|
|
78
79
|
? rewriteUnchanged(expression.args[0])
|
|
79
80
|
: mapScoped(scope, expression, expandUnchanged, adjoin, "all");
|
|
80
81
|
|
|
@@ -201,20 +202,15 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
|
|
|
201
202
|
const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
|
|
202
203
|
if (hyp.kind !== "Defn" || hyp.definition.kind !== "Operator") return undefined;
|
|
203
204
|
const getNodeLevel = (expression: Expr) => {
|
|
204
|
-
if (!isBuiltin(expression, ["UNCHANGED"])
|
|
205
|
-
return getLevel(scope, expression);
|
|
206
|
-
}
|
|
205
|
+
if (!isBuiltin(expression, ["UNCHANGED"])) return getLevel(scope, expression);
|
|
207
206
|
const flatten = (inner: Expr): Expr[] =>
|
|
208
207
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
209
208
|
const items = flatten(expression.args[0]);
|
|
210
209
|
return getLevel(scope, items.length === 1 ? items[0] : expression.args[0]);
|
|
211
210
|
};
|
|
212
211
|
const body = hyp.definition.body;
|
|
213
|
-
const isCommuted =
|
|
214
|
-
|
|
215
|
-
body.kind === "Apply" &&
|
|
216
|
-
body.args.length === 1;
|
|
217
|
-
return getNodeLevel(isCommuted && body.kind === "Apply" ? body.args[0] : body);
|
|
212
|
+
const isCommuted = isBuiltin(body, ["Prime", "BoxTrue", "Diamond"]) && body.args.length === 1;
|
|
213
|
+
return getNodeLevel(isCommuted ? body.args[0] : body);
|
|
218
214
|
};
|
|
219
215
|
|
|
220
216
|
const renameContext = createContextMap<RenameState>(
|
|
@@ -417,12 +413,9 @@ const MODAL_BUILTINS: Builtin[] = [
|
|
|
417
413
|
const coalesceModal: Rewrite = (scope, expression) => {
|
|
418
414
|
if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
419
415
|
const operator = expression.operator;
|
|
420
|
-
const
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
expression.args.length === 1 &&
|
|
424
|
-
arg.kind === "Ix"
|
|
425
|
-
) {
|
|
416
|
+
const args = expression.args;
|
|
417
|
+
const arg = args[0];
|
|
418
|
+
if (isBuiltin(expression, ["Prime", "StrongPrime"]) && args.length === 1 && arg.kind === "Ix") {
|
|
426
419
|
const hyp = getHyp(scope, arg.index);
|
|
427
420
|
if (hyp.kind === "Fresh" || hyp.kind === "Flex") {
|
|
428
421
|
return at({ kind: "Opaque", name: `${hyp.name}#prime` }, expression);
|
|
@@ -433,29 +426,33 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
433
426
|
const hypScope = getScopeAt(scope, operator.index - 1);
|
|
434
427
|
const hyp = hypScope?.hyp;
|
|
435
428
|
if (!hyp) throw new TlapmBugError();
|
|
436
|
-
const
|
|
429
|
+
const applyCoalesced = (applied: Expr) =>
|
|
430
|
+
at(
|
|
431
|
+
{ kind: "Apply", operator: applied, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
432
|
+
expression,
|
|
433
|
+
);
|
|
437
434
|
if (hyp.kind === "Defn" && hyp.definition.kind === "Operator") {
|
|
438
435
|
const substitutive = getSubstitutiveArgs(hypScope.rest, hyp.definition);
|
|
439
436
|
const isKept = args.every(
|
|
440
437
|
(inner, position) => getLevel(scope, inner) === 0 || substitutive[args.length - position - 1],
|
|
441
438
|
);
|
|
442
439
|
if (isKept) return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
{ kind: "Apply", operator: opaque, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
446
|
-
expression,
|
|
440
|
+
return applyCoalesced(
|
|
441
|
+
coalesceOperator(scope, hyp.definition.name, substitutive, operator, args),
|
|
447
442
|
);
|
|
448
443
|
}
|
|
449
444
|
if (hyp.kind === "Flex") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
450
445
|
if (hyp.kind === "Fresh") {
|
|
451
|
-
if (hyp.level === "Constant")
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
446
|
+
if (hyp.level === "Constant") return applyCoalesced(operator);
|
|
447
|
+
return applyCoalesced(
|
|
448
|
+
coalesceOperator(
|
|
449
|
+
scope,
|
|
450
|
+
hyp.name,
|
|
451
|
+
args.map(() => false),
|
|
452
|
+
operator,
|
|
453
|
+
args,
|
|
454
|
+
),
|
|
455
|
+
);
|
|
459
456
|
}
|
|
460
457
|
throw new TlapmBugError();
|
|
461
458
|
};
|
|
@@ -469,6 +466,8 @@ const commuteSequent = createSequentMap(commuteSymbols, "all");
|
|
|
469
466
|
const coalesceSequent = createSequentMap(coalesceModal, "visible");
|
|
470
467
|
|
|
471
468
|
export const processObligation = (sequent: Sequent): Sequent => {
|
|
469
|
+
// Levels.compute_level, whose levels the passes below read on demand: only its errors matter.
|
|
470
|
+
getLevelInfo(undefined, { kind: "Sequent", sequent });
|
|
472
471
|
const keys = sequent.context;
|
|
473
472
|
const expanded = expandUnchangedSequent(keys, expandActionSequent(keys, sequent));
|
|
474
473
|
const commuted = commuteSequent(keys, expanded);
|
|
@@ -6,10 +6,13 @@ import {
|
|
|
6
6
|
adjoinAll,
|
|
7
7
|
getScopeAt,
|
|
8
8
|
mapScoped,
|
|
9
|
+
getAtPrefix,
|
|
9
10
|
type Builtin,
|
|
10
11
|
type Expr,
|
|
12
|
+
type Locus,
|
|
11
13
|
type Scope,
|
|
12
14
|
type Sequent,
|
|
15
|
+
type Warn,
|
|
13
16
|
} from "../../obligations/expression";
|
|
14
17
|
import { getLevelInfo } from "../../obligations/levels";
|
|
15
18
|
|
|
@@ -129,7 +132,12 @@ const getRule = (scope: Scope | undefined, goal: Expr): Rule | undefined => {
|
|
|
129
132
|
return implication && { name: "implies", left: implication[0], right: implication[1] };
|
|
130
133
|
};
|
|
131
134
|
|
|
132
|
-
|
|
135
|
+
// When no rule applies, tlapm records the obligation as not tried.
|
|
136
|
+
export const implicationToEnabled = (
|
|
137
|
+
sequent: Sequent,
|
|
138
|
+
locus: Locus | undefined,
|
|
139
|
+
onWarning: Warn,
|
|
140
|
+
): Sequent => {
|
|
133
141
|
const goalScope = adjoinAll(undefined, sequent.context);
|
|
134
142
|
const rule = getRule(goalScope, sequent.active);
|
|
135
143
|
let isPremise = false;
|
|
@@ -175,8 +183,9 @@ export const implicationToEnabled = (sequent: Sequent): Sequent => {
|
|
|
175
183
|
isPremise = true;
|
|
176
184
|
}
|
|
177
185
|
});
|
|
178
|
-
if (!isPremise || !isLeftBoolean || !isRightBoolean) {
|
|
186
|
+
if (!rule || !isPremise || !isLeftBoolean || !isRightBoolean) {
|
|
179
187
|
throw new TlaProverError("ENABLEDaxioms proof directive did not succeed.\n");
|
|
180
188
|
}
|
|
189
|
+
onWarning({ text: `${getAtPrefix(locus)}[INFO]\nProved ${rule.name}\n`, channel: "stdout" });
|
|
181
190
|
return { ...sequent, active: TRUE };
|
|
182
191
|
};
|
|
@@ -4,11 +4,11 @@ import {
|
|
|
4
4
|
type Bound,
|
|
5
5
|
type Builtin,
|
|
6
6
|
type Expr,
|
|
7
|
-
type Hyp,
|
|
8
7
|
type Scope,
|
|
9
8
|
type Sequent,
|
|
10
9
|
} from "../../obligations/expression";
|
|
11
10
|
import { isConstant } from "../../obligations/temporal";
|
|
11
|
+
import { LEVEL_PREFIXES } from "./action";
|
|
12
12
|
import { getMd5 } from "./md5";
|
|
13
13
|
|
|
14
14
|
const BUILTIN_NUMBERS: Builtin[] = [
|
|
@@ -136,9 +136,6 @@ const getBuiltin = (builtin: Builtin) => {
|
|
|
136
136
|
return `$${BUILTIN_NUMBERS.indexOf(builtin)}`;
|
|
137
137
|
};
|
|
138
138
|
|
|
139
|
-
const getFreshLabel = (hyp: Extract<Hyp, { kind: "Fresh" }>) =>
|
|
140
|
-
hyp.level === "Unknown" ? "Unknown" : hyp.level.toUpperCase();
|
|
141
|
-
|
|
142
139
|
const getFingerprintText = (sequent: Sequent) => {
|
|
143
140
|
const stack: Entry[] = [];
|
|
144
141
|
const getEntry = (index: number) => {
|
|
@@ -333,7 +330,7 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
333
330
|
switch (hyp.kind) {
|
|
334
331
|
case "Fresh": {
|
|
335
332
|
if (!hyp.domain) {
|
|
336
|
-
const label =
|
|
333
|
+
const label = LEVEL_PREFIXES[hyp.level];
|
|
337
334
|
const after = getRest({ kind: "Hyp", label });
|
|
338
335
|
return after.entry.isUsed ? `${after.rest}${label}${hyp.name}` : after.rest;
|
|
339
336
|
}
|