tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
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/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -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.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +6 -16
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -7
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- 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 +0 -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 +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- 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 +0 -3
- 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 +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +25 -6
- 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 +0 -2
- 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 +144 -108
- 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 +50 -19
- 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 +97 -62
- 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 +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +0 -1
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +0 -1
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -14
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +91 -55
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +0 -1
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +66 -16
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- 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 +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/rewriter.h, rewriter.cpp, rewriter_def.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { ActCache } from "./act-cache";
|
|
3
2
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, OP_ITE, type AstManager } from "./ast";
|
|
4
3
|
import { grow, shrink } from "./array";
|
|
@@ -193,13 +192,15 @@ abstract class VarShifterCore extends RewriterCore {
|
|
|
193
192
|
frame.childIndex++;
|
|
194
193
|
if (!this.visit(child)) return;
|
|
195
194
|
}
|
|
196
|
-
// A rewritten no-pattern is not a pattern, so Z3 drops it.
|
|
197
195
|
const result = frame.hasNewChild
|
|
198
196
|
? manager.mkQuantifier({
|
|
199
197
|
...data,
|
|
200
198
|
body: this.resultStack[frame.spos],
|
|
201
199
|
patterns: this.resultStack.slice(frame.spos + 1, frame.spos + 1 + data.patterns.length),
|
|
202
|
-
noPatterns:
|
|
200
|
+
noPatterns: this.resultStack.slice(
|
|
201
|
+
frame.spos + 1 + data.patterns.length,
|
|
202
|
+
frame.spos + children.length,
|
|
203
|
+
),
|
|
203
204
|
})
|
|
204
205
|
: expr;
|
|
205
206
|
this.finish(expr, frame, result);
|
|
@@ -385,6 +386,7 @@ class RewriterEngine extends SubstCore {
|
|
|
385
386
|
}
|
|
386
387
|
|
|
387
388
|
release() {
|
|
389
|
+
this.setLastResult(-1);
|
|
388
390
|
this.invShifter.release();
|
|
389
391
|
this.shifter.release();
|
|
390
392
|
this.releaseCaches();
|
|
@@ -855,6 +857,7 @@ export class BetaReducer extends SubstCore {
|
|
|
855
857
|
}
|
|
856
858
|
|
|
857
859
|
release() {
|
|
860
|
+
this.setLastResult(-1);
|
|
858
861
|
this.shifter.release();
|
|
859
862
|
this.releaseCaches();
|
|
860
863
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/th_rewriter.cpp, bool_rewriter.cpp, arith_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
3
2
|
import { ArrayRewriter } from "./array-rewriter";
|
|
4
3
|
import { mkRecFunApp } from "./recfun-rewriter";
|
|
@@ -270,7 +269,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
270
269
|
!isLambda &&
|
|
271
270
|
data.patterns.length + data.noPatterns.length === 0 &&
|
|
272
271
|
nested.patterns.length + nested.noPatterns.length === 0;
|
|
273
|
-
if (!isMerging && isLambda && manager.
|
|
272
|
+
if (!isMerging && isLambda && manager.isGroundApp(body))
|
|
274
273
|
return mkArrayApp(manager, OP_CONST_ARRAY, [body], [manager.sorts[expr]]);
|
|
275
274
|
if (!isMerging && isLambda) {
|
|
276
275
|
const reduced = this.array.mkLambdaCore(expr, body);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/rlimit.h, src/util/rlimit.cpp, src/util/memory_manager.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { GCProfiler } from "node:v8";
|
|
3
2
|
import { SmtCanceledError } from "../../../errors";
|
|
4
3
|
|
|
@@ -44,6 +43,19 @@ export class ResourceLimit {
|
|
|
44
43
|
this.isCanceled = false;
|
|
45
44
|
}
|
|
46
45
|
|
|
46
|
+
pushChild(child: ResourceLimit) {
|
|
47
|
+
child.limit = Math.min(child.limit, this.limit - Math.min(this.limit, this.count));
|
|
48
|
+
child.count = 0;
|
|
49
|
+
child.deadline = this.deadline;
|
|
50
|
+
child.signal = this.signal;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
popChild(child: ResourceLimit) {
|
|
54
|
+
this.count += child.count;
|
|
55
|
+
child.count = 0;
|
|
56
|
+
child.release();
|
|
57
|
+
}
|
|
58
|
+
|
|
47
59
|
restart(deadline: number) {
|
|
48
60
|
this.deadline = deadline;
|
|
49
61
|
this.isCanceled = false;
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_asymm_branch.h, src/sat/sat_asymm_branch.cpp,
|
|
2
|
-
// src/sat/sat_asymm_branch_params.pyg), MIT license, see z3-license.txt.
|
|
3
1
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
4
2
|
import { RandomGen } from "../random-gen";
|
|
5
3
|
import { Big } from "./big";
|
|
4
|
+
import { UINT_MAX } from "./clause";
|
|
6
5
|
import { getBool, getNumber, type SatParams } from "./config";
|
|
7
6
|
import type { Solver } from "./solver";
|
|
8
7
|
|
|
9
|
-
const UINT_MAX = 4294967295;
|
|
10
|
-
|
|
11
8
|
export class AsymmBranch {
|
|
12
9
|
private counter = 0;
|
|
13
10
|
private rand = new RandomGen(0);
|
|
@@ -68,22 +65,30 @@ export class AsymmBranch {
|
|
|
68
65
|
clauses.sort((first, second) => solver.arena.size[second] - solver.arena.size[first]);
|
|
69
66
|
this.counter -= clauses.length;
|
|
70
67
|
let next = 0;
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
68
|
+
let index = 0;
|
|
69
|
+
try {
|
|
70
|
+
for (; index < clauses.length; index++) {
|
|
71
|
+
const clause = clauses[index];
|
|
72
|
+
if (solver.isInconsistent) {
|
|
73
|
+
for (; index < clauses.length; index++) clauses[next++] = clauses[index];
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
if (this.counter < limit || solver.arena.wasRemoved(clause)) {
|
|
77
|
+
clauses[next++] = clause;
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
solver.checkpoint();
|
|
81
|
+
if (big === undefined ? !this.processClause(clause) : !this.processSampled(big, clause))
|
|
82
|
+
continue;
|
|
78
83
|
clauses[next++] = clause;
|
|
79
|
-
continue;
|
|
80
84
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
clauses
|
|
85
|
+
clauses.length = next;
|
|
86
|
+
} catch (error) {
|
|
87
|
+
for (; index < clauses.length; index++) clauses[next++] = clauses[index];
|
|
88
|
+
clauses.length = next;
|
|
89
|
+
this.counter = -this.counter;
|
|
90
|
+
throw error;
|
|
85
91
|
}
|
|
86
|
-
clauses.length = next;
|
|
87
92
|
}
|
|
88
93
|
|
|
89
94
|
run(isForced: boolean) {
|
|
@@ -101,38 +106,40 @@ export class AsymmBranch {
|
|
|
101
106
|
const wasProbing = solver.isProbing;
|
|
102
107
|
solver.isProbing = true;
|
|
103
108
|
let isChanged = true;
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
this.
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
109
|
+
try {
|
|
110
|
+
for (let count = 0; isChanged && count < 2; count++) {
|
|
111
|
+
isChanged = false;
|
|
112
|
+
solver.touchIndex++;
|
|
113
|
+
if (this.isSampled && this.processBig(new Big(solver.rand), true)) isChanged = true;
|
|
114
|
+
if (this.isSampled && this.processBig(new Big(solver.rand), false)) isChanged = true;
|
|
115
|
+
if (this.isEnabled) {
|
|
116
|
+
this.counter = 0;
|
|
117
|
+
const elim = this.elimLiterals;
|
|
118
|
+
this.processClauses(undefined, solver.clauses);
|
|
119
|
+
solver.propagate(false);
|
|
120
|
+
if (this.elimLiterals > elim) isChanged = true;
|
|
121
|
+
this.counter = -this.counter;
|
|
122
|
+
}
|
|
123
|
+
this.touchIndex = solver.touchIndex;
|
|
116
124
|
}
|
|
117
|
-
|
|
125
|
+
} finally {
|
|
126
|
+
solver.isProbing = wasProbing;
|
|
118
127
|
}
|
|
119
128
|
for (let index = 0; index < savedPhase.length; index++) solver.phase[index] = savedPhase[index];
|
|
120
|
-
solver.isProbing = wasProbing;
|
|
121
129
|
this.limit = Math.min(2 * this.limit, UINT_MAX);
|
|
122
130
|
}
|
|
123
131
|
|
|
124
132
|
private processAll(clause: number) {
|
|
125
133
|
this.detachScoped(clause);
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
result = this.cleanup(clause, index, newSize);
|
|
131
|
-
break;
|
|
134
|
+
try {
|
|
135
|
+
for (let index = this.solver.arena.size[clause]; index-- > 0;) {
|
|
136
|
+
const newSize = this.flipLiteralAt(clause, index);
|
|
137
|
+
if (newSize !== -1) return this.cleanup(clause, index, newSize);
|
|
132
138
|
}
|
|
139
|
+
return true;
|
|
140
|
+
} finally {
|
|
141
|
+
this.attachScoped(clause);
|
|
133
142
|
}
|
|
134
|
-
this.attachScoped(clause);
|
|
135
|
-
return result;
|
|
136
143
|
}
|
|
137
144
|
|
|
138
145
|
private sort(big: Big, clause: number) {
|
|
@@ -286,10 +293,12 @@ export class AsymmBranch {
|
|
|
286
293
|
|
|
287
294
|
private processSampled(big: Big, clause: number) {
|
|
288
295
|
this.detachScoped(clause);
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
296
|
+
try {
|
|
297
|
+
this.sort(big, clause);
|
|
298
|
+
return this.isHiddenTautology(big) || this.eliminateHiddenLiterals(big, clause);
|
|
299
|
+
} finally {
|
|
300
|
+
this.attachScoped(clause);
|
|
301
|
+
}
|
|
293
302
|
}
|
|
294
303
|
|
|
295
304
|
private processClause(clause: number) {
|
|
@@ -305,10 +314,12 @@ export class AsymmBranch {
|
|
|
305
314
|
this.counter -= size;
|
|
306
315
|
if (this.isAll) return this.processAll(clause);
|
|
307
316
|
this.detachScoped(clause);
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
317
|
+
try {
|
|
318
|
+
const flipIndex = this.rand.next() % size;
|
|
319
|
+
const newSize = this.flipLiteralAt(clause, flipIndex);
|
|
320
|
+
return newSize === -1 || this.cleanup(clause, flipIndex, newSize);
|
|
321
|
+
} finally {
|
|
322
|
+
this.attachScoped(clause);
|
|
323
|
+
}
|
|
313
324
|
}
|
|
314
325
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_clause_use_list.h, src/sat/sat_clause_use_list.cpp,
|
|
2
|
-
// src/sat/sat_simplifier.h, src/sat/sat_simplifier.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { type ClauseArena, NULL_LITERAL } from "./clause";
|
|
4
2
|
|
|
5
3
|
export class UseList {
|
|
@@ -46,12 +44,6 @@ export class UseList {
|
|
|
46
44
|
this.numRedundant[arena.get(clause, index)]++;
|
|
47
45
|
}
|
|
48
46
|
|
|
49
|
-
unblock(clause: number) {
|
|
50
|
-
const arena = this.arena;
|
|
51
|
-
for (let index = 0; index < arena.size[clause]; index++)
|
|
52
|
-
this.numRedundant[arena.get(clause, index)]--;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
47
|
erase(clause: number, exceptLit = NULL_LITERAL) {
|
|
56
48
|
const arena = this.arena;
|
|
57
49
|
const isLearned = arena.isLearned(clause);
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_clause.h, src/sat/sat_clause.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
|
|
4
1
|
export const NULL_LITERAL = -2;
|
|
5
2
|
export const NULL_BOOL_VAR = -1;
|
|
3
|
+
export const UINT_MAX = 4294967295;
|
|
6
4
|
|
|
7
5
|
const STRENGTHENED = 1;
|
|
8
6
|
const REMOVED = 2;
|
|
@@ -18,7 +16,7 @@ const grow = (array: Int32Array<ArrayBuffer>, size: number) => {
|
|
|
18
16
|
return grown;
|
|
19
17
|
};
|
|
20
18
|
|
|
21
|
-
|
|
19
|
+
const getApprox = (lits: ArrayLike<number>, size: number) => {
|
|
22
20
|
let approx = 0;
|
|
23
21
|
for (let index = 0; index < size; index++) approx |= 1 << ((lits[index] >> 1) & 31);
|
|
24
22
|
return approx;
|
|
@@ -31,7 +29,6 @@ export class ClauseArena {
|
|
|
31
29
|
private numIds = 0;
|
|
32
30
|
start = new Int32Array(64);
|
|
33
31
|
size = new Int32Array(64);
|
|
34
|
-
capacity = new Int32Array(64);
|
|
35
32
|
flags = new Int32Array(64);
|
|
36
33
|
approx = new Int32Array(64);
|
|
37
34
|
inactRounds = new Int32Array(64);
|
|
@@ -44,7 +41,6 @@ export class ClauseArena {
|
|
|
44
41
|
const length = this.start.length * 2;
|
|
45
42
|
this.start = grow(this.start, length);
|
|
46
43
|
this.size = grow(this.size, length);
|
|
47
|
-
this.capacity = grow(this.capacity, length);
|
|
48
44
|
this.flags = grow(this.flags, length);
|
|
49
45
|
this.approx = grow(this.approx, length);
|
|
50
46
|
this.inactRounds = grow(this.inactRounds, length);
|
|
@@ -61,7 +57,6 @@ export class ClauseArena {
|
|
|
61
57
|
this.start[id] = this.top;
|
|
62
58
|
this.top += numLits;
|
|
63
59
|
this.size[id] = numLits;
|
|
64
|
-
this.capacity[id] = numLits;
|
|
65
60
|
this.flags[id] = isLearned ? LEARNED : 0;
|
|
66
61
|
this.inactRounds[id] = 0;
|
|
67
62
|
this.glue[id] = 255;
|
|
@@ -84,12 +79,6 @@ export class ClauseArena {
|
|
|
84
79
|
this.freeIds.push(id);
|
|
85
80
|
}
|
|
86
81
|
|
|
87
|
-
reset() {
|
|
88
|
-
this.top = 0;
|
|
89
|
-
this.freeIds = [];
|
|
90
|
-
this.numIds = 0;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
82
|
get(id: number, index: number) {
|
|
94
83
|
return this.lits[this.start[id] + index];
|
|
95
84
|
}
|
|
@@ -105,13 +94,6 @@ export class ClauseArena {
|
|
|
105
94
|
this.lits[base + second] = lit;
|
|
106
95
|
}
|
|
107
96
|
|
|
108
|
-
contains(id: number, lit: number) {
|
|
109
|
-
const base = this.start[id];
|
|
110
|
-
for (let index = 0; index < this.size[id]; index++)
|
|
111
|
-
if (this.lits[base + index] === lit) return true;
|
|
112
|
-
return false;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
97
|
getLits(id: number) {
|
|
116
98
|
return Array.from(this.lits.subarray(this.start[id], this.start[id] + this.size[id]));
|
|
117
99
|
}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_config.h, src/sat/sat_config.cpp, src/params/sat_params.pyg,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg, src/sat/sat_asymm_branch_params.pyg,
|
|
3
|
-
// src/sat/sat_scc_params.pyg), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../../errors";
|
|
2
|
+
import { UINT_MAX } from "./clause";
|
|
5
3
|
|
|
6
4
|
export const PS_ALWAYS_TRUE = 0;
|
|
7
5
|
export const PS_ALWAYS_FALSE = 1;
|
|
@@ -21,8 +19,6 @@ export const GC_GLUE = 2;
|
|
|
21
19
|
export const GC_GLUE_PSM = 3;
|
|
22
20
|
export const GC_PSM_GLUE = 4;
|
|
23
21
|
|
|
24
|
-
const UINT_MAX = 4294967295;
|
|
25
|
-
|
|
26
22
|
export type SatParams = ReadonlyMap<string, boolean | number | string>;
|
|
27
23
|
|
|
28
24
|
const PHASES = new Map([
|
|
@@ -59,11 +55,11 @@ export const getBool = (params: SatParams, name: string, defaultValue: boolean)
|
|
|
59
55
|
return typeof value === "boolean" ? value : defaultValue;
|
|
60
56
|
};
|
|
61
57
|
|
|
62
|
-
const getSymbol = <
|
|
58
|
+
const getSymbol = <Value>(
|
|
63
59
|
params: SatParams,
|
|
64
60
|
name: string,
|
|
65
61
|
defaultValue: string,
|
|
66
|
-
values: Map<string,
|
|
62
|
+
values: Map<string, Value>,
|
|
67
63
|
message: string,
|
|
68
64
|
) => {
|
|
69
65
|
const value = values.get(String(params.get(name) ?? defaultValue));
|
|
@@ -91,11 +87,12 @@ export const getSatConfig = (params: SatParams) => ({
|
|
|
91
87
|
"invalid phase selection strategy: always_false, always_true, basic_caching, caching, random",
|
|
92
88
|
),
|
|
93
89
|
rephaseBase: getNumber(params, "rephase.base", 1000),
|
|
94
|
-
activityScale: getNumber(params, "reorder.activity_scale", 100),
|
|
95
90
|
searchSatConflicts: getNumber(params, "search.sat.conflicts", 400),
|
|
96
91
|
searchUnsatConflicts: getNumber(params, "search.unsat.conflicts", 400),
|
|
97
92
|
restartInitial: getNumber(params, "restart.initial", 2),
|
|
98
93
|
restartFactor: getNumber(params, "restart.factor", 1.5),
|
|
94
|
+
restartMax: getNumber(params, "restart.max", UINT_MAX),
|
|
95
|
+
inprocessMax: getNumber(params, "inprocess.max", UINT_MAX),
|
|
99
96
|
randomFreq: getNumber(params, "random_freq", 0.01),
|
|
100
97
|
randomSeed: getNumber(params, "random_seed", 0),
|
|
101
98
|
burstSearch: getNumber(params, "burst_search", 100),
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver.cpp, src/util/uint_set.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { getIdentityHash, ObjHashtable } from "../hashtable";
|
|
4
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
@@ -133,7 +132,7 @@ class ConsequenceFinder {
|
|
|
133
132
|
solver.initSearch();
|
|
134
133
|
solver.propagate(false);
|
|
135
134
|
if (solver.isInconsistent) return L_FALSE;
|
|
136
|
-
solver.initAssumptions(asms.length > 0 ? asms : [2 * solver.mkVar(true
|
|
135
|
+
solver.initAssumptions(asms.length > 0 ? asms : [2 * solver.mkVar(true)]);
|
|
137
136
|
solver.propagate(false);
|
|
138
137
|
if (solver.checkInconsistent()) return L_FALSE;
|
|
139
138
|
this.extractFixedConsequences(unfixedLits, assumptions, unfixedVars);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/goal2sat.h, src/sat/tactic/goal2sat.cpp,
|
|
2
|
-
// src/ast/expr2var.cpp, src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -185,7 +183,7 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
185
183
|
|
|
186
184
|
private addVar(isExternal: boolean, expr: number) {
|
|
187
185
|
const replayed = this.expr2varReplay?.get(expr);
|
|
188
|
-
return replayed ?? this.solver.mkVar(isExternal
|
|
186
|
+
return replayed ?? this.solver.mkVar(isExternal);
|
|
189
187
|
}
|
|
190
188
|
|
|
191
189
|
private mkBoolVar(expr: number) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver/inc_sat_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
|
|
4
3
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
@@ -11,7 +10,7 @@ import { convertModel, mkIncSatEufPreprocess, mkIncSatPreprocess } from "../tact
|
|
|
11
10
|
import type { SatParams } from "./config";
|
|
12
11
|
import { Goal2Sat } from "./goal2sat";
|
|
13
12
|
import { getConsequences } from "./consequences";
|
|
14
|
-
import { sat2goal } from "./sat2goal";
|
|
13
|
+
import { isLiteral, sat2goal } from "./sat2goal";
|
|
15
14
|
import { Solver } from "./solver";
|
|
16
15
|
|
|
17
16
|
const BIT_BLAST_PARAMS = {
|
|
@@ -68,18 +67,10 @@ export class IncSatSolver {
|
|
|
68
67
|
this.internalized = new RefVector(manager);
|
|
69
68
|
}
|
|
70
69
|
|
|
71
|
-
private isLiteral(expr: number) {
|
|
72
|
-
const manager = this.manager;
|
|
73
|
-
return (
|
|
74
|
-
manager.isUninterpretedConst(expr) ||
|
|
75
|
-
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
|
|
76
|
-
);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
70
|
private isClause(expr: number): boolean {
|
|
80
71
|
const manager = this.manager;
|
|
81
72
|
if (manager.depths[expr] > 4) return false;
|
|
82
|
-
if (
|
|
73
|
+
if (isLiteral(manager, expr)) return true;
|
|
83
74
|
if (!manager.isApp(expr)) return false;
|
|
84
75
|
const op = manager.getOp(expr);
|
|
85
76
|
const isConnective =
|
|
@@ -189,7 +180,6 @@ export class IncSatSolver {
|
|
|
189
180
|
seen.add(lit);
|
|
190
181
|
this.asms.push(lit);
|
|
191
182
|
}
|
|
192
|
-
return L_TRUE;
|
|
193
183
|
}
|
|
194
184
|
|
|
195
185
|
check(assumptions: readonly number[] = []) {
|
|
@@ -200,7 +190,7 @@ export class IncSatSolver {
|
|
|
200
190
|
const literals: number[] = [];
|
|
201
191
|
const asm2fml = new Map<number, number>();
|
|
202
192
|
for (const assumption of assumptions) {
|
|
203
|
-
if (this.
|
|
193
|
+
if (isLiteral(this.manager, assumption)) {
|
|
204
194
|
literals.push(assumption);
|
|
205
195
|
asm2fml.set(assumption, assumption);
|
|
206
196
|
continue;
|
|
@@ -255,7 +245,7 @@ export class IncSatSolver {
|
|
|
255
245
|
const consequences: number[] = [];
|
|
256
246
|
const internalized = this.internalizeFormulas();
|
|
257
247
|
if (internalized !== L_TRUE) return { result: internalized, consequences };
|
|
258
|
-
if (!assumptions.every((assumption) => this.
|
|
248
|
+
if (!assumptions.every((assumption) => isLiteral(this.manager, assumption)))
|
|
259
249
|
throw new SmtUnsupportedError("get-consequences assumptions that are not literals");
|
|
260
250
|
this.internalizeAssumptions(assumptions);
|
|
261
251
|
const found = getConsequences(
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_model_converter.h, src/sat/sat_model_converter.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
4
2
|
import { NULL_BOOL_VAR, NULL_LITERAL } from "./clause";
|
|
5
3
|
|
|
@@ -14,7 +12,6 @@ export interface McEntry {
|
|
|
14
12
|
boolVar: number;
|
|
15
13
|
kind: number;
|
|
16
14
|
clauses: number[];
|
|
17
|
-
clause: number[];
|
|
18
15
|
elimStacks: (number[] | undefined)[];
|
|
19
16
|
}
|
|
20
17
|
|
|
@@ -26,7 +23,6 @@ const getLitValue = (lit: number, model: Int8Array) => {
|
|
|
26
23
|
export class ModelConverter {
|
|
27
24
|
entries: McEntry[] = [];
|
|
28
25
|
exposedLim = 0;
|
|
29
|
-
private mark: boolean[] = [];
|
|
30
26
|
elimStack: number[] = [];
|
|
31
27
|
|
|
32
28
|
private processStack(model: Int8Array, clause: number[], stack: number[]) {
|
|
@@ -74,7 +70,7 @@ export class ModelConverter {
|
|
|
74
70
|
}
|
|
75
71
|
|
|
76
72
|
mk(kind: number, boolVar: number) {
|
|
77
|
-
const entry: McEntry = { boolVar, kind, clauses: [],
|
|
73
|
+
const entry: McEntry = { boolVar, kind, clauses: [], elimStacks: [] };
|
|
78
74
|
this.entries.push(entry);
|
|
79
75
|
return entry;
|
|
80
76
|
}
|
|
@@ -89,19 +85,11 @@ export class ModelConverter {
|
|
|
89
85
|
this.elimStack = [];
|
|
90
86
|
}
|
|
91
87
|
|
|
92
|
-
setClause(entry: McEntry, lits: number[]) {
|
|
93
|
-
entry.clause.push(...lits);
|
|
94
|
-
}
|
|
95
|
-
|
|
96
88
|
insert(entry: McEntry, lits: number[]) {
|
|
97
89
|
entry.clauses.push(...lits, NULL_LITERAL);
|
|
98
90
|
this.addElimStack(entry);
|
|
99
91
|
}
|
|
100
92
|
|
|
101
|
-
isEmpty() {
|
|
102
|
-
return this.entries.length === 0;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
93
|
flush(source: ModelConverter) {
|
|
106
94
|
this.entries.push(...source.entries);
|
|
107
95
|
this.exposedLim += source.exposedLim;
|
|
@@ -109,14 +97,6 @@ export class ModelConverter {
|
|
|
109
97
|
source.exposedLim = 0;
|
|
110
98
|
}
|
|
111
99
|
|
|
112
|
-
addClause(lits: number[]) {
|
|
113
|
-
if (this.entries.length === 0) return;
|
|
114
|
-
for (const lit of lits) {
|
|
115
|
-
while (this.mark.length <= lit >> 1) this.mark.push(false);
|
|
116
|
-
this.mark[lit >> 1] = true;
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
|
|
120
100
|
private swap(boolVar: number, size: number, clause: number[]) {
|
|
121
101
|
for (let index = 0; index < size; index++)
|
|
122
102
|
if (clause[index] >> 1 === boolVar) {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/pb_constraint.h, src/sat/smt/pb_constraint.cpp,
|
|
2
|
-
// src/sat/smt/pb_card.h, src/sat/smt/pb_card.cpp, src/sat/smt/pb_pb.h, src/sat/smt/pb_pb.cpp),
|
|
3
|
-
// MIT license, see z3-license.txt.
|
|
4
1
|
import { L_FALSE } from "../lbool";
|
|
5
2
|
import { NULL_LITERAL } from "./clause";
|
|
6
3
|
import { WATCH_EXT_CONSTRAINT, type WatchList } from "./watch-list";
|