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,26 +1,20 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/bv_bound_chk_tactic.cpp, src/ast/rewriter/bv_bounds.h,
|
|
2
|
-
// src/ast/rewriter/bv_bounds.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
6
4
|
FAMILY_BASIC,
|
|
7
5
|
KIND_APP,
|
|
8
|
-
OP_ADD,
|
|
9
6
|
OP_AND,
|
|
10
7
|
OP_ARRAY_MAP,
|
|
11
8
|
OP_BADD,
|
|
12
9
|
OP_EQ,
|
|
13
10
|
OP_EXTRACT,
|
|
14
|
-
OP_MUL,
|
|
15
11
|
OP_NOT,
|
|
16
12
|
OP_OR,
|
|
17
|
-
OP_SEQ_CONCAT,
|
|
18
13
|
OP_SLEQ,
|
|
19
14
|
OP_ULEQ,
|
|
20
|
-
OP_XOR,
|
|
21
15
|
SORT_BOOL,
|
|
22
16
|
} from "./ast";
|
|
23
|
-
import {
|
|
17
|
+
import { isAssociativeOp } from "./ast-util";
|
|
24
18
|
import { release } from "./expr-ref";
|
|
25
19
|
import type { Goal } from "./goal";
|
|
26
20
|
import { ObjMap } from "./hashtable";
|
|
@@ -30,8 +24,6 @@ const CONVERTED = 0;
|
|
|
30
24
|
const UNSAT = 1;
|
|
31
25
|
const UNDEF = 2;
|
|
32
26
|
|
|
33
|
-
const ASSOCIATIVE_OPS = new Set([OP_AND, OP_OR, OP_XOR, OP_ADD, OP_MUL, OP_SEQ_CONCAT]);
|
|
34
|
-
|
|
35
27
|
interface Interval {
|
|
36
28
|
lo: bigint;
|
|
37
29
|
hi: bigint;
|
|
@@ -466,7 +458,7 @@ class BvBoundChkRewriter extends RewriterTpl {
|
|
|
466
458
|
const funcDecl = this.manager.funcDecls[decl];
|
|
467
459
|
return funcDecl.op === OP_ARRAY_MAP
|
|
468
460
|
? this.isFlatAssoc(funcDecl.parameters[0])
|
|
469
|
-
:
|
|
461
|
+
: isAssociativeOp(funcDecl.op);
|
|
470
462
|
}
|
|
471
463
|
|
|
472
464
|
isRewritingPatterns() {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/bv_rewriter.cpp, mk_extract_proc.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { isAstLess } from "./ast-lt";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -85,7 +83,7 @@ import {
|
|
|
85
83
|
} from "./ast";
|
|
86
84
|
import { mkBvApp } from "./bv-decl-plugin";
|
|
87
85
|
import { type ArithRewriterOptions, PolyRewriter } from "./poly-rewriter";
|
|
88
|
-
import { Rational } from "./rational";
|
|
86
|
+
import { getMultInverse, Rational } from "./rational";
|
|
89
87
|
import type { Rewrite } from "./rewriter-tpl";
|
|
90
88
|
|
|
91
89
|
type Result = number | Rewrite | undefined;
|
|
@@ -94,6 +92,7 @@ export interface BvRewriterOptions {
|
|
|
94
92
|
readonly isHiDiv0: boolean;
|
|
95
93
|
readonly isMul2concat: boolean;
|
|
96
94
|
readonly isSplitConcatEq: boolean;
|
|
95
|
+
readonly isMkbv2num?: boolean;
|
|
97
96
|
}
|
|
98
97
|
|
|
99
98
|
export const DEFAULT_BV_OPTIONS: Omit<BvRewriterOptions, "isHiDiv0"> = {
|
|
@@ -101,7 +100,7 @@ export const DEFAULT_BV_OPTIONS: Omit<BvRewriterOptions, "isHiDiv0"> = {
|
|
|
101
100
|
isSplitConcatEq: false,
|
|
102
101
|
};
|
|
103
102
|
|
|
104
|
-
|
|
103
|
+
interface BoolRewrites {
|
|
105
104
|
mkEq: (left: number, right: number) => number;
|
|
106
105
|
mkIte: (condition: number, thenExpr: number, elseExpr: number) => number;
|
|
107
106
|
}
|
|
@@ -117,20 +116,6 @@ const getPowerOfTwoExponent = (value: bigint) => {
|
|
|
117
116
|
return value.toString(2).length - 1;
|
|
118
117
|
};
|
|
119
118
|
|
|
120
|
-
const getMultInverse = (value: bigint, bits: number) => {
|
|
121
|
-
if (value === 1n) return 1n;
|
|
122
|
-
if (value % 2n === 0n) return undefined;
|
|
123
|
-
const modulus = getPowerOfTwo(bits);
|
|
124
|
-
let [oldRemainder, remainder] = [getMod(value, modulus), modulus];
|
|
125
|
-
let [oldCoefficient, coefficient] = [1n, 0n];
|
|
126
|
-
while (remainder !== 0n) {
|
|
127
|
-
const quotient = oldRemainder / remainder;
|
|
128
|
-
[oldRemainder, remainder] = [remainder, oldRemainder - quotient * remainder];
|
|
129
|
-
[oldCoefficient, coefficient] = [coefficient, oldCoefficient - quotient * coefficient];
|
|
130
|
-
}
|
|
131
|
-
return getMod(oldCoefficient, modulus);
|
|
132
|
-
};
|
|
133
|
-
|
|
134
119
|
const getAbs = (value: bigint) => (value < 0n ? -value : value);
|
|
135
120
|
|
|
136
121
|
export class BvRewriter extends PolyRewriter {
|
|
@@ -405,7 +390,7 @@ export class BvRewriter extends PolyRewriter {
|
|
|
405
390
|
2,
|
|
406
391
|
);
|
|
407
392
|
case OP_MKBV:
|
|
408
|
-
return
|
|
393
|
+
return this.mkMkbv(args);
|
|
409
394
|
case OP_BIT2BOOL:
|
|
410
395
|
return this.mkBit2boolIndex(args[0], parameters[0]);
|
|
411
396
|
case OP_BSMUL_NO_OVFL:
|
|
@@ -1557,6 +1542,17 @@ export class BvRewriter extends PolyRewriter {
|
|
|
1557
1542
|
return rewrite(this.mkConcatTerm([kept, this.mkZero(shift)]), 2);
|
|
1558
1543
|
}
|
|
1559
1544
|
|
|
1545
|
+
private mkMkbv(args: number[]) {
|
|
1546
|
+
const manager = this.manager;
|
|
1547
|
+
if (this.bvOptions.isMkbv2num !== true) return undefined;
|
|
1548
|
+
let value = 0n;
|
|
1549
|
+
for (let index = args.length - 1; index >= 0; index--) {
|
|
1550
|
+
if (!manager.isTrue(args[index]) && !manager.isFalse(args[index])) return undefined;
|
|
1551
|
+
value = value * 2n + (manager.isTrue(args[index]) ? 1n : 0n);
|
|
1552
|
+
}
|
|
1553
|
+
return this.mkBv(value, args.length);
|
|
1554
|
+
}
|
|
1555
|
+
|
|
1560
1556
|
private mkBit2boolIndex(arg: number, index: number): Result {
|
|
1561
1557
|
const manager = this.manager;
|
|
1562
1558
|
if (manager.getOp(arg) === OP_MKBV) return manager.getArg(arg, index);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/bv1_blaster_tactic.h, src/ast/simplifiers/bv1_blaster.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -200,15 +198,7 @@ export const runBv1Blast = (manager: AstManager) => (goal: Goal) => {
|
|
|
200
198
|
const rewriter = new Bv1BlasterRewriter(manager);
|
|
201
199
|
return {
|
|
202
200
|
reduce: () => {
|
|
203
|
-
|
|
204
|
-
state.forEachIndex((index) => {
|
|
205
|
-
const form = state.get(index);
|
|
206
|
-
const next = rewriter.rewrite(form);
|
|
207
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
208
|
-
rewritten = next;
|
|
209
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
210
|
-
});
|
|
211
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
201
|
+
state.rewriteEach((form) => rewriter.rewrite(form));
|
|
212
202
|
if (rewriter.newbits.length === 0) return;
|
|
213
203
|
const definitions: Definition[] = rewriter.newbits.map((decl) => ({ decl, def: -1 }));
|
|
214
204
|
for (const [decl, bits] of rewriter.const2bits) definitions.push({ decl, def: bits });
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/card2bv.cpp, src/ast/rewriter/pb2bv_rewriter.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -71,8 +69,7 @@ const isPb = (manager: AstManager, first: number, second: number) => {
|
|
|
71
69
|
export const checkPbFree = (manager: AstManager, form: number) => {
|
|
72
70
|
const visited = new Set<number>();
|
|
73
71
|
const todo = [form];
|
|
74
|
-
|
|
75
|
-
const expr = todo.pop() as number;
|
|
72
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
76
73
|
if (visited.has(expr)) continue;
|
|
77
74
|
visited.add(expr);
|
|
78
75
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_cg_table.h, src/smt/smt_cg_table.cpp, src/ast/euf/euf_etable.h,
|
|
2
|
-
// src/ast/euf/euf_etable.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { CONGRUENCE_JUSTIFICATIONS, type Enode } from "./enode";
|
|
4
2
|
|
|
5
3
|
// The smt enode and the euf enode share the congruence table.
|
|
@@ -7,7 +5,9 @@ export interface CgNode {
|
|
|
7
5
|
readonly owner: number;
|
|
8
6
|
readonly decl: number;
|
|
9
7
|
readonly numArgs: number;
|
|
10
|
-
readonly
|
|
8
|
+
readonly isCommutative: boolean;
|
|
9
|
+
// Whether cg_table::mk_table_for gives the declaration the binary commutative table.
|
|
10
|
+
readonly isCommutativeTable: boolean;
|
|
11
11
|
readonly root: CgNode;
|
|
12
12
|
getArg(index: number): CgNode;
|
|
13
13
|
}
|
|
@@ -17,8 +17,8 @@ const getEqHash = (decl: number, first: number, second: number) =>
|
|
|
17
17
|
? (Math.imul(Math.imul(decl, 0x9e3779b1) + first, 0x85ebca6b) + second) | 0
|
|
18
18
|
: (Math.imul(Math.imul(decl, 0x9e3779b1) + second, 0x85ebca6b) + first) | 0;
|
|
19
19
|
|
|
20
|
-
const getHash = (decl: number, args: readonly CgNode[],
|
|
21
|
-
if (
|
|
20
|
+
const getHash = (decl: number, args: readonly CgNode[], isCommutativeTable: boolean) => {
|
|
21
|
+
if (isCommutativeTable) return getEqHash(decl, args[0].root.owner, args[1].root.owner);
|
|
22
22
|
let hash = decl;
|
|
23
23
|
for (let index = 0; index < args.length; index++)
|
|
24
24
|
hash = (Math.imul(hash, 0x9e3779b1) + args[index].root.owner) | 0;
|
|
@@ -26,25 +26,26 @@ const getHash = (decl: number, args: readonly CgNode[], isEq: boolean) => {
|
|
|
26
26
|
};
|
|
27
27
|
|
|
28
28
|
const getNodeHash = (node: CgNode) => {
|
|
29
|
-
if (node.
|
|
29
|
+
if (node.isCommutativeTable)
|
|
30
|
+
return getEqHash(node.decl, node.getArg(0).root.owner, node.getArg(1).root.owner);
|
|
30
31
|
let hash = node.decl;
|
|
31
32
|
for (let index = 0; index < node.numArgs; index++)
|
|
32
33
|
hash = (Math.imul(hash, 0x9e3779b1) + node.getArg(index).root.owner) | 0;
|
|
33
34
|
return hash;
|
|
34
35
|
};
|
|
35
36
|
|
|
36
|
-
const isPairCongruentTo = (node: CgNode, first: CgNode, second: CgNode,
|
|
37
|
+
const isPairCongruentTo = (node: CgNode, first: CgNode, second: CgNode, isCommutative: boolean) => {
|
|
37
38
|
const nodeFirst = node.getArg(0).root;
|
|
38
39
|
const nodeSecond = node.getArg(1).root;
|
|
39
40
|
return (
|
|
40
41
|
(nodeFirst === first.root && nodeSecond === second.root) ||
|
|
41
|
-
(
|
|
42
|
+
(isCommutative && nodeFirst === second.root && nodeSecond === first.root)
|
|
42
43
|
);
|
|
43
44
|
};
|
|
44
45
|
|
|
45
|
-
const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[]
|
|
46
|
+
const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[]) => {
|
|
46
47
|
if (node.decl !== decl || node.numArgs !== args.length) return false;
|
|
47
|
-
if (
|
|
48
|
+
if (node.isCommutative) return isPairCongruentTo(node, args[0], args[1], true);
|
|
48
49
|
for (let index = 0; index < args.length; index++)
|
|
49
50
|
if (node.getArg(index).root !== args[index].root) return false;
|
|
50
51
|
return true;
|
|
@@ -53,14 +54,16 @@ const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[], isEq
|
|
|
53
54
|
export const isCongruent = (first: CgNode, second: CgNode) => {
|
|
54
55
|
if (first.decl !== second.decl || first.numArgs !== second.numArgs) return false;
|
|
55
56
|
if (first.numArgs === 2)
|
|
56
|
-
return isPairCongruentTo(first, second.getArg(0), second.getArg(1), first.
|
|
57
|
+
return isPairCongruentTo(first, second.getArg(0), second.getArg(1), first.isCommutative);
|
|
57
58
|
for (let index = 0; index < first.numArgs; index++)
|
|
58
59
|
if (first.getArg(index).root !== second.getArg(index).root) return false;
|
|
59
60
|
return true;
|
|
60
61
|
};
|
|
61
62
|
|
|
62
63
|
export const getCongruenceJustification = (node: Enode, congruent: Enode) =>
|
|
63
|
-
CONGRUENCE_JUSTIFICATIONS[
|
|
64
|
+
CONGRUENCE_JUSTIFICATIONS[
|
|
65
|
+
node.isCommutative && congruent.getArg(0).root !== node.getArg(0).root ? 1 : 0
|
|
66
|
+
];
|
|
64
67
|
|
|
65
68
|
const EMPTY = 0;
|
|
66
69
|
const FULL = 1;
|
|
@@ -73,7 +76,7 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
73
76
|
private numFull = 0;
|
|
74
77
|
private numDeleted = 0;
|
|
75
78
|
|
|
76
|
-
private find(decl: number, args: readonly CgNode[],
|
|
79
|
+
private find(decl: number, args: readonly CgNode[], hash: number) {
|
|
77
80
|
const mask = this.states.length - 1;
|
|
78
81
|
for (let slot = hash & mask; this.states[slot] !== EMPTY; slot = (slot + 1) & mask) {
|
|
79
82
|
const node = this.nodes[slot];
|
|
@@ -81,7 +84,7 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
81
84
|
this.states[slot] === FULL &&
|
|
82
85
|
this.hashes[slot] === hash &&
|
|
83
86
|
node !== null &&
|
|
84
|
-
isCongruentTo(node, decl, args
|
|
87
|
+
isCongruentTo(node, decl, args)
|
|
85
88
|
)
|
|
86
89
|
return node;
|
|
87
90
|
}
|
|
@@ -143,8 +146,8 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
143
146
|
}
|
|
144
147
|
}
|
|
145
148
|
|
|
146
|
-
findFor(decl: number, args: readonly CgNode[],
|
|
147
|
-
return this.find(decl, args,
|
|
149
|
+
findFor(decl: number, args: readonly CgNode[], isCommutativeTable: boolean) {
|
|
150
|
+
return this.find(decl, args, getHash(decl, args, isCommutativeTable));
|
|
148
151
|
}
|
|
149
152
|
|
|
150
153
|
findCongruent(node: CgNode) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/check_logic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -9,8 +8,11 @@ import {
|
|
|
9
8
|
FAMILY_DATATYPE,
|
|
10
9
|
FAMILY_FINITE_SET,
|
|
11
10
|
FAMILY_FPA,
|
|
11
|
+
FAMILY_LABEL,
|
|
12
12
|
FAMILY_MODEL_VALUE,
|
|
13
13
|
FAMILY_PB,
|
|
14
|
+
FAMILY_POLY,
|
|
15
|
+
FAMILY_RECFUN,
|
|
14
16
|
FAMILY_SEQ,
|
|
15
17
|
FAMILY_USER,
|
|
16
18
|
KIND_APP,
|
|
@@ -128,6 +130,8 @@ const FAMILY_NAMES = new Map([
|
|
|
128
130
|
[FAMILY_FPA, "fpa"],
|
|
129
131
|
[FAMILY_CHAR, "char"],
|
|
130
132
|
[FAMILY_PB, "pb"],
|
|
133
|
+
[FAMILY_RECFUN, "recfun"],
|
|
134
|
+
[FAMILY_POLY, "polymorphic"],
|
|
131
135
|
]);
|
|
132
136
|
|
|
133
137
|
const NONLINEAR = "logic does not support nonlinear arithmetic";
|
|
@@ -262,7 +266,7 @@ export const createLogicChecker = (manager: AstManager, logic: string | undefine
|
|
|
262
266
|
if (op === OP_EQ) return checkDiffPredicate(expr);
|
|
263
267
|
return op === OP_DISTINCT || op === OP_ITE ? checkDiffArgs(expr) : undefined;
|
|
264
268
|
}
|
|
265
|
-
if (family === FAMILY_MODEL_VALUE) return undefined;
|
|
269
|
+
if (family === FAMILY_MODEL_VALUE || family === FAMILY_LABEL) return undefined;
|
|
266
270
|
if (family === FAMILY_SEQ || manager.isCharSort(manager.sorts[expr])) return undefined;
|
|
267
271
|
if (family === FAMILY_DATATYPE && flags.isDt) return undefined;
|
|
268
272
|
if (family === FAMILY_PB && logic !== undefined && logicHasPb(logic)) return undefined;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_clause.h, src/smt/smt_b_justification.h, src/util/small_object_allocator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import type { Justification } from "./enode";
|
|
4
3
|
import type { Literal } from "./literal";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_context.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { AssertedFormulas } from "./asserted-formulas";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
@@ -69,6 +68,7 @@ import { TheoryPolymorphism } from "./theory-polymorphism";
|
|
|
69
68
|
import { TheoryLra } from "./theory-lra";
|
|
70
69
|
import { shrink } from "./array";
|
|
71
70
|
import {
|
|
71
|
+
DEFAULT_CONFIG,
|
|
72
72
|
getSmtConfig,
|
|
73
73
|
PS_ALWAYS_FALSE,
|
|
74
74
|
PS_CACHING_CONSERVATIVE,
|
|
@@ -78,6 +78,7 @@ import {
|
|
|
78
78
|
RS_LUBY,
|
|
79
79
|
type SmtSetup,
|
|
80
80
|
} from "./smt-setup";
|
|
81
|
+
import type { KernelParams } from "./solver";
|
|
81
82
|
|
|
82
83
|
const ACTIVITY_LIMIT = 1e100;
|
|
83
84
|
const INV_ACTIVITY_LIMIT = 1e-100;
|
|
@@ -187,11 +188,13 @@ export class Context extends Internalizer {
|
|
|
187
188
|
private phaseDefault = false;
|
|
188
189
|
private lubyIndex = 1;
|
|
189
190
|
private finalCheckIndex = 0;
|
|
190
|
-
private
|
|
191
|
+
private literalAssumptions = new Map<Literal, number>();
|
|
191
192
|
unsatCore: number[] = [];
|
|
192
193
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
193
194
|
private erasedGenerations = new Map<Enode, number>();
|
|
194
195
|
private lastSearchFailure: SearchFailure = FAILURE_OK;
|
|
196
|
+
// As in Z3, a new search doesn't reset it.
|
|
197
|
+
reasonUnknown = "unknown";
|
|
195
198
|
private hasCaseSplit = true;
|
|
196
199
|
private incompleteTheories: Theory[] = [];
|
|
197
200
|
private modelState: ModelState = { kind: "none" };
|
|
@@ -204,7 +207,19 @@ export class Context extends Internalizer {
|
|
|
204
207
|
readonly params: SmtParams,
|
|
205
208
|
) {
|
|
206
209
|
super(manager, params.relevancyLevel > 0);
|
|
207
|
-
this.qmanager = new DefaultQuantifierManager(this
|
|
210
|
+
this.qmanager = new DefaultQuantifierManager(this);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
// As in Z3, reading the parameters again drops the setup's tuning, but relevancy keeps the lower level.
|
|
214
|
+
updateParams(params: KernelParams) {
|
|
215
|
+
this.params.isMbqi = params.isMbqi;
|
|
216
|
+
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
217
|
+
this.config = {
|
|
218
|
+
...DEFAULT_CONFIG,
|
|
219
|
+
theories: this.config.theories,
|
|
220
|
+
isFindingMacros: params.isFindingMacros,
|
|
221
|
+
};
|
|
222
|
+
this.qmanager.updateParams();
|
|
208
223
|
}
|
|
209
224
|
|
|
210
225
|
// setup_context and setup_components. The setup's theories come in its order, then setup_card's.
|
|
@@ -245,7 +260,9 @@ export class Context extends Internalizer {
|
|
|
245
260
|
}
|
|
246
261
|
|
|
247
262
|
checkCanceled() {
|
|
248
|
-
|
|
263
|
+
if (this.manager.limit.inc()) return false;
|
|
264
|
+
this.lastSearchFailure = FAILURE_CANCELED;
|
|
265
|
+
return true;
|
|
249
266
|
}
|
|
250
267
|
|
|
251
268
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
@@ -1278,7 +1295,7 @@ export class Context extends Internalizer {
|
|
|
1278
1295
|
if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
|
|
1279
1296
|
if (this.lastSearchFailure === FAILURE_THEORY)
|
|
1280
1297
|
return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
|
|
1281
|
-
return
|
|
1298
|
+
return this.reasonUnknown;
|
|
1282
1299
|
}
|
|
1283
1300
|
|
|
1284
1301
|
private hasCaseSplits() {
|
|
@@ -1494,7 +1511,8 @@ export class Context extends Internalizer {
|
|
|
1494
1511
|
}
|
|
1495
1512
|
|
|
1496
1513
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
1497
|
-
this.
|
|
1514
|
+
this.literalAssumptions.clear();
|
|
1515
|
+
for (const assumption of this.unsatCore) this.manager.decRef(assumption);
|
|
1498
1516
|
this.unsatCore = [];
|
|
1499
1517
|
if (assumptions.length > 0) {
|
|
1500
1518
|
this.propagate();
|
|
@@ -1515,7 +1533,7 @@ export class Context extends Internalizer {
|
|
|
1515
1533
|
this.internalizeAssertion(proxy, 0);
|
|
1516
1534
|
const literal = this.getLiteral(proxy);
|
|
1517
1535
|
if (literal === this.trueLiteral || literal === this.falseLiteral) continue;
|
|
1518
|
-
this.
|
|
1536
|
+
this.literalAssumptions.set(literal, assumptions[index]);
|
|
1519
1537
|
}
|
|
1520
1538
|
}
|
|
1521
1539
|
this.searchLevel = this.scopeLevel;
|
|
@@ -1566,25 +1584,34 @@ export class Context extends Internalizer {
|
|
|
1566
1584
|
}
|
|
1567
1585
|
|
|
1568
1586
|
isAssumption(boolVar: BoolVar) {
|
|
1569
|
-
return
|
|
1587
|
+
return (
|
|
1588
|
+
this.literalAssumptions.has(mkLiteral(boolVar)) ||
|
|
1589
|
+
this.literalAssumptions.has(mkLiteral(boolVar, true))
|
|
1590
|
+
);
|
|
1570
1591
|
}
|
|
1571
1592
|
|
|
1572
1593
|
isTrackingAssumptions() {
|
|
1573
|
-
return this.
|
|
1594
|
+
return this.literalAssumptions.size > 0 && this.searchLevel > this.baseLevel;
|
|
1574
1595
|
}
|
|
1575
1596
|
|
|
1576
1597
|
mkUnsatCore(result: number) {
|
|
1577
1598
|
if (result !== L_FALSE || !this.isTrackingAssumptions()) return result;
|
|
1578
|
-
const
|
|
1599
|
+
const literalAssumptions = this.literalAssumptions;
|
|
1600
|
+
const found = new Set<Literal>();
|
|
1601
|
+
const core: number[] = [];
|
|
1579
1602
|
for (const literal of this.conflictResolution.unsatCore) {
|
|
1580
|
-
const
|
|
1581
|
-
|
|
1603
|
+
const assumed = literalAssumptions.has(literal) ? literal : negate(literal);
|
|
1604
|
+
const assumption = literalAssumptions.get(assumed);
|
|
1605
|
+
if (assumption === undefined || found.has(assumed)) continue;
|
|
1606
|
+
found.add(assumed);
|
|
1607
|
+
this.manager.incRef(assumption);
|
|
1608
|
+
core.push(assumption);
|
|
1582
1609
|
}
|
|
1583
|
-
|
|
1610
|
+
literalAssumptions.clear();
|
|
1584
1611
|
this.popToBaseLevel();
|
|
1585
1612
|
this.searchLevel = this.baseLevel;
|
|
1586
1613
|
const ids = this.manager.ids;
|
|
1587
|
-
this.unsatCore =
|
|
1614
|
+
this.unsatCore = core.sort((left, right) => ids[left] - ids[right]);
|
|
1588
1615
|
return L_FALSE;
|
|
1589
1616
|
}
|
|
1590
1617
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/ctx_simplify_tactic.cpp, src/ast/num_occurs.cpp, src/tactic/goal_num_occurs.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_OR, type AstManager } from "./ast";
|
|
3
2
|
import type { Goal } from "./goal";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -75,8 +74,7 @@ class CtxSimplifier {
|
|
|
75
74
|
for (const form of goal.forms.items) {
|
|
76
75
|
this.pinned.push(form);
|
|
77
76
|
visit(form);
|
|
78
|
-
|
|
79
|
-
const expr = stack.pop() as number;
|
|
77
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
80
78
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
81
79
|
for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
|
|
82
80
|
visit(manager.getArg(expr, index));
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/tactic/ctx_solver_simplify_tactic.cpp,
|
|
2
|
-
// src/ast/rewriter/mk_simplified_app.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, SORT_BOOL, SORT_INT } from "./ast";
|
|
4
2
|
import type { Goal } from "./goal";
|
|
5
3
|
import { L_FALSE } from "./lbool";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/substitution/demodulator_rewriter.cpp,
|
|
2
|
-
// src/ast/substitution/substitution.cpp, src/util/array_map.h,
|
|
3
|
-
// src/tactic/ufbv/ufbv_rewriter_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -379,8 +376,8 @@ class MatchSubstitution {
|
|
|
379
376
|
if (manager.kinds[right] === KIND_VAR) return false;
|
|
380
377
|
if (manager.kinds[left] === KIND_QUANTIFIER || manager.kinds[right] === KIND_QUANTIFIER)
|
|
381
378
|
return false;
|
|
382
|
-
if (manager.
|
|
383
|
-
if (left === right && manager.
|
|
379
|
+
if (manager.isGroundApp(left) && !manager.isGroundApp(right)) return false;
|
|
380
|
+
if (left === right && manager.isGroundApp(left)) {
|
|
384
381
|
this.todo.pop();
|
|
385
382
|
continue;
|
|
386
383
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/dependent_expr_state_tactic.h,
|
|
2
|
-
// src/ast/simplifiers/dependent_expr_state.h, src/ast/simplifiers/dependent_expr_state.cpp), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import type { AstManager } from "./ast";
|
|
5
2
|
import type { Goal } from "./goal";
|
|
6
3
|
|
|
@@ -34,6 +31,22 @@ export class DependentExprState {
|
|
|
34
31
|
}
|
|
35
32
|
}
|
|
36
33
|
|
|
34
|
+
// A rewrite of -1 leaves the formula. The last result stays referenced until the next one.
|
|
35
|
+
rewriteEach(rewrite: (form: number) => number) {
|
|
36
|
+
const manager = this.manager;
|
|
37
|
+
const goal = this.goal;
|
|
38
|
+
let rewritten = -1;
|
|
39
|
+
this.forEachIndex((index) => {
|
|
40
|
+
const form = this.get(index);
|
|
41
|
+
const next = rewrite(form);
|
|
42
|
+
if (next === -1) return;
|
|
43
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
44
|
+
rewritten = next;
|
|
45
|
+
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
46
|
+
});
|
|
47
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
48
|
+
}
|
|
49
|
+
|
|
37
50
|
hasQuantifiers() {
|
|
38
51
|
let isFound = false;
|
|
39
52
|
for (let index = 0; index < this.goal.forms.size; index++)
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/diff_neq_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import { type AstManager, OP_ADD, OP_EQ, OP_GE, OP_LE, SORT_INT } from "./ast";
|
|
4
3
|
import type { Goal } from "./goal";
|
|
@@ -152,8 +151,7 @@ class DiffNeq {
|
|
|
152
151
|
}
|
|
153
152
|
|
|
154
153
|
private resolveConflict() {
|
|
155
|
-
|
|
156
|
-
const value = this.stack.pop() as number;
|
|
154
|
+
for (let value = this.stack.pop(); value !== undefined; value = this.stack.pop()) {
|
|
157
155
|
const next = this.chooseValue(this.stack.length, value + 1);
|
|
158
156
|
if (next !== -1) {
|
|
159
157
|
this.stack.push(next);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/distribute_forall.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_AND, OP_IMPLIES, OP_OR, QUANTIFIER_FORALL } from "./ast";
|
|
3
2
|
import { flattenAndVector, flattenOrVector } from "./ast-util";
|
|
4
3
|
import { runSimplifier } from "./dependent-expr-state";
|
|
@@ -51,16 +50,7 @@ export const distributeForall = (manager: AstManager, goal: Goal) =>
|
|
|
51
50
|
reduce: () => {
|
|
52
51
|
if (!state.hasQuantifiers()) return;
|
|
53
52
|
const rewriter = new DistributeForallRewriter(manager);
|
|
54
|
-
|
|
55
|
-
state.forEachIndex((index) => {
|
|
56
|
-
const form = state.get(index);
|
|
57
|
-
if (!manager.hasQuantifierFlags[form]) return;
|
|
58
|
-
const next = rewriter.rewrite(form);
|
|
59
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
60
|
-
rewritten = next;
|
|
61
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
62
|
-
});
|
|
63
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
53
|
+
state.rewriteEach((form) => (manager.hasQuantifierFlags[form] ? rewriter.rewrite(form) : -1));
|
|
64
54
|
rewriter.release();
|
|
65
55
|
},
|
|
66
56
|
release: () => {},
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/dominator_simplifier.cpp, src/ast/rewriter/dom_simplifier.cpp,
|
|
2
|
-
// src/ast/expr_substitution.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_NOT, OP_OR } from "./ast";
|
|
4
2
|
import { mkNot } from "./ast-util";
|
|
5
3
|
import { type DependentExprState, runSimplifier } from "./dependent-expr-state";
|
|
@@ -199,7 +197,7 @@ class ExprSubstitutionSimplifier {
|
|
|
199
197
|
|
|
200
198
|
private updateSubstitution(expr: number) {
|
|
201
199
|
const manager = this.manager;
|
|
202
|
-
if (manager.
|
|
200
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
203
201
|
const lhs = manager.getArg(expr, 0);
|
|
204
202
|
const rhs = manager.getArg(expr, 1);
|
|
205
203
|
this.computeDepth(lhs);
|