tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.94c3dd828
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +58 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +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-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2678 -422
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +35 -32
- package/dist/transfer.js +39 -36
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +424 -62
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +30 -3
- package/src/exit-codes.ts +1 -0
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -4
- package/src/obligations/anonymize.ts +33 -12
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +18 -4
- package/src/obligations/generate.ts +22 -15
- package/src/obligations/index.ts +36 -6
- package/src/obligations/levels.ts +24 -9
- package/src/obligations/module.ts +1 -1
- package/src/obligations/normalize.ts +24 -11
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -11
- package/src/obligations/proof.ts +3 -0
- package/src/obligations/simplify.ts +17 -5
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -16
- package/src/obligations/substitution.ts +1 -1
- package/src/parallel.ts +2 -2
- package/src/parser.ts +561 -146
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -39
- package/src/prover/isabelle/isar/attrib.ts +254 -0
- package/src/prover/isabelle/isar/context.ts +339 -0
- package/src/prover/isabelle/isar/induct.ts +386 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -196
- package/src/prover/isabelle/isar/proof.ts +571 -13
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +335 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -6
- package/src/prover/isabelle/provers/classical.ts +45 -18
- package/src/prover/isabelle/pure/drule.ts +63 -2
- package/src/prover/isabelle/pure/goal.ts +1 -1
- package/src/prover/isabelle/pure/object-logic.ts +13 -5
- package/src/prover/isabelle/pure/rewriter.ts +1 -6
- package/src/prover/isabelle/pure/simplifier.ts +26 -5
- package/src/prover/isabelle/tla/classical-setup.ts +1 -0
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -10
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +488 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +63 -0
- package/src/prover/smt/solver/ackr-helper.ts +182 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +106 -0
- package/src/prover/smt/solver/add-bounds-tactic.ts +60 -0
- package/src/prover/smt/solver/aig-tactic.ts +53 -0
- package/src/prover/smt/solver/aig.ts +890 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -5
- package/src/prover/smt/solver/arith-terms.ts +123 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +176 -0
- package/src/prover/smt/solver/array-rewriter.ts +310 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -15
- package/src/prover/smt/solver/ast-lt.ts +166 -11
- package/src/prover/smt/solver/ast-util.ts +162 -2
- package/src/prover/smt/solver/ast.ts +1448 -39
- package/src/prover/smt/solver/bit-blast-tactic.ts +585 -0
- package/src/prover/smt/solver/bit-blaster.ts +874 -0
- package/src/prover/smt/solver/bound-manager.ts +197 -0
- package/src/prover/smt/solver/bound-simplifier.ts +602 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +494 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +339 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +97 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1903 -0
- package/src/prover/smt/solver/bv1-blast.ts +216 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +175 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +545 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +534 -0
- package/src/prover/smt/solver/card2bv.ts +112 -0
- package/src/prover/smt/solver/cg-table.ts +41 -25
- package/src/prover/smt/solver/check-logic.ts +331 -0
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +280 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -1
- package/src/prover/smt/solver/context.ts +513 -111
- package/src/prover/smt/solver/ctx-simplify.ts +20 -9
- package/src/prover/smt/solver/ctx-solver-simplify.ts +124 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +573 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +83 -0
- package/src/prover/smt/solver/demodulator.ts +789 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +84 -0
- package/src/prover/smt/solver/der.ts +38 -9
- package/src/prover/smt/solver/diff-neq.ts +207 -0
- package/src/prover/smt/solver/distribute-forall.ts +58 -0
- package/src/prover/smt/solver/dom-simplify.ts +513 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +262 -0
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +130 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +547 -0
- package/src/prover/smt/solver/enode.ts +100 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +219 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +404 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +655 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +890 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +528 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +430 -0
- package/src/prover/smt/solver/euf/array-solver.ts +308 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +164 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +750 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +451 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +620 -0
- package/src/prover/smt/solver/euf/egraph.ts +909 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1208 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +319 -0
- package/src/prover/smt/solver/euf/mam.ts +1052 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +832 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +589 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +299 -0
- package/src/prover/smt/solver/euf/q-solver.ts +363 -0
- package/src/prover/smt/solver/euf/th-solver.ts +337 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +31 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -1
- package/src/prover/smt/solver/expr2polynomial.ts +147 -0
- package/src/prover/smt/solver/factor.ts +142 -0
- package/src/prover/smt/solver/fd-solver.ts +268 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -14
- package/src/prover/smt/solver/fix-dl-var.ts +149 -0
- package/src/prover/smt/solver/fm-tactic.ts +885 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +619 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +641 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2250 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +75 -0
- package/src/prover/smt/solver/goal.ts +175 -14
- package/src/prover/smt/solver/goal2nlsat.ts +191 -0
- package/src/prover/smt/solver/guard-set.ts +220 -0
- package/src/prover/smt/solver/hashtable.ts +30 -15
- package/src/prover/smt/solver/inf-eps.ts +64 -0
- package/src/prover/smt/solver/inj-axiom.ts +102 -0
- package/src/prover/smt/solver/internalizer.ts +109 -35
- package/src/prover/smt/solver/lackr.ts +383 -0
- package/src/prover/smt/solver/lia2card.ts +269 -0
- package/src/prover/smt/solver/lia2pb.ts +155 -0
- package/src/prover/smt/solver/logic-tactics.ts +349 -0
- package/src/prover/smt/solver/lp/core-solver.ts +18 -0
- package/src/prover/smt/solver/lp/int-cube.ts +3 -3
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -7
- package/src/prover/smt/solver/lp/nla-core.ts +40 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -3
- package/src/prover/smt/solver/lp/nla-powers.ts +221 -0
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +326 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -2
- package/src/prover/smt/solver/lp/union-find.ts +7 -1
- package/src/prover/smt/solver/macro-finder.ts +533 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -87
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +19 -0
- package/src/prover/smt/solver/max-cliques.ts +107 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -5
- package/src/prover/smt/solver/maxlex.ts +116 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +93 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +468 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +102 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +289 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +49 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +272 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +607 -0
- package/src/prover/smt/solver/model-based-opt.ts +845 -0
- package/src/prover/smt/solver/model-checker.ts +17 -25
- package/src/prover/smt/solver/model-evaluator.ts +188 -11
- package/src/prover/smt/solver/model-generator.ts +56 -28
- package/src/prover/smt/solver/model-macro-solver.ts +38 -26
- package/src/prover/smt/solver/model-printer.ts +215 -0
- package/src/prover/smt/solver/mpf.ts +712 -0
- package/src/prover/smt/solver/mus.ts +52 -0
- package/src/prover/smt/solver/muz/dl-context.ts +406 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +98 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +169 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +127 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +301 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +456 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +341 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +165 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +274 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +125 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +498 -0
- package/src/prover/smt/solver/muz/hnf.ts +202 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +203 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +338 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1407 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +53 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +244 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +129 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +334 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +283 -0
- package/src/prover/smt/solver/muz/substitution.ts +205 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +286 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +116 -1
- package/src/prover/smt/solver/nlsat/explain.ts +56 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -1
- package/src/prover/smt/solver/nlsat/solver.ts +223 -12
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +311 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +369 -0
- package/src/prover/smt/solver/nlsat-tactic.ts +83 -0
- package/src/prover/smt/solver/nnf.ts +105 -22
- package/src/prover/smt/solver/normalize-bounds.ts +54 -0
- package/src/prover/smt/solver/occf.ts +98 -0
- package/src/prover/smt/solver/opt-context.ts +788 -0
- package/src/prover/smt/solver/opt-nlsat.ts +376 -0
- package/src/prover/smt/solver/opt-pareto.ts +284 -0
- package/src/prover/smt/solver/opt-preprocess.ts +102 -0
- package/src/prover/smt/solver/opt-solver.ts +309 -0
- package/src/prover/smt/solver/opt-value.ts +56 -0
- package/src/prover/smt/solver/optsmt.ts +694 -0
- package/src/prover/smt/solver/parallel-tactic.ts +301 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -10
- package/src/prover/smt/solver/pb-rewriter.ts +287 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +542 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -56
- package/src/prover/smt/solver/probes.ts +514 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -20
- package/src/prover/smt/solver/proto-model.ts +651 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -11
- package/src/prover/smt/solver/purify-arith.ts +633 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1100 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -2
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -3
- package/src/prover/smt/solver/qe-lite.ts +37 -16
- package/src/prover/smt/solver/qe-mbp.ts +271 -0
- package/src/prover/smt/solver/qe.ts +1500 -0
- package/src/prover/smt/solver/qel.ts +26 -0
- package/src/prover/smt/solver/qsat.ts +815 -0
- package/src/prover/smt/solver/quant-hoist.ts +197 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -55
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quantifier-manager.ts +11 -14
- package/src/prover/smt/solver/quasi-macros.ts +245 -0
- package/src/prover/smt/solver/rational.ts +45 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +108 -0
- package/src/prover/smt/solver/reduce-args.ts +226 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +120 -0
- package/src/prover/smt/solver/relevancy.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -9
- package/src/prover/smt/solver/rewriter.ts +475 -35
- package/src/prover/smt/solver/rlimit.ts +25 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +327 -0
- package/src/prover/smt/solver/sat/big.ts +178 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +73 -0
- package/src/prover/smt/solver/sat/clause.ts +206 -0
- package/src/prover/smt/solver/sat/cleaner.ts +96 -0
- package/src/prover/smt/solver/sat/config.ts +125 -0
- package/src/prover/smt/solver/sat/consequences.ts +204 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +144 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +528 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +379 -0
- package/src/prover/smt/solver/sat/model-converter.ts +138 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +264 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1579 -0
- package/src/prover/smt/solver/sat/probing.ts +172 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +167 -0
- package/src/prover/smt/solver/sat/scc.ts +143 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1621 -0
- package/src/prover/smt/solver/sat/solver.ts +2129 -0
- package/src/prover/smt/solver/sat/var-queue.ts +119 -0
- package/src/prover/smt/solver/sat/watch-list.ts +143 -0
- package/src/prover/smt/solver/search-tree.ts +285 -0
- package/src/prover/smt/solver/seq-axioms.ts +1011 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +820 -0
- package/src/prover/smt/solver/seq-derive.ts +1303 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +238 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +440 -0
- package/src/prover/smt/solver/seq-factory.ts +90 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +237 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +760 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +145 -0
- package/src/prover/smt/solver/seq-regex-live.ts +202 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +318 -0
- package/src/prover/smt/solver/seq-subset.ts +166 -0
- package/src/prover/smt/solver/seq-view-witness.ts +355 -0
- package/src/prover/smt/solver/smt-consequences.ts +299 -0
- package/src/prover/smt/solver/smt-kernel.ts +85 -0
- package/src/prover/smt/solver/smt-logics.ts +67 -0
- package/src/prover/smt/solver/smt-setup.ts +498 -0
- package/src/prover/smt/solver/smt2-printer.ts +767 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3154 -326
- package/src/prover/smt/solver/smtlib-script.ts +1633 -0
- package/src/prover/smt/solver/solve-eqs.ts +931 -0
- package/src/prover/smt/solver/solver.ts +113 -21
- package/src/prover/smt/solver/static-features.ts +316 -0
- package/src/prover/smt/solver/tactic.ts +1988 -0
- package/src/prover/smt/solver/term-enumeration.ts +206 -0
- package/src/prover/smt/solver/theory-array.ts +1242 -0
- package/src/prover/smt/solver/theory-bv.ts +1202 -0
- package/src/prover/smt/solver/theory-char.ts +356 -0
- package/src/prover/smt/solver/theory-datatype.ts +599 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +390 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -4
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -69
- package/src/prover/smt/solver/theory-lra-internalize.ts +81 -10
- package/src/prover/smt/solver/theory-lra-model.ts +20 -34
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -25
- package/src/prover/smt/solver/theory-lra-state.ts +6 -21
- package/src/prover/smt/solver/theory-lra.ts +188 -0
- package/src/prover/smt/solver/theory-pb.ts +936 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +59 -0
- package/src/prover/smt/solver/theory-recfun.ts +308 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +868 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1375 -0
- package/src/prover/smt/solver/theory-seq-state.ts +873 -0
- package/src/prover/smt/solver/theory-seq.ts +962 -0
- package/src/prover/smt/solver/theory.ts +190 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +487 -0
- package/src/prover/smt/solver/var-subst.ts +36 -13
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +29 -8
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -5
- package/src/prover/zenon/node.ts +20 -3
- package/src/prover/zenon/parse.ts +6 -0
- package/src/prover/zenon/search.ts +7 -3
- package/src/prover/zenon/tla/sets.ts +7 -6
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/tlaps-module.ts +0 -510
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
// Ported from Z3 (src/nlsat/tactic/nlsat_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
|
+
import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
3
|
+
import { type AstManager, FAMILY_ARITH, KIND_APP, OP_ATAN2, OP_PI, SORT_INT } from "./ast";
|
|
4
|
+
import type { Goal } from "./goal";
|
|
5
|
+
import { goal2nlsat } from "./goal2nlsat";
|
|
6
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
7
|
+
import { NlsatSolver } from "./nlsat/solver";
|
|
8
|
+
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
9
|
+
import { ProtoModel } from "./proto-model";
|
|
10
|
+
|
|
11
|
+
const isSupportedTranscendental = (manager: AstManager, term: number) =>
|
|
12
|
+
manager.kinds[term] === KIND_APP &&
|
|
13
|
+
manager.getFamily(term) === FAMILY_ARITH &&
|
|
14
|
+
(TRANSCENDENTAL_OPS.has(manager.getOp(term)) ||
|
|
15
|
+
manager.getOp(term) === OP_ATAN2 ||
|
|
16
|
+
manager.getOp(term) === OP_PI);
|
|
17
|
+
|
|
18
|
+
const containsUnsupported = (
|
|
19
|
+
manager: AstManager,
|
|
20
|
+
t2x: ReadonlyMap<number, number>,
|
|
21
|
+
a2b: ReadonlyMap<number, number>,
|
|
22
|
+
) =>
|
|
23
|
+
[...t2x.keys()].some(
|
|
24
|
+
(term) => !manager.isUninterpretedConst(term) && !isSupportedTranscendental(manager, term),
|
|
25
|
+
) || [...a2b.keys()].some((atom) => !manager.isUninterpretedConst(atom));
|
|
26
|
+
|
|
27
|
+
// Undefined when nlsat assigns a fraction to an integer variable.
|
|
28
|
+
const mkModel = (
|
|
29
|
+
manager: AstManager,
|
|
30
|
+
solver: NlsatSolver,
|
|
31
|
+
t2x: ReadonlyMap<number, number>,
|
|
32
|
+
a2b: ReadonlyMap<number, number>,
|
|
33
|
+
) => {
|
|
34
|
+
const model = new ProtoModel(manager);
|
|
35
|
+
for (const [term, variable] of t2x) {
|
|
36
|
+
if (!manager.isUninterpretedConst(term)) continue;
|
|
37
|
+
const value = solver.getValue(variable);
|
|
38
|
+
if (manager.sorts[term] === SORT_INT && !solver.am.isInt(value)) return undefined;
|
|
39
|
+
model.registerConst(
|
|
40
|
+
manager.decls[term],
|
|
41
|
+
manager.mkAlgebraicNumeral(value, manager.sorts[term]),
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
for (const [atom, boolVar] of a2b) {
|
|
45
|
+
const value = solver.getBoolValue(boolVar);
|
|
46
|
+
if (value === L_UNDEF) continue;
|
|
47
|
+
model.registerConst(
|
|
48
|
+
manager.decls[atom],
|
|
49
|
+
value === L_TRUE ? manager.trueExpr : manager.falseExpr,
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
return model;
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
export interface NlsatOptions {
|
|
56
|
+
seed: number;
|
|
57
|
+
isFactoring: boolean;
|
|
58
|
+
isShufflingVars: boolean;
|
|
59
|
+
variableOrderingStrategy: number;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export const runNlsat = (manager: AstManager, options: NlsatOptions) => (goal: Goal) => {
|
|
63
|
+
if (goal.isDecided()) return [goal];
|
|
64
|
+
if (goal.isProofsEnabled) throw new SmtTacticError("nlsat does not support proof production");
|
|
65
|
+
const solver = new NlsatSolver(manager.limit);
|
|
66
|
+
solver.updtParams(options.seed, options.isFactoring);
|
|
67
|
+
const t2x = new Map<number, number>();
|
|
68
|
+
const a2b = new Map<number, number>();
|
|
69
|
+
goal2nlsat(manager, goal.forms.items, solver, t2x, a2b, null, options.isFactoring);
|
|
70
|
+
if (options.isShufflingVars || options.variableOrderingStrategy !== 0)
|
|
71
|
+
throw new SmtUnsupportedError("nlsat's shuffle_vars and variable_ordering_strategy");
|
|
72
|
+
const status = solver.check();
|
|
73
|
+
if (status === L_TRUE && !containsUnsupported(manager, t2x, a2b)) {
|
|
74
|
+
const model = mkModel(manager, solver, t2x, a2b);
|
|
75
|
+
if (model !== undefined) {
|
|
76
|
+
goal.reset();
|
|
77
|
+
goal.model = model;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
if (status === L_FALSE) goal.assert(manager.falseExpr);
|
|
81
|
+
goal.depth++;
|
|
82
|
+
return [goal];
|
|
83
|
+
};
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { ActCache } from "./act-cache";
|
|
3
3
|
import {
|
|
4
4
|
type AstManager,
|
|
5
|
+
FAMILY_BASIC,
|
|
5
6
|
KIND_APP,
|
|
6
7
|
KIND_QUANTIFIER,
|
|
7
8
|
KIND_VAR,
|
|
@@ -9,10 +10,12 @@ import {
|
|
|
9
10
|
OP_EQ,
|
|
10
11
|
OP_IMPLIES,
|
|
11
12
|
OP_ITE,
|
|
13
|
+
OP_LABEL,
|
|
12
14
|
OP_NOT,
|
|
13
15
|
OP_OR,
|
|
14
16
|
OP_XOR,
|
|
15
17
|
SORT_BOOL,
|
|
18
|
+
QUANTIFIER_FORALL,
|
|
16
19
|
} from "./ast";
|
|
17
20
|
import { mkNot } from "./ast-util";
|
|
18
21
|
import { RefVector } from "./ref-vector";
|
|
@@ -44,21 +47,36 @@ export class DefinedNames {
|
|
|
44
47
|
}
|
|
45
48
|
}
|
|
46
49
|
|
|
47
|
-
|
|
50
|
+
get numNames() {
|
|
51
|
+
return this.nameRefs.size;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
getNameDecl(index: number) {
|
|
55
|
+
return this.manager.decls[this.nameRefs.items[index]];
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
release() {
|
|
59
|
+
this.nameRefs.reset();
|
|
60
|
+
this.exprs.reset();
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
mkName(expr: number) {
|
|
48
64
|
const manager = this.manager;
|
|
49
|
-
const existing = this.names.get(
|
|
65
|
+
const existing = this.names.get(expr);
|
|
50
66
|
if (existing !== undefined) return { name: existing, definition: -1 };
|
|
51
|
-
|
|
67
|
+
// A variable that does not occur still takes a position, filled with true.
|
|
68
|
+
const freeVarSorts = getFreeVarSorts(manager, expr, manager.freeVarBounds[expr]);
|
|
52
69
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
70
|
+
const sort = manager.sorts[expr];
|
|
53
71
|
const name = manager.mkApp(
|
|
54
|
-
manager.mkFreshFuncDecl("z3name", varSorts,
|
|
55
|
-
freeVarSorts.map((
|
|
56
|
-
|
|
72
|
+
manager.mkFreshFuncDecl("z3name", varSorts, sort),
|
|
73
|
+
freeVarSorts.map((varSort, index) =>
|
|
74
|
+
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
57
75
|
),
|
|
58
|
-
|
|
76
|
+
sort,
|
|
59
77
|
);
|
|
60
|
-
this.names.set(
|
|
61
|
-
this.exprs.push(
|
|
78
|
+
this.names.set(expr, name);
|
|
79
|
+
this.exprs.push(expr);
|
|
62
80
|
this.nameRefs.push(name);
|
|
63
81
|
const definition = manager.withTemporaries(() => {
|
|
64
82
|
const boundVars = (conjunct: number) =>
|
|
@@ -67,35 +85,57 @@ export class DefinedNames {
|
|
|
67
85
|
: elimUnusedVars(
|
|
68
86
|
manager,
|
|
69
87
|
manager.mkQuantifier({
|
|
70
|
-
|
|
88
|
+
kind: QUANTIFIER_FORALL,
|
|
71
89
|
sorts: varSorts.toReversed(),
|
|
72
90
|
names: varSorts.map((_sort, index) => varSorts.length - 1 - index),
|
|
73
91
|
body: conjunct,
|
|
74
92
|
patterns: [manager.mkPattern([name])],
|
|
93
|
+
noPatterns: [],
|
|
75
94
|
weight: 1,
|
|
76
95
|
qid: "",
|
|
77
96
|
}),
|
|
78
97
|
);
|
|
79
|
-
|
|
80
|
-
|
|
98
|
+
if (manager.isBool(expr)) {
|
|
99
|
+
const first = boundVars(manager.mkOr([manager.mkNot(name), expr]));
|
|
100
|
+
const second = boundVars(manager.mkOr([name, manager.mkNot(expr)]));
|
|
101
|
+
return manager.mkAnd([first, second]);
|
|
102
|
+
}
|
|
103
|
+
if (manager.getOp(expr) !== OP_ITE) return boundVars(manager.mkEq(expr, name));
|
|
104
|
+
const notCondition = manager.mkNot(manager.getArg(expr, 0));
|
|
105
|
+
const thenEq = manager.mkEq(name, manager.getArg(expr, 1));
|
|
106
|
+
const first = boundVars(manager.mkOr([notCondition, thenEq]));
|
|
107
|
+
const elseEq = manager.mkEq(name, manager.getArg(expr, 2));
|
|
108
|
+
const second = boundVars(manager.mkOr([manager.getArg(expr, 0), elseEq]));
|
|
81
109
|
return manager.mkAnd([first, second]);
|
|
82
110
|
});
|
|
83
111
|
return { name, definition };
|
|
84
112
|
}
|
|
85
113
|
}
|
|
86
114
|
|
|
87
|
-
|
|
115
|
+
// The nested formula namer also names each application of a Boolean operator below the root.
|
|
116
|
+
class ExprNamer extends RewriterTpl {
|
|
88
117
|
private definitions: RefVector | null = null;
|
|
118
|
+
private root = -1;
|
|
89
119
|
|
|
90
120
|
constructor(
|
|
91
121
|
manager: AstManager,
|
|
92
122
|
private names: DefinedNames,
|
|
123
|
+
private isNamingFormulas: boolean,
|
|
93
124
|
) {
|
|
94
125
|
super(manager);
|
|
95
126
|
}
|
|
96
127
|
|
|
97
128
|
getSubst(expr: number) {
|
|
98
|
-
|
|
129
|
+
const manager = this.manager;
|
|
130
|
+
const isNamed =
|
|
131
|
+
(manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)) ||
|
|
132
|
+
(manager.kinds[expr] === KIND_APP && manager.getOp(expr) === OP_LABEL) ||
|
|
133
|
+
(this.isNamingFormulas &&
|
|
134
|
+
manager.kinds[expr] === KIND_APP &&
|
|
135
|
+
manager.funcDecls[manager.decls[expr]].family === FAMILY_BASIC &&
|
|
136
|
+
manager.getNumArgs(expr) > 0 &&
|
|
137
|
+
expr !== this.root);
|
|
138
|
+
if (!isNamed) return undefined;
|
|
99
139
|
const named = this.names.mkName(expr);
|
|
100
140
|
if (named.definition !== -1) {
|
|
101
141
|
this.definitions?.push(named.definition);
|
|
@@ -106,6 +146,7 @@ class QuantifierNamer extends RewriterTpl {
|
|
|
106
146
|
|
|
107
147
|
name(expr: number, definitions: RefVector) {
|
|
108
148
|
this.definitions = definitions;
|
|
149
|
+
this.root = expr;
|
|
109
150
|
return this.rewrite(expr);
|
|
110
151
|
}
|
|
111
152
|
}
|
|
@@ -144,7 +185,11 @@ class Skolemizer {
|
|
|
144
185
|
for (let index = count - 1; index >= 0; index--) {
|
|
145
186
|
const sort = data.sorts[index];
|
|
146
187
|
substitution.push(
|
|
147
|
-
manager.mkApp(
|
|
188
|
+
manager.mkApp(
|
|
189
|
+
manager.mkFreshFuncDecl(data.names[index], argSorts, sort, true, data.skid),
|
|
190
|
+
args.items,
|
|
191
|
+
sort,
|
|
192
|
+
),
|
|
148
193
|
);
|
|
149
194
|
}
|
|
150
195
|
freeVarSorts.forEach((sort, index) =>
|
|
@@ -173,23 +218,31 @@ interface Frame {
|
|
|
173
218
|
spos: number;
|
|
174
219
|
}
|
|
175
220
|
|
|
221
|
+
export const NNF_SKOLEM = 0;
|
|
222
|
+
export const NNF_QUANT = 1;
|
|
223
|
+
export const NNF_FULL = 2;
|
|
224
|
+
|
|
176
225
|
export class Nnf {
|
|
177
226
|
private frames: Frame[] = [];
|
|
178
227
|
private results: RefVector;
|
|
179
228
|
private caches: ActCache[];
|
|
180
229
|
private todoDefs: RefVector;
|
|
181
230
|
private skolemizer: Skolemizer;
|
|
182
|
-
private namer:
|
|
231
|
+
private namer: ExprNamer;
|
|
232
|
+
private nestedNamer: ExprNamer;
|
|
183
233
|
|
|
184
234
|
constructor(
|
|
185
235
|
private manager: AstManager,
|
|
186
236
|
names: DefinedNames,
|
|
237
|
+
private mode = NNF_SKOLEM,
|
|
238
|
+
private isIgnoringLabels = false,
|
|
187
239
|
) {
|
|
188
240
|
this.results = new RefVector(manager);
|
|
189
241
|
this.caches = Array.from({ length: 4 }, () => new ActCache(manager, manager.getNumAsts()));
|
|
190
242
|
this.todoDefs = new RefVector(manager);
|
|
191
243
|
this.skolemizer = new Skolemizer(manager);
|
|
192
|
-
this.namer = new
|
|
244
|
+
this.namer = new ExprNamer(manager, names, false);
|
|
245
|
+
this.nestedNamer = new ExprNamer(manager, names, true);
|
|
193
246
|
}
|
|
194
247
|
|
|
195
248
|
apply(expr: number, definitions: RefVector) {
|
|
@@ -208,6 +261,7 @@ export class Nnf {
|
|
|
208
261
|
|
|
209
262
|
release() {
|
|
210
263
|
this.manager.withoutTemporaries(() => {
|
|
264
|
+
this.nestedNamer.release();
|
|
211
265
|
this.namer.release();
|
|
212
266
|
this.skolemizer.release();
|
|
213
267
|
this.todoDefs.reset();
|
|
@@ -254,7 +308,8 @@ export class Nnf {
|
|
|
254
308
|
|
|
255
309
|
private visit(expr: number, isPositive: boolean, isInQuantifier: boolean) {
|
|
256
310
|
const manager = this.manager;
|
|
257
|
-
|
|
311
|
+
const isSkipping = this.mode === NNF_SKOLEM || (this.mode === NNF_QUANT && !isInQuantifier);
|
|
312
|
+
if (isSkipping && !manager.hasQuantifierFlags[expr] && !manager.hasLabelFlags[expr]) {
|
|
258
313
|
this.skip(expr, isPositive);
|
|
259
314
|
return true;
|
|
260
315
|
}
|
|
@@ -399,8 +454,29 @@ export class Nnf {
|
|
|
399
454
|
this.setResult(frame.spos, manager.mkApp(OP_AND, [first, second], SORT_BOOL));
|
|
400
455
|
return true;
|
|
401
456
|
}
|
|
457
|
+
case OP_LABEL: {
|
|
458
|
+
if (!this.visitChildren(frame, [[manager.getArg(expr, 0), isPositive]])) return false;
|
|
459
|
+
const decl = manager.decls[expr];
|
|
460
|
+
if (this.isIgnoringLabels || isPositive !== manager.isLabelPositive(decl)) return true;
|
|
461
|
+
const arg = this.results.items[this.results.size - 1];
|
|
462
|
+
const literal = manager.mkLabelLit(manager.getLabelNames(decl));
|
|
463
|
+
this.setResult(frame.spos, manager.mkApp(OP_AND, [arg, literal], SORT_BOOL));
|
|
464
|
+
return true;
|
|
465
|
+
}
|
|
402
466
|
default: {
|
|
403
|
-
|
|
467
|
+
if (
|
|
468
|
+
this.mode !== NNF_FULL &&
|
|
469
|
+
!manager.hasQuantifierFlags[expr] &&
|
|
470
|
+
!manager.hasLabelFlags[expr]
|
|
471
|
+
) {
|
|
472
|
+
this.skip(expr, isPositive);
|
|
473
|
+
return true;
|
|
474
|
+
}
|
|
475
|
+
const namer =
|
|
476
|
+
this.mode === NNF_FULL || (this.mode !== NNF_SKOLEM && frame.isInQuantifier)
|
|
477
|
+
? this.nestedNamer
|
|
478
|
+
: this.namer;
|
|
479
|
+
const named = namer.name(expr, this.todoDefs);
|
|
404
480
|
if (isPositive) this.results.pushOwned(named);
|
|
405
481
|
else {
|
|
406
482
|
this.results.push(mkNot(manager, named));
|
|
@@ -414,21 +490,28 @@ export class Nnf {
|
|
|
414
490
|
private processQuantifier(quantifier: number, frame: Frame) {
|
|
415
491
|
const manager = this.manager;
|
|
416
492
|
const data = manager.getQuantifier(quantifier);
|
|
417
|
-
const isUniversal = data.
|
|
493
|
+
const isUniversal = (data.kind === QUANTIFIER_FORALL) === frame.isPositive;
|
|
418
494
|
if (frame.index === 0) {
|
|
419
495
|
frame.index = 1;
|
|
420
496
|
if (isUniversal) {
|
|
421
497
|
if (!this.visit(data.body, frame.isPositive, true)) return false;
|
|
422
498
|
} else {
|
|
423
499
|
const skolemized = this.skolemizer.skolemize(quantifier);
|
|
424
|
-
const isDone = this.visit(
|
|
500
|
+
const isDone = this.visit(
|
|
501
|
+
skolemized,
|
|
502
|
+
data.kind !== QUANTIFIER_FORALL,
|
|
503
|
+
frame.isInQuantifier,
|
|
504
|
+
);
|
|
425
505
|
manager.decRef(skolemized);
|
|
426
506
|
if (!isDone) return false;
|
|
427
507
|
}
|
|
428
508
|
}
|
|
429
509
|
if (!isUniversal) return true;
|
|
430
510
|
const body = this.results.items[this.results.size - 1];
|
|
431
|
-
this.setResult(
|
|
511
|
+
this.setResult(
|
|
512
|
+
this.results.size - 1,
|
|
513
|
+
manager.mkQuantifier({ ...data, kind: QUANTIFIER_FORALL, body }),
|
|
514
|
+
);
|
|
432
515
|
return true;
|
|
433
516
|
}
|
|
434
517
|
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
// Ported from Z3 (src/tactic/arith/normalize_bounds_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
|
+
import { type AstManager, OP_ADD, SORT_INT } from "./ast";
|
|
3
|
+
import { BoundManager } from "./bound-manager";
|
|
4
|
+
import type { Definition, Goal } from "./goal";
|
|
5
|
+
import { RefVector } from "./ref-vector";
|
|
6
|
+
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
7
|
+
|
|
8
|
+
export const normalizeBounds = (
|
|
9
|
+
manager: AstManager,
|
|
10
|
+
goal: Goal,
|
|
11
|
+
options: RewriterOptions,
|
|
12
|
+
isIntOnly: boolean,
|
|
13
|
+
) => {
|
|
14
|
+
const bounds = new BoundManager(manager);
|
|
15
|
+
if (!goal.isProofsEnabled) for (const form of goal.forms.items) bounds.add(form);
|
|
16
|
+
const getLower = (variable: number) => {
|
|
17
|
+
const lower = bounds.lowers.get(variable);
|
|
18
|
+
return manager.isUninterpretedConst(variable) &&
|
|
19
|
+
(!isIntOnly || manager.sorts[variable] === SORT_INT) &&
|
|
20
|
+
lower !== undefined &&
|
|
21
|
+
!lower.value.isZero()
|
|
22
|
+
? lower.value
|
|
23
|
+
: undefined;
|
|
24
|
+
};
|
|
25
|
+
if (!bounds.boundedVars.some((variable) => getLower(variable) !== undefined)) return;
|
|
26
|
+
const terms = new RefVector(manager);
|
|
27
|
+
const definitions: Definition[] = [];
|
|
28
|
+
const substitution = new Map<number, number>();
|
|
29
|
+
for (const variable of bounds.boundedVars) {
|
|
30
|
+
const lower = getLower(variable);
|
|
31
|
+
if (lower === undefined) continue;
|
|
32
|
+
const sort = manager.sorts[variable];
|
|
33
|
+
const fresh = manager.mkFreshConst(null, sort);
|
|
34
|
+
terms.push(fresh);
|
|
35
|
+
const def = manager.mkApp(OP_ADD, [fresh, manager.mkNumeralOfSort(lower, sort)], sort);
|
|
36
|
+
terms.push(def);
|
|
37
|
+
substitution.set(variable, def);
|
|
38
|
+
definitions.push(
|
|
39
|
+
{ decl: manager.decls[fresh], def: -1 },
|
|
40
|
+
{ decl: manager.decls[variable], def },
|
|
41
|
+
);
|
|
42
|
+
}
|
|
43
|
+
const rewriter = new Rewriter(manager, options);
|
|
44
|
+
rewriter.setSubstitution(substitution);
|
|
45
|
+
for (let index = 0; !goal.isInconsistent && index < goal.forms.size; index++) {
|
|
46
|
+
const rewritten = rewriter.rewrite(goal.forms.items[index]);
|
|
47
|
+
goal.update(index, rewritten);
|
|
48
|
+
manager.decRef(rewritten);
|
|
49
|
+
}
|
|
50
|
+
rewriter.release();
|
|
51
|
+
goal.addDefinitions(definitions);
|
|
52
|
+
terms.reset();
|
|
53
|
+
goal.depth++;
|
|
54
|
+
};
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
// Ported from Z3 (src/tactic/core/occf_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
|
+
import { SmtTacticError } from "../../../errors";
|
|
3
|
+
import { type AstManager, OP_OR, SORT_BOOL } from "./ast";
|
|
4
|
+
import type { Goal } from "./goal";
|
|
5
|
+
import { RefVector } from "./ref-vector";
|
|
6
|
+
|
|
7
|
+
interface BvarInfo {
|
|
8
|
+
bvar: number;
|
|
9
|
+
isGenPos: boolean;
|
|
10
|
+
isGenNeg: boolean;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export const occf = (manager: AstManager, goal: Goal) => {
|
|
14
|
+
if (goal.isProofsEnabled) throw new SmtTacticError("occf does not support proof production");
|
|
15
|
+
const pinned = new RefVector(manager);
|
|
16
|
+
const pin = (expr: number) => {
|
|
17
|
+
pinned.push(expr);
|
|
18
|
+
return expr;
|
|
19
|
+
};
|
|
20
|
+
const isLiteral = (expr: number) =>
|
|
21
|
+
manager.isUninterpretedConst(expr) ||
|
|
22
|
+
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
|
|
23
|
+
const isConstraint = (expr: number) => !isLiteral(expr);
|
|
24
|
+
const isTarget = (clause: number) => {
|
|
25
|
+
let isFound = false;
|
|
26
|
+
for (const arg of manager.getArgs(clause)) {
|
|
27
|
+
if (!isConstraint(arg)) continue;
|
|
28
|
+
if (isFound) return true;
|
|
29
|
+
isFound = true;
|
|
30
|
+
}
|
|
31
|
+
return false;
|
|
32
|
+
};
|
|
33
|
+
const constraintToBvar = new Map<number, BvarInfo>();
|
|
34
|
+
const getAtom = (constraint: number) => {
|
|
35
|
+
let atom = constraint;
|
|
36
|
+
let isSign = false;
|
|
37
|
+
while (manager.isNot(atom)) {
|
|
38
|
+
atom = manager.getArg(atom, 0);
|
|
39
|
+
isSign = !isSign;
|
|
40
|
+
}
|
|
41
|
+
return { atom, isSign };
|
|
42
|
+
};
|
|
43
|
+
const getAuxLit = (constraint: number) => {
|
|
44
|
+
const literal = getAtom(constraint);
|
|
45
|
+
const info = constraintToBvar.get(literal.atom);
|
|
46
|
+
if (info === undefined) return undefined;
|
|
47
|
+
if (literal.isSign) {
|
|
48
|
+
if (!info.isGenNeg) {
|
|
49
|
+
info.isGenNeg = true;
|
|
50
|
+
goal.assert(pin(manager.mkOr([info.bvar, pin(manager.mkNot(literal.atom))])));
|
|
51
|
+
}
|
|
52
|
+
return pin(manager.mkNot(info.bvar));
|
|
53
|
+
}
|
|
54
|
+
if (!info.isGenPos) {
|
|
55
|
+
info.isGenPos = true;
|
|
56
|
+
goal.assert(pin(manager.mkOr([pin(manager.mkNot(info.bvar)), literal.atom])));
|
|
57
|
+
}
|
|
58
|
+
return info.bvar;
|
|
59
|
+
};
|
|
60
|
+
const mkAuxLit = (constraint: number) => {
|
|
61
|
+
const literal = getAtom(constraint);
|
|
62
|
+
const bvar = pin(manager.mkFreshConst(null, SORT_BOOL));
|
|
63
|
+
goal.addConverter(manager.decls[bvar]);
|
|
64
|
+
constraintToBvar.set(literal.atom, {
|
|
65
|
+
bvar,
|
|
66
|
+
isGenPos: !literal.isSign,
|
|
67
|
+
isGenNeg: literal.isSign,
|
|
68
|
+
});
|
|
69
|
+
if (literal.isSign) {
|
|
70
|
+
goal.assert(pin(manager.mkOr([bvar, pin(manager.mkNot(literal.atom))])));
|
|
71
|
+
return pin(manager.mkNot(bvar));
|
|
72
|
+
}
|
|
73
|
+
goal.assert(pin(manager.mkOr([pin(manager.mkNot(bvar)), literal.atom])));
|
|
74
|
+
return bvar;
|
|
75
|
+
};
|
|
76
|
+
const size = goal.forms.size;
|
|
77
|
+
for (let index = 0; index < size; index++) {
|
|
78
|
+
manager.limit.checkpoint();
|
|
79
|
+
const clause = goal.forms.items[index];
|
|
80
|
+
if (manager.getOp(clause) !== OP_OR || !isTarget(clause)) continue;
|
|
81
|
+
let keep: number | undefined;
|
|
82
|
+
const literals: number[] = [];
|
|
83
|
+
for (const literal of manager.getArgs(clause)) {
|
|
84
|
+
if (!isConstraint(literal)) {
|
|
85
|
+
literals.push(literal);
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
const aux = getAuxLit(literal);
|
|
89
|
+
if (aux !== undefined) literals.push(aux);
|
|
90
|
+
else if (keep === undefined) keep = literal;
|
|
91
|
+
else literals.push(mkAuxLit(literal));
|
|
92
|
+
}
|
|
93
|
+
if (keep !== undefined) literals.push(keep);
|
|
94
|
+
goal.update(index, pin(manager.mkOr(literals)));
|
|
95
|
+
}
|
|
96
|
+
pinned.reset();
|
|
97
|
+
goal.depth++;
|
|
98
|
+
};
|