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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_bv.h, src/smt/theory_bv.cpp, src/util/union_find.h), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
FAMILY_BV,
|
|
@@ -76,6 +74,7 @@ import {
|
|
|
76
74
|
TRUE_BOOL_VAR,
|
|
77
75
|
TRUE_LITERAL,
|
|
78
76
|
} from "./literal";
|
|
77
|
+
import { UnionFind } from "./lp/union-find";
|
|
79
78
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
80
79
|
import { Theory } from "./theory";
|
|
81
80
|
|
|
@@ -236,9 +235,7 @@ export class TheoryBv extends Theory {
|
|
|
236
235
|
private blaster: BitBlaster;
|
|
237
236
|
private trail: (() => void)[] = [];
|
|
238
237
|
private trailLimits: number[] = [];
|
|
239
|
-
private
|
|
240
|
-
private sizes: number[] = [];
|
|
241
|
-
private nexts: number[] = [];
|
|
238
|
+
private unionFind = new UnionFind(this.trail);
|
|
242
239
|
private bits: Literal[][] = [];
|
|
243
240
|
private wpos: number[] = [];
|
|
244
241
|
private zeroOneBits: ZeroOneBit[][] = [];
|
|
@@ -254,6 +251,10 @@ export class TheoryBv extends Theory {
|
|
|
254
251
|
constructor(context: Context) {
|
|
255
252
|
super(context, FAMILY_BV);
|
|
256
253
|
this.blaster = new BitBlaster(context.manager);
|
|
254
|
+
this.unionFind.handler = {
|
|
255
|
+
mergeEh: (root, joining, second, first) => this.mergeEh(root, joining, second, first),
|
|
256
|
+
unmergeEh: (root) => this.unmergeEh(root),
|
|
257
|
+
};
|
|
257
258
|
}
|
|
258
259
|
|
|
259
260
|
private getBvSize(thVar: number) {
|
|
@@ -261,51 +262,10 @@ export class TheoryBv extends Theory {
|
|
|
261
262
|
return manager.getBvSize(manager.sorts[this.getExpr(thVar)]);
|
|
262
263
|
}
|
|
263
264
|
|
|
264
|
-
private find(thVar: number) {
|
|
265
|
-
let current = thVar;
|
|
266
|
-
while (this.finds[current] !== current) current = this.finds[current];
|
|
267
|
-
return current;
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
private merge(inputFirst: number, inputSecond: number) {
|
|
271
|
-
const firstRoot = this.find(inputFirst);
|
|
272
|
-
const secondRoot = this.find(inputSecond);
|
|
273
|
-
if (firstRoot === secondRoot) return;
|
|
274
|
-
const isSwapped = this.sizes[firstRoot] > this.sizes[secondRoot];
|
|
275
|
-
const joining = isSwapped ? secondRoot : firstRoot;
|
|
276
|
-
const root = isSwapped ? firstRoot : secondRoot;
|
|
277
|
-
this.mergeEh(
|
|
278
|
-
root,
|
|
279
|
-
joining,
|
|
280
|
-
isSwapped ? inputFirst : inputSecond,
|
|
281
|
-
isSwapped ? inputSecond : inputFirst,
|
|
282
|
-
);
|
|
283
|
-
this.finds[joining] = root;
|
|
284
|
-
this.sizes[root] += this.sizes[joining];
|
|
285
|
-
const next = this.nexts[joining];
|
|
286
|
-
this.nexts[joining] = this.nexts[root];
|
|
287
|
-
this.nexts[root] = next;
|
|
288
|
-
this.trail.push(() => {
|
|
289
|
-
this.sizes[root] -= this.sizes[joining];
|
|
290
|
-
this.finds[joining] = joining;
|
|
291
|
-
const restored = this.nexts[joining];
|
|
292
|
-
this.nexts[joining] = this.nexts[root];
|
|
293
|
-
this.nexts[root] = restored;
|
|
294
|
-
this.unmergeEh(root);
|
|
295
|
-
});
|
|
296
|
-
}
|
|
297
|
-
|
|
298
265
|
private mkVar(node: Enode) {
|
|
299
266
|
const thVar = this.varEnodes.length;
|
|
300
267
|
this.varEnodes.push(node);
|
|
301
|
-
this.
|
|
302
|
-
this.sizes.push(1);
|
|
303
|
-
this.nexts.push(thVar);
|
|
304
|
-
this.trail.push(() => {
|
|
305
|
-
this.finds.pop();
|
|
306
|
-
this.sizes.pop();
|
|
307
|
-
this.nexts.pop();
|
|
308
|
-
});
|
|
268
|
+
this.unionFind.mkVar();
|
|
309
269
|
this.bits.push([]);
|
|
310
270
|
this.wpos.push(0);
|
|
311
271
|
this.zeroOneBits.push([]);
|
|
@@ -326,7 +286,7 @@ export class TheoryBv extends Theory {
|
|
|
326
286
|
const isRelevant = context.isRelevant(owner);
|
|
327
287
|
const bits = this.bits[thVar];
|
|
328
288
|
bits.length = 0;
|
|
329
|
-
const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (
|
|
289
|
+
const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (_value, index) =>
|
|
330
290
|
mkBvApp(this.manager, OP_BIT2BOOL, [owner], [index]),
|
|
331
291
|
);
|
|
332
292
|
context.internalizeAll(bitExprs, true);
|
|
@@ -618,7 +578,7 @@ export class TheoryBv extends Theory {
|
|
|
618
578
|
const numArgs = node.numArgs;
|
|
619
579
|
const parameters = this.manager.funcDecls[this.manager.decls[term]].parameters;
|
|
620
580
|
if (!isAssociative) {
|
|
621
|
-
const args = Array.from({ length: numArgs }, (
|
|
581
|
+
const args = Array.from({ length: numArgs }, (_value, index) => this.getArgBits(node, index));
|
|
622
582
|
const bits: number[] = [];
|
|
623
583
|
blast(this.blaster, args, parameters[0], bits);
|
|
624
584
|
this.initBits(node, bits);
|
|
@@ -878,7 +838,7 @@ export class TheoryBv extends Theory {
|
|
|
878
838
|
}
|
|
879
839
|
|
|
880
840
|
newEqEh(first: number, second: number) {
|
|
881
|
-
this.merge(first, second);
|
|
841
|
+
this.unionFind.merge(first, second);
|
|
882
842
|
}
|
|
883
843
|
|
|
884
844
|
newDiseqEh(first: number, second: number) {
|
|
@@ -924,6 +884,7 @@ export class TheoryBv extends Theory {
|
|
|
924
884
|
|
|
925
885
|
private propagateBits() {
|
|
926
886
|
const context = this.context;
|
|
887
|
+
const unionFind = this.unionFind;
|
|
927
888
|
const queue = this.propQueue;
|
|
928
889
|
for (let entry = 0; entry < queue.length; entry += 2) {
|
|
929
890
|
const thVar = queue[entry];
|
|
@@ -933,7 +894,7 @@ export class TheoryBv extends Theory {
|
|
|
933
894
|
const value = context.getAssignment(bit);
|
|
934
895
|
if (value === L_UNDEF) continue;
|
|
935
896
|
const antecedent = value === L_FALSE ? negate(bit) : bit;
|
|
936
|
-
for (let other =
|
|
897
|
+
for (let other = unionFind.next(thVar); other !== thVar; other = unionFind.next(other)) {
|
|
937
898
|
const otherBit = this.bits[other][index];
|
|
938
899
|
if (bit === negate(otherBit)) {
|
|
939
900
|
this.addNewDiseqAxiom(thVar, other, index);
|
|
@@ -984,9 +945,9 @@ export class TheoryBv extends Theory {
|
|
|
984
945
|
if (this.wpos[second] === index) this.findWpos(second);
|
|
985
946
|
const atom = this.atoms[getVar(consequent)];
|
|
986
947
|
if (atom === undefined || !atom.isBit) return;
|
|
987
|
-
const root = this.find(second);
|
|
948
|
+
const root = this.unionFind.find(second);
|
|
988
949
|
for (let occ = atom.occs; occ !== null; occ = occ.next)
|
|
989
|
-
if (isPropagatingClass || this.find(occ.thVar) !== root || occ.index !== index)
|
|
950
|
+
if (isPropagatingClass || this.unionFind.find(occ.thVar) !== root || occ.index !== index)
|
|
990
951
|
this.propQueue.push(occ.thVar, occ.index);
|
|
991
952
|
}
|
|
992
953
|
|
|
@@ -1145,7 +1106,7 @@ export class TheoryBv extends Theory {
|
|
|
1145
1106
|
private unmergeEh(root: number) {
|
|
1146
1107
|
const bits = this.zeroOneBits[root];
|
|
1147
1108
|
for (let index = bits.length - 1; index >= 0; index--)
|
|
1148
|
-
if (this.find(bits[index].owner) === root) {
|
|
1109
|
+
if (this.unionFind.find(bits[index].owner) === root) {
|
|
1149
1110
|
bits.length = index + 1;
|
|
1150
1111
|
return;
|
|
1151
1112
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
1
|
+
// Only Z3's final check on problems without finite sets is kept, which inits the plugin and draws
|
|
2
|
+
// a value.
|
|
3
3
|
import { FAMILY_FINITE_SET } from "./ast";
|
|
4
4
|
import type { Context } from "./context";
|
|
5
5
|
import { FC_DONE, Theory } from "./theory";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_fpa.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -13,7 +12,6 @@ import {
|
|
|
13
12
|
OP_FPA_TO_SBV,
|
|
14
13
|
OP_FPA_TO_UBV,
|
|
15
14
|
OP_IMPLIES,
|
|
16
|
-
OP_ITE,
|
|
17
15
|
OP_ULEQ,
|
|
18
16
|
SORT_BOOL,
|
|
19
17
|
} from "./ast";
|
|
@@ -182,15 +180,12 @@ export class TheoryFpa extends Theory {
|
|
|
182
180
|
context.setVarTheory(boolVar, this.id);
|
|
183
181
|
for (let index = 0; index < manager.getNumArgs(atom); index++)
|
|
184
182
|
context.internalize(manager.getArg(atom, index), false);
|
|
185
|
-
manager.
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
},
|
|
192
|
-
() => [],
|
|
193
|
-
);
|
|
183
|
+
const outer = manager.beginTemporaries();
|
|
184
|
+
const bvAtom = this.rewriter.convert(this.theoryRewriter, atom);
|
|
185
|
+
manager.releaseLater(bvAtom);
|
|
186
|
+
const withSideConditions = this.rewrite(manager.mkAnd([bvAtom, this.mkSideConditions()]));
|
|
187
|
+
this.assertCnstr(manager.mkEq(atom, withSideConditions));
|
|
188
|
+
manager.endTemporaries(outer);
|
|
194
189
|
return true;
|
|
195
190
|
}
|
|
196
191
|
|
|
@@ -202,14 +197,12 @@ export class TheoryFpa extends Theory {
|
|
|
202
197
|
const node = context.getEnode(term) ?? context.mkEnode(term, false, false, true);
|
|
203
198
|
if (this.isAttachedToVar(node)) return true;
|
|
204
199
|
this.attachNewThVar(node);
|
|
205
|
-
if (CONVERTED_OPS.has(manager.getOp(term)))
|
|
206
|
-
manager.
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
() => [],
|
|
212
|
-
);
|
|
200
|
+
if (CONVERTED_OPS.has(manager.getOp(term))) {
|
|
201
|
+
const outer = manager.beginTemporaries();
|
|
202
|
+
this.assertCnstr(manager.mkEq(term, this.convert(term)));
|
|
203
|
+
this.assertCnstr(this.mkSideConditions());
|
|
204
|
+
manager.endTemporaries(outer);
|
|
205
|
+
}
|
|
213
206
|
if (!context.relevancy.isEnabled) this.relevantEh(term);
|
|
214
207
|
return true;
|
|
215
208
|
}
|
|
@@ -219,14 +212,12 @@ export class TheoryFpa extends Theory {
|
|
|
219
212
|
if (this.isAttachedToVar(node)) return;
|
|
220
213
|
this.attachNewThVar(node);
|
|
221
214
|
const owner = node.owner;
|
|
222
|
-
if (manager.isRmSort(manager.sorts[owner]) && manager.getOp(owner) !== OP_FPA_BV2RM)
|
|
223
|
-
manager.
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
() => [],
|
|
229
|
-
);
|
|
215
|
+
if (manager.isRmSort(manager.sorts[owner]) && manager.getOp(owner) !== OP_FPA_BV2RM) {
|
|
216
|
+
const outer = manager.beginTemporaries();
|
|
217
|
+
const limit = manager.mkBvNumeral(4n, 3);
|
|
218
|
+
this.assertCnstr(mkBvApp(manager, OP_ULEQ, [this.converter.wrap(owner), limit]));
|
|
219
|
+
manager.endTemporaries(outer);
|
|
220
|
+
}
|
|
230
221
|
if (!this.context.relevancy.isEnabled) this.relevantEh(owner);
|
|
231
222
|
}
|
|
232
223
|
|
|
@@ -244,57 +235,48 @@ export class TheoryFpa extends Theory {
|
|
|
244
235
|
const secondExpr = this.getExpr(second);
|
|
245
236
|
if (manager.getOp(firstExpr) === OP_FPA_BVWRAP || manager.getOp(secondExpr) === OP_FPA_BVWRAP)
|
|
246
237
|
return;
|
|
247
|
-
manager.
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
},
|
|
260
|
-
() => [],
|
|
261
|
-
);
|
|
238
|
+
const outer = manager.beginTemporaries();
|
|
239
|
+
const firstConverted = this.convert(firstExpr);
|
|
240
|
+
const secondConverted = this.convert(secondExpr);
|
|
241
|
+
const isFloatPair = this.isFloat(firstExpr) && this.isFloat(secondExpr);
|
|
242
|
+
const eq = isFloatPair
|
|
243
|
+
? this.converter.mkEq(firstConverted, secondConverted)
|
|
244
|
+
: manager.mkEq(firstConverted, secondConverted);
|
|
245
|
+
const condition = this.rewrite(isNegated ? manager.mkNot(eq) : eq);
|
|
246
|
+
const exprEq = manager.mkEq(firstExpr, secondExpr);
|
|
247
|
+
this.assertCnstr(manager.mkEq(isNegated ? manager.mkNot(exprEq) : exprEq, condition));
|
|
248
|
+
this.assertCnstr(this.mkSideConditions());
|
|
249
|
+
manager.endTemporaries(outer);
|
|
262
250
|
}
|
|
263
251
|
|
|
264
252
|
override assignEh(boolVar: BoolVar, isTrue: boolean) {
|
|
265
253
|
const manager = this.manager;
|
|
266
254
|
const expr = this.context.boolVar2Expr[boolVar];
|
|
267
|
-
manager.
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
},
|
|
275
|
-
() => [],
|
|
276
|
-
);
|
|
255
|
+
const outer = manager.beginTemporaries();
|
|
256
|
+
const converted = manager.mkAnd([this.convert(expr), this.mkSideConditions()]);
|
|
257
|
+
const constraint = isTrue
|
|
258
|
+
? manager.mkApp(OP_IMPLIES, [expr, converted], SORT_BOOL)
|
|
259
|
+
: manager.mkApp(OP_IMPLIES, [converted, expr], SORT_BOOL);
|
|
260
|
+
this.assertCnstr(this.rewrite(constraint));
|
|
261
|
+
manager.endTemporaries(outer);
|
|
277
262
|
}
|
|
278
263
|
|
|
279
264
|
override relevantEh(expr: number) {
|
|
280
265
|
const manager = this.manager;
|
|
281
266
|
const op = manager.getOp(expr);
|
|
282
267
|
if (!this.isFloat(expr)) {
|
|
283
|
-
if (manager.getFamily(expr) === FAMILY_FPA && CONVERTED_OPS.has(op))
|
|
284
|
-
manager.
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
() => [],
|
|
290
|
-
);
|
|
268
|
+
if (manager.getFamily(expr) === FAMILY_FPA && CONVERTED_OPS.has(op)) {
|
|
269
|
+
const outer = manager.beginTemporaries();
|
|
270
|
+
this.assertCnstr(manager.mkEq(expr, this.convert(expr)));
|
|
271
|
+
this.assertCnstr(this.mkSideConditions());
|
|
272
|
+
manager.endTemporaries(outer);
|
|
273
|
+
}
|
|
291
274
|
return;
|
|
292
275
|
}
|
|
293
276
|
if (op === OP_FPA_FP) return;
|
|
294
|
-
manager.
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
);
|
|
277
|
+
const outer = manager.beginTemporaries();
|
|
278
|
+
this.assertValueConstraints(expr);
|
|
279
|
+
manager.endTemporaries(outer);
|
|
298
280
|
}
|
|
299
281
|
|
|
300
282
|
private assertValueConstraints(expr: number) {
|
|
@@ -361,21 +343,6 @@ export class TheoryFpa extends Theory {
|
|
|
361
343
|
super.popScopeEh(numScopes);
|
|
362
344
|
}
|
|
363
345
|
|
|
364
|
-
private getIteValue(expr: number) {
|
|
365
|
-
const context = this.context;
|
|
366
|
-
const manager = this.manager;
|
|
367
|
-
let current = expr;
|
|
368
|
-
while (manager.getOp(current) === OP_ITE && context.isEInternalized(current)) {
|
|
369
|
-
const root = context.getEnode(current)?.root;
|
|
370
|
-
const thenExpr = manager.getArg(current, 1);
|
|
371
|
-
const elseExpr = manager.getArg(current, 2);
|
|
372
|
-
if (context.getEnode(thenExpr)?.root === root) current = thenExpr;
|
|
373
|
-
else if (context.getEnode(elseExpr)?.root === root) current = elseExpr;
|
|
374
|
-
else break;
|
|
375
|
-
}
|
|
376
|
-
return current;
|
|
377
|
-
}
|
|
378
|
-
|
|
379
346
|
override mkValue(node: Enode): number | DependentValue | undefined {
|
|
380
347
|
const context = this.context;
|
|
381
348
|
const manager = this.manager;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_POWER, OP_POWER0 } from "./ast";
|
|
3
2
|
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./theory";
|
|
4
3
|
import { TheoryJustification } from "./enode";
|
|
@@ -177,7 +176,6 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
177
176
|
const literals = lemma.ineqs.map((ineq) => negate(this.mkNlaLiteral(ineq)));
|
|
178
177
|
this.resetEvidence();
|
|
179
178
|
this.coreLiterals.push(...literals);
|
|
180
|
-
this.numConflicts++;
|
|
181
179
|
for (const constraint of lemma.expl) this.setEvidence(constraint);
|
|
182
180
|
const clause: Literal[] = [];
|
|
183
181
|
for (const literal of this.coreLiterals) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_ARITH,
|
|
4
3
|
KIND_APP,
|
|
@@ -241,10 +240,18 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
241
240
|
nla.isRelevant = (lpVar) =>
|
|
242
241
|
this.context.isRelevant(this.getExpr(this.solver.getExternal(lpVar)));
|
|
243
242
|
nla.grobner.updateParams();
|
|
243
|
+
nla.addMulDefHook = (vars) => this.addMulDef(vars);
|
|
244
244
|
this.nla = nla;
|
|
245
245
|
return nla;
|
|
246
246
|
}
|
|
247
247
|
|
|
248
|
+
private addMulDef(vars: readonly number[]) {
|
|
249
|
+
const isInt = vars.every((lpVar) => this.isIntVar(this.solver.getExternal(lpVar)));
|
|
250
|
+
const product = this.manager.mkFreshConst("mul!", isInt ? SORT_INT : SORT_REAL);
|
|
251
|
+
this.mkEnode(product);
|
|
252
|
+
return this.registerVar(this.mkVar(product));
|
|
253
|
+
}
|
|
254
|
+
|
|
248
255
|
private registerDivision(quotient: number, remainder: number): Division {
|
|
249
256
|
const register = (expr: number) => {
|
|
250
257
|
this.internalizeTermCore(expr);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_ITE, OP_SUB, SORT_BOOL } from "./ast";
|
|
3
2
|
import { TheoryJustification } from "./enode";
|
|
4
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -34,7 +33,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
34
33
|
private delayIneqsQhead = 0;
|
|
35
34
|
protected explanation = new Explanation();
|
|
36
35
|
protected coreLiterals: Literal[] = [];
|
|
37
|
-
protected numConflicts = 0;
|
|
38
36
|
private lowerTerms: (TermBound | undefined)[] = [];
|
|
39
37
|
private upperTerms: (TermBound | undefined)[] = [];
|
|
40
38
|
protected isModelInitialized = false;
|
|
@@ -383,7 +381,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
383
381
|
|
|
384
382
|
protected setConflict() {
|
|
385
383
|
this.resetEvidence();
|
|
386
|
-
this.numConflicts++;
|
|
387
384
|
for (const constraint of this.explanation) this.setEvidence(constraint);
|
|
388
385
|
this.context.setConflict(new TheoryJustification(this.id, this.coreLiterals, []), null);
|
|
389
386
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp, src/smt/arith_eq_adapter.cpp, src/math/lp/lp_api.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "./array";
|
|
3
2
|
import { coeffsToApp, getTermCoeffs } from "./arith-terms";
|
|
4
3
|
import { OP_GE, OP_GT, OP_LE, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
@@ -231,7 +230,6 @@ export class TheoryLra extends TheoryLraFinalCheck {
|
|
|
231
230
|
}
|
|
232
231
|
|
|
233
232
|
initSearchEh() {
|
|
234
|
-
this.numConflicts = 0;
|
|
235
233
|
this.restartPairs = [];
|
|
236
234
|
}
|
|
237
235
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_pb.h, src/smt/theory_pb.cpp, src/ast/rewriter/pb_rewriter_def.h),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import { FAMILY_PB, OP_AT_LEAST_K, OP_AT_MOST_K, OP_PB_EQ, OP_PB_GE, OP_PB_LE } from "./ast";
|
|
5
3
|
import { mkNot } from "./ast-util";
|
|
@@ -223,7 +221,6 @@ class Card {
|
|
|
223
221
|
constructor(
|
|
224
222
|
public lit: Literal,
|
|
225
223
|
public k: number,
|
|
226
|
-
readonly isAux: boolean,
|
|
227
224
|
) {}
|
|
228
225
|
|
|
229
226
|
get size() {
|
|
@@ -319,7 +316,7 @@ export class TheoryPb extends Theory {
|
|
|
319
316
|
const args = manager.getArgs(atom);
|
|
320
317
|
const op = manager.getOp(atom);
|
|
321
318
|
if (op === OP_PB_EQ) {
|
|
322
|
-
const coeffs = args.map((
|
|
319
|
+
const coeffs = args.map((_value, index) => getPbCoeff(manager, decl, index));
|
|
323
320
|
const sum = coeffs.reduce((total, coeff) => total.add(coeff), Rational.zero);
|
|
324
321
|
const k = getPbK(manager, decl);
|
|
325
322
|
const le = mkPbGe(
|
|
@@ -475,7 +472,7 @@ export class TheoryPb extends Theory {
|
|
|
475
472
|
context.mkThAxiom([negate(lit)]);
|
|
476
473
|
return true;
|
|
477
474
|
}
|
|
478
|
-
const card = new Card(lit, bound
|
|
475
|
+
const card = new Card(lit, bound);
|
|
479
476
|
for (const arg of args) card.addArg(this.compileArg(arg));
|
|
480
477
|
if (bound === card.size) this.card2conjunction(card);
|
|
481
478
|
else if (card.size === 1) this.card2disjunction(card);
|
|
@@ -694,19 +691,23 @@ export class TheoryPb extends Theory {
|
|
|
694
691
|
override popScopeEh(numScopes: number) {
|
|
695
692
|
let newLim = this.ineqsLim.length - numScopes;
|
|
696
693
|
let size = this.ineqsLim[newLim];
|
|
697
|
-
|
|
698
|
-
const boolVar = this.ineqsTrail
|
|
699
|
-
this.
|
|
694
|
+
for (let index = this.ineqsTrail.length - 1; index >= size; index--) {
|
|
695
|
+
const boolVar = this.ineqsTrail[index];
|
|
696
|
+
const ineq = this.ineqs[boolVar];
|
|
697
|
+
if (ineq !== undefined) this.clearIneqWatch(ineq);
|
|
700
698
|
this.ineqs[boolVar] = undefined;
|
|
701
699
|
}
|
|
700
|
+
this.ineqsTrail.length = size;
|
|
702
701
|
this.ineqsLim.length = newLim;
|
|
703
702
|
newLim = this.cardLim.length - numScopes;
|
|
704
703
|
size = this.cardLim[newLim];
|
|
705
|
-
|
|
706
|
-
const boolVar = this.cardTrail
|
|
707
|
-
this.
|
|
704
|
+
for (let index = this.cardTrail.length - 1; index >= size; index--) {
|
|
705
|
+
const boolVar = this.cardTrail[index];
|
|
706
|
+
const card = this.cards[boolVar];
|
|
707
|
+
if (card !== undefined) this.clearCardWatch(card);
|
|
708
708
|
this.cards[boolVar] = undefined;
|
|
709
709
|
}
|
|
710
|
+
this.cardTrail.length = size;
|
|
710
711
|
this.cardLim.length = newLim;
|
|
711
712
|
super.popScopeEh(numScopes);
|
|
712
713
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// a Boolean variable as Z3's does.
|
|
1
|
+
// The port parses no polymorphic axioms, so the theory never has instances to assert. It still
|
|
2
|
+
// assumes a fresh constant whenever formulas were asserted since its last assumption, which takes a
|
|
3
|
+
// fresh name and a Boolean variable as Z3's does.
|
|
5
4
|
import { FAMILY_POLY, SORT_BOOL } from "./ast";
|
|
6
5
|
import type { Context } from "./context";
|
|
7
6
|
import { Theory } from "./theory";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_recfun.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_RECFUN,
|
|
@@ -112,8 +111,8 @@ export class TheoryRecfun extends Theory {
|
|
|
112
111
|
for (const expr of exprs) this.keep(expr);
|
|
113
112
|
this.propagationQueue.push({ kind, exprs });
|
|
114
113
|
this.context.pushTrail(() => {
|
|
115
|
-
|
|
116
|
-
|
|
114
|
+
this.propagationQueue.pop();
|
|
115
|
+
for (const expr of exprs) this.manager.decRef(expr);
|
|
117
116
|
});
|
|
118
117
|
}
|
|
119
118
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/seq_regex.cpp, src/smt/seq_regex.h), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
KIND_APP,
|
|
4
3
|
OP_ITE,
|
|
@@ -218,8 +217,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
218
217
|
private collectVars(seq: number, vars: number[]) {
|
|
219
218
|
const manager = this.manager;
|
|
220
219
|
const todo = [seq];
|
|
221
|
-
|
|
222
|
-
const expr = todo.pop()!;
|
|
220
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
223
221
|
if (manager.getOp(expr) === OP_SEQ_CONCAT) {
|
|
224
222
|
todo.push(...manager.getArgs(expr));
|
|
225
223
|
continue;
|
|
@@ -257,8 +255,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
257
255
|
const manager = this.manager;
|
|
258
256
|
const todo = [term];
|
|
259
257
|
let length = 0;
|
|
260
|
-
|
|
261
|
-
const expr = todo.pop()!;
|
|
258
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
262
259
|
if (this.isConcat(expr)) {
|
|
263
260
|
todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
264
261
|
continue;
|
|
@@ -508,8 +505,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
508
505
|
if (this.hasLength(seq)) return true;
|
|
509
506
|
const todo = [seq];
|
|
510
507
|
let hasVar = false;
|
|
511
|
-
|
|
512
|
-
const expr = todo.pop()!;
|
|
508
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
513
509
|
if (this.isConcat(expr)) {
|
|
514
510
|
todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
515
511
|
continue;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp, src/smt/seq_eq_solver.cpp, src/smt/seq_ne_solver.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
OP_ADD,
|
|
5
3
|
OP_EQ,
|
|
@@ -32,7 +30,7 @@ import { getConcat, mkSeqApp } from "./seq-decl-plugin";
|
|
|
32
30
|
import type { EqPair } from "./seq-rewriter";
|
|
33
31
|
import { type DecomposedEq, type DepEq, type Ne, TheorySeqState } from "./theory-seq-state";
|
|
34
32
|
|
|
35
|
-
|
|
33
|
+
interface DepState {
|
|
36
34
|
dep: Dependency;
|
|
37
35
|
isChanged: boolean;
|
|
38
36
|
}
|
|
@@ -360,11 +358,11 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
360
358
|
this.propagateEq(deps, front, ls[0], rs[0], true);
|
|
361
359
|
return true;
|
|
362
360
|
}
|
|
363
|
-
const back = this.reduceLength(ls.
|
|
361
|
+
const back = this.reduceLength(ls[ls.length - 1], rs[rs.length - 1]);
|
|
364
362
|
if (back !== undefined) {
|
|
365
363
|
const deps = this.mkJoinLiterals(inputDeps, back);
|
|
366
364
|
this.eqs.push(this.mkDepEq(this.eqId++, ls.slice(0, -1), rs.slice(0, -1), deps));
|
|
367
|
-
this.propagateEq(deps, back, ls.
|
|
365
|
+
this.propagateEq(deps, back, ls[ls.length - 1], rs[rs.length - 1], true);
|
|
368
366
|
return true;
|
|
369
367
|
}
|
|
370
368
|
const getLength = (expr: number) => this.getLengthValue(expr);
|
|
@@ -404,7 +402,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
404
402
|
const sumBack = (first: number, others: readonly number[], isStrict: boolean) => {
|
|
405
403
|
const firstLength = getLength(first);
|
|
406
404
|
if (firstLength === undefined) return undefined;
|
|
407
|
-
let total = getLength(others.
|
|
405
|
+
let total = getLength(others[others.length - 1]);
|
|
408
406
|
if (total === undefined) return undefined;
|
|
409
407
|
if (isStrict ? firstLength.compare(total) <= 0 : firstLength.compare(total) < 0)
|
|
410
408
|
return undefined;
|
|
@@ -417,7 +415,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
417
415
|
return firstLength.equals(total) && index > 0 ? index : undefined;
|
|
418
416
|
};
|
|
419
417
|
if (ls.length > 1) {
|
|
420
|
-
const index = sumBack(ls.
|
|
418
|
+
const index = sumBack(ls[ls.length - 1], rs, false);
|
|
421
419
|
if (
|
|
422
420
|
index !== undefined &&
|
|
423
421
|
index < rs.length &&
|
|
@@ -426,7 +424,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
426
424
|
return true;
|
|
427
425
|
}
|
|
428
426
|
if (rs.length > 1) {
|
|
429
|
-
const index = sumBack(rs.
|
|
427
|
+
const index = sumBack(rs[rs.length - 1], ls, true);
|
|
430
428
|
if (
|
|
431
429
|
index !== undefined &&
|
|
432
430
|
index < ls.length &&
|