tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
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 +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 +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- 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/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- 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 +5 -3
- 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 +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- 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 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- 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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- 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 +50 -3
- 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/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- 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 +0 -1
- 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 +3 -6
- 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 +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- 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 +15 -19
- 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 +1 -4
- 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 +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- 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 +1 -3
- 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 +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- 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 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- 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 +1 -3
- 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 +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- 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 +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- 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 +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- 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 +0 -1
- 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 +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -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 +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 +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 +26 -7
- 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 +158 -82
- 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 +138 -97
- 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 -290
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- 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 +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- 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 +9 -2
- 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 +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- 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 +3 -2
- 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 +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- 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 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- 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 +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- 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 +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- 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 +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- 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 +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- 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 -20
- 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 +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- 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 +4 -7
- 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 +48 -57
- 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 +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -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 +14 -10
- 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 +35 -21
- 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 +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- 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 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- 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 +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- 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 +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- 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 +15 -54
- 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 -2
- 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 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- 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 +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- 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 +2 -3
- 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 +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- 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 +1 -3
- 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 +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 +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- 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/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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/smt/smt_quantifier.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { CHECK_MODEL_RESTART, CHECK_MODEL_SAT, CHECK_MODEL_UNKNOWN, type Context } from "./context";
|
|
3
2
|
import { FC_CONTINUE, FC_DONE } from "./theory";
|
|
4
3
|
import { Mam } from "./e-matching";
|
|
@@ -26,17 +25,21 @@ export class DefaultQuantifierManager {
|
|
|
26
25
|
private lazyMatchingIndex = 0;
|
|
27
26
|
private mbqi: Mbqi | null = null;
|
|
28
27
|
|
|
29
|
-
constructor(
|
|
30
|
-
private context: Context,
|
|
31
|
-
isMbqi: boolean,
|
|
32
|
-
) {
|
|
28
|
+
constructor(private context: Context) {
|
|
33
29
|
this.qiQueue = new QiQueue(context);
|
|
34
30
|
const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
|
|
35
31
|
this.addInstance(quantifier, bindings, maxGeneration);
|
|
36
32
|
this.mam = new Mam(context, onMatch);
|
|
37
33
|
this.lazyMam = new Mam(context, onMatch);
|
|
38
|
-
|
|
34
|
+
this.updateParams();
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// As in Z3, smt.mbqi is read each time the model finder would run.
|
|
38
|
+
updateParams() {
|
|
39
|
+
const context = this.context;
|
|
40
|
+
if (!context.params.isMbqi || this.mbqi !== null) return;
|
|
39
41
|
const finder = new ModelFinder(context);
|
|
42
|
+
for (let level = 0; level < context.scopeLevel; level++) finder.pushScope();
|
|
40
43
|
this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
|
|
41
44
|
}
|
|
42
45
|
|
|
@@ -47,7 +50,7 @@ export class DefaultQuantifierManager {
|
|
|
47
50
|
add(quantifier: number, generation: number) {
|
|
48
51
|
this.quantifiers.push(quantifier);
|
|
49
52
|
this.generations.set(quantifier, generation);
|
|
50
|
-
this.mbqi?.finder.registerQuantifier(quantifier);
|
|
53
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.registerQuantifier(quantifier);
|
|
51
54
|
}
|
|
52
55
|
|
|
53
56
|
del(quantifier: number) {
|
|
@@ -150,20 +153,21 @@ export class DefaultQuantifierManager {
|
|
|
150
153
|
}
|
|
151
154
|
|
|
152
155
|
restartEh() {
|
|
156
|
+
if (!this.context.params.isMbqi) return;
|
|
153
157
|
this.mbqi?.finder.restartEh();
|
|
154
158
|
this.mbqi?.checker.restartEh();
|
|
155
159
|
}
|
|
156
160
|
|
|
157
161
|
isModelBased() {
|
|
158
|
-
return this.
|
|
162
|
+
return this.context.params.isMbqi;
|
|
159
163
|
}
|
|
160
164
|
|
|
161
165
|
adjustModel(model: ProtoModel) {
|
|
162
|
-
this.mbqi?.finder.fixModel(model);
|
|
166
|
+
if (this.context.params.isMbqi) this.mbqi?.finder.fixModel(model);
|
|
163
167
|
}
|
|
164
168
|
|
|
165
169
|
checkModel(model: ProtoModel, root2value: Map<Enode, number>) {
|
|
166
|
-
const checker = this.mbqi?.checker;
|
|
170
|
+
const checker = this.context.params.isMbqi ? this.mbqi?.checker : undefined;
|
|
167
171
|
if (this.quantifiers.length === 0) return CHECK_MODEL_SAT;
|
|
168
172
|
if (checker === undefined) return CHECK_MODEL_UNKNOWN;
|
|
169
173
|
if (checker.check(model, root2value)) return CHECK_MODEL_SAT;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/macros/quasi_macros.cpp, src/tactic/ufbv/quasi_macros_tactic.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
FAMILY_USER,
|
|
@@ -15,6 +13,7 @@ import {
|
|
|
15
13
|
} from "./ast";
|
|
16
14
|
import type { Goal } from "./goal";
|
|
17
15
|
import { MacroManager } from "./macro-finder";
|
|
16
|
+
import { hasSubterm } from "./recfun-decl-plugin";
|
|
18
17
|
import { RefVector } from "./ref-vector";
|
|
19
18
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
20
19
|
|
|
@@ -24,25 +23,10 @@ interface QuasiMacro {
|
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
const isNonGroundUninterp = (manager: AstManager, expr: number) =>
|
|
27
|
-
!manager.
|
|
26
|
+
!manager.isGroundApp(expr) &&
|
|
28
27
|
manager.kinds[expr] === KIND_APP &&
|
|
29
28
|
manager.funcDecls[manager.decls[expr]].family === FAMILY_USER;
|
|
30
29
|
|
|
31
|
-
const isDependingOn = (manager: AstManager, expr: number, decl: number) => {
|
|
32
|
-
const visited = new Set<number>();
|
|
33
|
-
const todo = [expr];
|
|
34
|
-
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
35
|
-
if (visited.has(current)) continue;
|
|
36
|
-
if (manager.kinds[current] === KIND_APP) {
|
|
37
|
-
if (manager.decls[current] === decl) return true;
|
|
38
|
-
for (let index = manager.getNumArgs(current); index > 0; index--)
|
|
39
|
-
todo.push(manager.getArg(current, index - 1));
|
|
40
|
-
}
|
|
41
|
-
visited.add(current);
|
|
42
|
-
}
|
|
43
|
-
return false;
|
|
44
|
-
};
|
|
45
|
-
|
|
46
30
|
const isFullyDependingOn = (manager: AstManager, app: number, numDecls: number) => {
|
|
47
31
|
const isUsed = Array.from({ length: numDecls }, () => false);
|
|
48
32
|
for (const arg of manager.getArgs(app))
|
|
@@ -96,7 +80,12 @@ class QuasiMacros {
|
|
|
96
80
|
return (
|
|
97
81
|
isNonGroundUninterp(manager, lhs) &&
|
|
98
82
|
this.isUnique(manager.decls[lhs]) &&
|
|
99
|
-
!
|
|
83
|
+
!hasSubterm(
|
|
84
|
+
manager,
|
|
85
|
+
[rhs],
|
|
86
|
+
(expr) => manager.kinds[expr] === KIND_APP && manager.decls[expr] === manager.decls[lhs],
|
|
87
|
+
false,
|
|
88
|
+
) &&
|
|
100
89
|
isFullyDependingOn(manager, lhs, numDecls)
|
|
101
90
|
);
|
|
102
91
|
}
|
|
@@ -145,7 +134,7 @@ class QuasiMacros {
|
|
|
145
134
|
let numSeen = 0;
|
|
146
135
|
for (const [index, arg] of manager.getArgs(macro.head).entries()) {
|
|
147
136
|
const isVar = manager.kinds[arg] === KIND_VAR;
|
|
148
|
-
if (!isVar && !manager.
|
|
137
|
+
if (!isVar && !manager.isGroundApp(arg)) return -1;
|
|
149
138
|
if (isVar && !isSeen[manager.values[arg]]) {
|
|
150
139
|
this.newVars.push(arg);
|
|
151
140
|
isSeen[manager.values[arg]] = true;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { SmtInvariantError } from "../../../errors";
|
|
2
2
|
|
|
3
3
|
export const getGcd = (first: bigint, second: bigint) => {
|
|
4
4
|
let left = first < 0n ? -first : first;
|
|
@@ -63,6 +63,21 @@ const getIntRoot = (value: bigint, degree: number): bigint | undefined => {
|
|
|
63
63
|
return low ** exponent === value ? low : undefined;
|
|
64
64
|
};
|
|
65
65
|
|
|
66
|
+
// rational::mult_inverse: the inverse of the value modulo 2^bits, which only an odd value has.
|
|
67
|
+
export const getMultInverse = (value: bigint, bits: number) => {
|
|
68
|
+
if (value === 1n) return 1n;
|
|
69
|
+
if (value % 2n === 0n) return undefined;
|
|
70
|
+
const modulus = 1n << BigInt(bits);
|
|
71
|
+
let [oldRemainder, remainder] = [((value % modulus) + modulus) % modulus, modulus];
|
|
72
|
+
let [oldCoefficient, coefficient] = [1n, 0n];
|
|
73
|
+
while (remainder !== 0n) {
|
|
74
|
+
const quotient = oldRemainder / remainder;
|
|
75
|
+
[oldRemainder, remainder] = [remainder, oldRemainder - quotient * remainder];
|
|
76
|
+
[oldCoefficient, coefficient] = [coefficient, oldCoefficient - quotient * coefficient];
|
|
77
|
+
}
|
|
78
|
+
return ((oldCoefficient % modulus) + modulus) % modulus;
|
|
79
|
+
};
|
|
80
|
+
|
|
66
81
|
export class Rational {
|
|
67
82
|
static readonly zero = new Rational(0n, 1n);
|
|
68
83
|
static readonly one = new Rational(1n, 1n);
|
|
@@ -85,6 +100,7 @@ export class Rational {
|
|
|
85
100
|
}
|
|
86
101
|
|
|
87
102
|
static fromDouble(value: number) {
|
|
103
|
+
if (!Number.isFinite(value)) throw new SmtInvariantError(`${value} is not a rational number`);
|
|
88
104
|
let den = 1n;
|
|
89
105
|
let scaled = value;
|
|
90
106
|
while (!Number.isInteger(scaled)) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/recfun_decl_plugin.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
KIND_APP,
|
|
@@ -10,6 +9,7 @@ import {
|
|
|
10
9
|
SORT_BOOL,
|
|
11
10
|
} from "./ast";
|
|
12
11
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
12
|
+
import { ObjMap } from "./hashtable";
|
|
13
13
|
|
|
14
14
|
const getChildren = (manager: AstManager, expr: number, isUnderQuantifiers: boolean) =>
|
|
15
15
|
manager.kinds[expr] === KIND_QUANTIFIER
|
|
@@ -32,28 +32,43 @@ export const getSubterms = (manager: AstManager, expr: number, isUnderQuantifier
|
|
|
32
32
|
return [...visited];
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const hasPredicate = (
|
|
35
|
+
// Whether a subterm of the roots satisfies the predicate, which the walk calls in no particular
|
|
36
|
+
// order.
|
|
37
|
+
export const hasSubterm = (
|
|
39
38
|
manager: AstManager,
|
|
40
|
-
|
|
39
|
+
roots: readonly number[],
|
|
41
40
|
predicate: (term: number) => boolean,
|
|
42
|
-
isUnderQuantifiers =
|
|
43
|
-
) =>
|
|
41
|
+
isUnderQuantifiers = true,
|
|
42
|
+
) => {
|
|
43
|
+
const visited = new Set<number>();
|
|
44
|
+
const todo = [...roots];
|
|
45
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
46
|
+
if (visited.has(current)) continue;
|
|
47
|
+
visited.add(current);
|
|
48
|
+
if (predicate(current)) return true;
|
|
49
|
+
if (manager.kinds[current] === KIND_APP) manager.pushArgs(current, todo);
|
|
50
|
+
else if (isUnderQuantifiers && manager.kinds[current] === KIND_QUANTIFIER)
|
|
51
|
+
todo.push(manager.getQuantifier(current).body);
|
|
52
|
+
}
|
|
53
|
+
return false;
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export const isDefinedApp = (manager: AstManager, expr: number) =>
|
|
57
|
+
manager.getOp(expr) === OP_FUN_DEFINED;
|
|
44
58
|
|
|
45
59
|
export const containsDef = (manager: AstManager, expr: number) =>
|
|
46
|
-
|
|
60
|
+
hasSubterm(manager, [expr], (term) => isDefinedApp(manager, term), false);
|
|
47
61
|
|
|
48
62
|
// An ite on a condition without a defined function, with one in a branch.
|
|
49
63
|
const containsIte = (manager: AstManager, expr: number) =>
|
|
50
|
-
|
|
64
|
+
hasSubterm(
|
|
51
65
|
manager,
|
|
52
|
-
expr,
|
|
66
|
+
[expr],
|
|
53
67
|
(term) =>
|
|
54
68
|
manager.getOp(term) === OP_ITE &&
|
|
55
69
|
!containsDef(manager, manager.getArg(term, 0)) &&
|
|
56
70
|
containsDef(manager, term),
|
|
71
|
+
false,
|
|
57
72
|
);
|
|
58
73
|
|
|
59
74
|
interface ChoiceList {
|
|
@@ -134,10 +149,11 @@ const computeCases = (manager: AstManager, def: RecFunDef, isMacro: boolean, rhs
|
|
|
134
149
|
}
|
|
135
150
|
if (branch.toSplit !== null) {
|
|
136
151
|
const ite = branch.toSplit.expr;
|
|
152
|
+
const toSplit = branch.toSplit.next;
|
|
137
153
|
const condition = manager.getArg(ite, 0);
|
|
138
154
|
const mkBranch = (isPositive: boolean): Branch => ({
|
|
139
155
|
path: { ite, isPositive, next: branch.path },
|
|
140
|
-
toSplit
|
|
156
|
+
toSplit,
|
|
141
157
|
toUnfold: {
|
|
142
158
|
expr: condition,
|
|
143
159
|
next: { expr: manager.getArg(ite, isPositive ? 1 : 2), next: branch.toUnfold },
|
|
@@ -153,12 +169,7 @@ const computeCases = (manager: AstManager, def: RecFunDef, isMacro: boolean, rhs
|
|
|
153
169
|
const caseRhs = subst.apply(rhs);
|
|
154
170
|
const guards = conditions.map((condition) => subst.apply(condition));
|
|
155
171
|
subst.release();
|
|
156
|
-
const isImmediate = !
|
|
157
|
-
manager,
|
|
158
|
-
caseRhs,
|
|
159
|
-
(term) => isDefinedApp(manager, term),
|
|
160
|
-
true,
|
|
161
|
-
);
|
|
172
|
+
const isImmediate = !hasSubterm(manager, [caseRhs], (term) => isDefinedApp(manager, term));
|
|
162
173
|
addCase(manager, def, guards, caseRhs, isImmediate);
|
|
163
174
|
manager.decRef(caseRhs);
|
|
164
175
|
for (const guard of guards) manager.decRef(guard);
|
|
@@ -168,7 +179,8 @@ const computeCases = (manager: AstManager, def: RecFunDef, isMacro: boolean, rhs
|
|
|
168
179
|
}
|
|
169
180
|
};
|
|
170
181
|
|
|
171
|
-
// compute_scores: the number of ites on the paths from the root to each subterm.
|
|
182
|
+
// compute_scores: the number of ites on the paths from the root to each subterm. The scores are in
|
|
183
|
+
// an obj_map, whose order decides which of the ites with the highest score redirect_ite takes.
|
|
172
184
|
const computeScores = (manager: AstManager, expr: number) => {
|
|
173
185
|
const parents = new Map<number, number[]>([[expr, []]]);
|
|
174
186
|
const byDepth = new Map<number, number[]>();
|
|
@@ -182,7 +194,8 @@ const computeScores = (manager: AstManager, expr: number) => {
|
|
|
182
194
|
const depth = manager.depths[term];
|
|
183
195
|
byDepth.set(depth, [...(byDepth.get(depth) ?? []), term]);
|
|
184
196
|
}
|
|
185
|
-
const scores = new
|
|
197
|
+
const scores = new ObjMap<number>((term) => manager.hashes[term]);
|
|
198
|
+
scores.set(expr, 0);
|
|
186
199
|
for (let depth = manager.depths[expr]; depth > 0; depth--)
|
|
187
200
|
for (const term of byDepth.get(depth) ?? []) {
|
|
188
201
|
const score = (parents.get(term) ?? []).reduce(
|
|
@@ -211,8 +224,9 @@ const redirectIte = (manager: AstManager, def: RecFunDef, rhs: number) => {
|
|
|
211
224
|
maxScore = score;
|
|
212
225
|
}
|
|
213
226
|
if (maxScore <= 4) break;
|
|
227
|
+
// mk_fresh_id gives the id after the increment.
|
|
214
228
|
const decl = manager.mkRecFuncDecl(
|
|
215
|
-
`fold-rec-${manager.mkFreshId()}`,
|
|
229
|
+
`fold-rec-${manager.mkFreshId() + 1}`,
|
|
216
230
|
domain,
|
|
217
231
|
manager.sorts[maxExpr],
|
|
218
232
|
);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/recfun_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_USER,
|
|
@@ -97,7 +96,7 @@ export const mkRecFunApp = (
|
|
|
97
96
|
args.some(
|
|
98
97
|
(arg, position) =>
|
|
99
98
|
manager.getOp(arg) === OP_DT_CONSTRUCTOR &&
|
|
100
|
-
isDecreasingArg(manager, decl, position, manager.
|
|
99
|
+
isDecreasingArg(manager, decl, position, manager.isGroundApp(arg)),
|
|
101
100
|
));
|
|
102
101
|
if (!isSafe) return undefined;
|
|
103
102
|
const subst = new VarSubst(manager, true);
|
|
@@ -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;
|
|
@@ -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;
|