tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- 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/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- 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 +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +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 +3 -5
- 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 +3 -5
- 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/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +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 +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- 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 +3 -7
- 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 +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- 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 +22 -17
- 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 +25 -7
- 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-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- 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 +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- 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 +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- 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 +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- 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 +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +1 -2
- 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 +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +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 +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +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 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- 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 +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- 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 +118 -105
- 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 +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- 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 +19 -13
- 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 +1 -2
- 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 +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- 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 +2 -3
- 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 +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +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 +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- 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 +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- 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 +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- 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 +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- 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 +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- 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 +32 -35
- 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 +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- 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 +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- 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 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- 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 +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- 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/math/lp/random_updater_def.h, and shift_var and
|
|
2
|
-
// get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { IndexedUintSet } from "./containers";
|
|
5
3
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/trail.h, src/util/union_find.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "../array";
|
|
3
2
|
|
|
4
3
|
export class TrailStack {
|
|
@@ -21,7 +20,7 @@ export class TrailStack {
|
|
|
21
20
|
}
|
|
22
21
|
}
|
|
23
22
|
|
|
24
|
-
|
|
23
|
+
interface UnionFindTrail {
|
|
25
24
|
push(undo: () => void): void;
|
|
26
25
|
}
|
|
27
26
|
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/macros/macro_finder.cpp, src/ast/macros/macro_manager.cpp,
|
|
2
|
-
// src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp,
|
|
3
|
-
// src/tactic/ufbv/macro_finder_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import {
|
|
5
2
|
FAMILY_USER,
|
|
6
3
|
KIND_APP,
|
|
@@ -465,7 +462,7 @@ export class MacroManager {
|
|
|
465
462
|
if (!isAppOf(manager, expr, OP_EQ)) return undefined;
|
|
466
463
|
const lhs = manager.getArg(expr, 0);
|
|
467
464
|
const rhs = manager.getArg(expr, 1);
|
|
468
|
-
if (!manager.
|
|
465
|
+
if (!manager.isGroundApp(lhs) && !manager.isGroundApp(rhs)) return undefined;
|
|
469
466
|
const sort = manager.sorts[lhs];
|
|
470
467
|
if (manager.isUninterpretedSort(sort) || manager.getSortSize(sort) === 1n) return undefined;
|
|
471
468
|
if (isMacroHead(manager, lhs, numDecls)) return { head: lhs, value: rhs };
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_VAR, type AstManager } from "./ast";
|
|
3
2
|
import type { Enode } from "./enode";
|
|
4
3
|
|
|
@@ -73,7 +72,7 @@ export interface MamEnode<E> {
|
|
|
73
72
|
}
|
|
74
73
|
|
|
75
74
|
// The context that undoes a compiler's updates of shared code trees.
|
|
76
|
-
|
|
75
|
+
interface CompilerContext {
|
|
77
76
|
readonly manager: AstManager;
|
|
78
77
|
pushTrail(undo: () => void): void;
|
|
79
78
|
}
|
|
@@ -258,7 +257,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
258
257
|
let numUnboundVars = 0;
|
|
259
258
|
const visit = (term: number) => {
|
|
260
259
|
size++;
|
|
261
|
-
if (manager.
|
|
260
|
+
if (manager.isGroundApp(term)) return;
|
|
262
261
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
263
262
|
const arg = manager.getArg(term, index);
|
|
264
263
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
@@ -287,7 +286,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
287
286
|
else this.vars[varIndex] = reg;
|
|
288
287
|
continue;
|
|
289
288
|
}
|
|
290
|
-
if (manager.
|
|
289
|
+
if (manager.isGroundApp(pattern)) {
|
|
291
290
|
this.seq.push(mkCheck(reg, hasher.getGroundEnode(pattern, this.quantifier)));
|
|
292
291
|
this.setMark(reg, NOT_CHECKED);
|
|
293
292
|
continue;
|
|
@@ -364,7 +363,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
364
363
|
let count = 0;
|
|
365
364
|
let hasUnboundVars = false;
|
|
366
365
|
const visit = (term: number) => {
|
|
367
|
-
if (manager.
|
|
366
|
+
if (manager.isGroundApp(term)) return;
|
|
368
367
|
for (let index = 0; index < manager.getNumArgs(term); index++) {
|
|
369
368
|
const arg = manager.getArg(term, index);
|
|
370
369
|
if (manager.kinds[arg] !== KIND_VAR) visit(arg);
|
|
@@ -378,7 +377,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
378
377
|
|
|
379
378
|
private genMpFilter(expr: number): number {
|
|
380
379
|
const manager = this.manager;
|
|
381
|
-
if (manager.
|
|
380
|
+
if (manager.isGroundApp(expr)) {
|
|
382
381
|
const oreg = this.tree.numRegs;
|
|
383
382
|
this.tree.numRegs += 1;
|
|
384
383
|
const instr = mkInstruction<E>(OP_GET_ENODE);
|
|
@@ -441,7 +440,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
441
440
|
this.todo.push(oreg + index);
|
|
442
441
|
if (
|
|
443
442
|
(manager.kinds[arg] === KIND_VAR && this.vars[manager.values[arg]] >= 0) ||
|
|
444
|
-
|
|
443
|
+
manager.isGroundApp(arg)
|
|
445
444
|
)
|
|
446
445
|
hasDepth1Joint = true;
|
|
447
446
|
}
|
|
@@ -451,7 +450,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
451
450
|
const reg = this.vars[manager.values[arg]];
|
|
452
451
|
return reg >= 0 ? { ...mkNullJoint<E>(), kind: JOINT_VAR, reg } : mkNullJoint<E>();
|
|
453
452
|
}
|
|
454
|
-
if (manager.
|
|
453
|
+
if (manager.isGroundApp(arg))
|
|
455
454
|
return {
|
|
456
455
|
...mkNullJoint<E>(),
|
|
457
456
|
kind: JOINT_GROUND,
|
|
@@ -543,7 +542,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
543
542
|
const expr = this.getRegister(instr.reg);
|
|
544
543
|
return (
|
|
545
544
|
this.isApp(expr) &&
|
|
546
|
-
!manager.
|
|
545
|
+
!manager.isGroundApp(expr) &&
|
|
547
546
|
manager.decls[expr] === instr.label &&
|
|
548
547
|
manager.getNumArgs(expr) === instr.numArgs
|
|
549
548
|
);
|
|
@@ -556,14 +555,14 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
556
555
|
|
|
557
556
|
private isCheckCompatible(instr: Instruction<E>) {
|
|
558
557
|
const expr = this.getRegister(instr.reg);
|
|
559
|
-
if (!this.
|
|
558
|
+
if (!this.manager.isGroundApp(expr)) return false;
|
|
560
559
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
561
560
|
return instr.enode !== null && node !== null && instr.enode.root === node.root;
|
|
562
561
|
}
|
|
563
562
|
|
|
564
563
|
private getPatLblHash(reg: number) {
|
|
565
564
|
const expr = this.registers[reg];
|
|
566
|
-
if (this.manager.
|
|
565
|
+
if (this.manager.isGroundApp(expr)) {
|
|
567
566
|
const node = this.hasher.getGroundEnode(expr, this.quantifier);
|
|
568
567
|
return node === null ? -1 : this.hasher.getLblHash(node);
|
|
569
568
|
}
|
|
@@ -576,7 +575,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
576
575
|
return (
|
|
577
576
|
expr !== -1 &&
|
|
578
577
|
this.getMark(instr.reg) === NOT_CHECKED &&
|
|
579
|
-
this.manager.
|
|
578
|
+
this.manager.isGroundApp(expr) &&
|
|
580
579
|
instr.enode !== null &&
|
|
581
580
|
this.getPatLblHash(instr.reg) === instr.enode.lblHash
|
|
582
581
|
);
|
|
@@ -586,7 +585,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
586
585
|
const expr = this.getRegister(instr.reg);
|
|
587
586
|
return (
|
|
588
587
|
this.isApp(expr) &&
|
|
589
|
-
!this.manager.
|
|
588
|
+
!this.manager.isGroundApp(expr) &&
|
|
590
589
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
591
590
|
);
|
|
592
591
|
}
|
|
@@ -595,7 +594,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
595
594
|
const expr = this.getRegister(instr.reg);
|
|
596
595
|
return (
|
|
597
596
|
expr !== -1 &&
|
|
598
|
-
this.manager.
|
|
597
|
+
this.manager.isGroundApp(expr) &&
|
|
599
598
|
hasHash(instr.lblLow, instr.lblHigh, this.getPatLblHash(instr.reg))
|
|
600
599
|
);
|
|
601
600
|
}
|
|
@@ -603,7 +602,7 @@ export class Compiler<E extends MamEnode<E> = Enode> {
|
|
|
603
602
|
private isFilterSemiCompatible(instr: Instruction<E>) {
|
|
604
603
|
const expr = this.getRegister(instr.reg);
|
|
605
604
|
return (
|
|
606
|
-
this.getMark(instr.reg) === NOT_CHECKED && this.isApp(expr) && !this.manager.
|
|
605
|
+
this.getMark(instr.reg) === NOT_CHECKED && this.isApp(expr) && !this.manager.isGroundApp(expr)
|
|
607
606
|
);
|
|
608
607
|
}
|
|
609
608
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/max_bv_sharing_tactic.h, src/ast/simplifiers/max_bv_sharing.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import type { AstManager } from "./ast";
|
|
4
2
|
import { runSimplifier } from "./dependent-expr-state";
|
|
5
3
|
import type { Goal } from "./goal";
|
|
@@ -11,17 +9,7 @@ export const runMaxBvSharing = (manager: AstManager) => (goal: Goal) => {
|
|
|
11
9
|
runSimplifier(goal, false, (state) => {
|
|
12
10
|
const rewriter = new MaxBvSharing(manager);
|
|
13
11
|
return {
|
|
14
|
-
reduce: () =>
|
|
15
|
-
let rewritten = -1;
|
|
16
|
-
state.forEachIndex((index) => {
|
|
17
|
-
const form = state.get(index);
|
|
18
|
-
const next = rewriter.rewrite(form);
|
|
19
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
20
|
-
rewritten = next;
|
|
21
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
22
|
-
});
|
|
23
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
24
|
-
},
|
|
12
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
25
13
|
release: () => rewriter.release(),
|
|
26
14
|
};
|
|
27
15
|
});
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// with Z3's default parameters is ported.
|
|
1
|
+
// Only the maxres strategy with Z3's default parameters is ported.
|
|
3
2
|
import { OP_AND, OP_EQ, OP_IMPLIES, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { mkNot } from "./ast-util";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -67,13 +66,6 @@ export class Maxcore extends MaxsmtSolverBase {
|
|
|
67
66
|
this.trail.push(expr);
|
|
68
67
|
}
|
|
69
68
|
|
|
70
|
-
private isTrueIn(model: ProtoModel, expr: number) {
|
|
71
|
-
const value = model.eval(expr, true);
|
|
72
|
-
const isTrue = value === this.manager.trueExpr;
|
|
73
|
-
this.manager.decRef(value);
|
|
74
|
-
return isTrue;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
69
|
private isFalseIn(model: ProtoModel, expr: number) {
|
|
78
70
|
const value = model.eval(expr, true);
|
|
79
71
|
const isFalse = value === this.manager.falseExpr;
|
|
@@ -171,15 +163,16 @@ export class Maxcore extends MaxsmtSolverBase {
|
|
|
171
163
|
this.lower = this.upper;
|
|
172
164
|
return L_TRUE;
|
|
173
165
|
}
|
|
174
|
-
|
|
166
|
+
const weight = this.getCoreWeight(items);
|
|
167
|
+
cores.push({ core: items, weight });
|
|
175
168
|
this.removeSoft(items);
|
|
176
|
-
this.splitCore(items);
|
|
169
|
+
this.splitCore(items, weight);
|
|
177
170
|
if (items.length >= this.context.params.maxCoreSize) break;
|
|
178
171
|
status = this.checkSatHillClimb(this.asms.items);
|
|
179
172
|
}
|
|
180
173
|
if (status !== L_TRUE) return status;
|
|
181
174
|
if (cores.length === 0) return L_FALSE;
|
|
182
|
-
for (const
|
|
175
|
+
for (const entry of cores) this.processCore(entry.core, entry.weight);
|
|
183
176
|
return L_TRUE;
|
|
184
177
|
}
|
|
185
178
|
|
|
@@ -211,13 +204,11 @@ export class Maxcore extends MaxsmtSolverBase {
|
|
|
211
204
|
.reduce((minimum, weight) => (weight.compare(minimum) < 0 ? weight : minimum));
|
|
212
205
|
}
|
|
213
206
|
|
|
214
|
-
private splitCore(core: readonly number[]) {
|
|
215
|
-
const weight = this.getCoreWeight(core);
|
|
207
|
+
private splitCore(core: readonly number[], weight: Rational) {
|
|
216
208
|
for (const expr of core) {
|
|
217
209
|
const other = this.getWeight(expr);
|
|
218
210
|
if (other.compare(weight) > 0) this.newAssumption(expr, other.sub(weight));
|
|
219
211
|
}
|
|
220
|
-
return weight;
|
|
221
212
|
}
|
|
222
213
|
|
|
223
214
|
private updateModel(def: number, value: number) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/maximize_ac_sharing.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_ADD, OP_BADD, OP_BAND, OP_BMUL, OP_BOR, OP_OR } from "./ast";
|
|
3
2
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
4
3
|
import { shrink } from "./array";
|
|
@@ -15,7 +14,6 @@ const MAX_NUM_ARGS_FOR_OPT = 128;
|
|
|
15
14
|
const SHARED_OPS = new Set([OP_BADD, OP_BMUL, OP_BOR, OP_BAND, OP_OR, OP_ADD]);
|
|
16
15
|
|
|
17
16
|
export class MaxBvSharing extends RewriterTpl {
|
|
18
|
-
// Z3 compares the kind without the family, and bvmul has the kind of or and of +, so those are shared.
|
|
19
17
|
private isInit = false;
|
|
20
18
|
private entries: SharingEntry[] = [];
|
|
21
19
|
private pairCache = new Map<number, Map<number, Set<number>>>();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/maxlex.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_NOT, SORT_BOOL } from "./ast";
|
|
3
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
4
3
|
import { type MaxsatContext, MaxsmtSolverBase, type Soft } from "./maxsmt-base";
|
|
@@ -24,13 +23,6 @@ export class Maxlex extends MaxsmtSolverBase {
|
|
|
24
23
|
);
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
private isTrueIn(model: ProtoModel, expr: number) {
|
|
28
|
-
const value = model.eval(expr, true);
|
|
29
|
-
const isTrue = value === this.manager.trueExpr;
|
|
30
|
-
this.manager.decRef(value);
|
|
31
|
-
return isTrue;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
26
|
private assertValue(soft: Soft) {
|
|
35
27
|
if (soft.value === L_TRUE) this.solver.assertExpr(soft.expr);
|
|
36
28
|
else if (soft.value === L_FALSE) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/maxsmt.h, src/opt/maxsmt.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, SORT_BOOL } from "./ast";
|
|
3
2
|
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
4
3
|
import { Preprocess } from "./opt-preprocess";
|
|
@@ -65,6 +64,13 @@ export abstract class MaxsmtSolverBase {
|
|
|
65
64
|
return this.context.getSolver();
|
|
66
65
|
}
|
|
67
66
|
|
|
67
|
+
protected isTrueIn(model: ProtoModel, expr: number) {
|
|
68
|
+
const value = model.eval(expr, true);
|
|
69
|
+
const isTrue = value === this.manager.trueExpr;
|
|
70
|
+
this.manager.decRef(value);
|
|
71
|
+
return isTrue;
|
|
72
|
+
}
|
|
73
|
+
|
|
68
74
|
protected init() {
|
|
69
75
|
this.lower = Rational.zero;
|
|
70
76
|
this.upper = Rational.zero;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_arith.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError, SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -15,7 +14,6 @@ import {
|
|
|
15
14
|
OP_LT,
|
|
16
15
|
OP_MOD,
|
|
17
16
|
OP_MUL,
|
|
18
|
-
OP_NUM,
|
|
19
17
|
OP_OR,
|
|
20
18
|
OP_SUB,
|
|
21
19
|
OP_UMINUS,
|
|
@@ -23,7 +21,7 @@ import {
|
|
|
23
21
|
SORT_INT,
|
|
24
22
|
SORT_REAL,
|
|
25
23
|
} from "../ast";
|
|
26
|
-
import { getExtendedNumeral,
|
|
24
|
+
import { getExtendedNumeral, mkNot } from "../ast-util";
|
|
27
25
|
import { ExprSafeReplace } from "../expr-safe-replace";
|
|
28
26
|
import { ObjMap } from "../hashtable";
|
|
29
27
|
import {
|
|
@@ -44,19 +42,11 @@ import {
|
|
|
44
42
|
} from "../model-based-opt";
|
|
45
43
|
import { getEuclideanDiv, getEuclideanMod, Rational } from "../rational";
|
|
46
44
|
import type { RefVector } from "../ref-vector";
|
|
47
|
-
import { markRec, type MbpContext } from "./mbp-plugin";
|
|
45
|
+
import { getBinaryArgs, getNumeral, markRec, type MbpContext } from "./mbp-plugin";
|
|
48
46
|
|
|
49
47
|
const isArith = (manager: AstManager, expr: number) =>
|
|
50
48
|
manager.sorts[expr] === SORT_INT || manager.sorts[expr] === SORT_REAL;
|
|
51
49
|
|
|
52
|
-
const getBinaryArgs = (manager: AstManager, expr: number, op: number) =>
|
|
53
|
-
isAppOf(manager, expr, op) && manager.getNumArgs(expr) === 2
|
|
54
|
-
? [manager.getArg(expr, 0), manager.getArg(expr, 1)]
|
|
55
|
-
: undefined;
|
|
56
|
-
|
|
57
|
-
const getNumeral = (manager: AstManager, expr: number) =>
|
|
58
|
-
isAppOf(manager, expr, OP_NUM) ? manager.getRationalValue(expr) : undefined;
|
|
59
|
-
|
|
60
50
|
const insertMul = (terms: ObjMap<Rational>, expr: number, value: Rational) =>
|
|
61
51
|
terms.set(expr, (terms.get(expr) ?? Rational.zero).add(value));
|
|
62
52
|
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_plugin.cpp, src/model/model.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -10,6 +8,7 @@ import {
|
|
|
10
8
|
OP_EQ,
|
|
11
9
|
OP_IMPLIES,
|
|
12
10
|
OP_ITE,
|
|
11
|
+
OP_NUM,
|
|
13
12
|
OP_OR,
|
|
14
13
|
OP_XOR,
|
|
15
14
|
SORT_BOOL,
|
|
@@ -59,6 +58,14 @@ export class MbpContext {
|
|
|
59
58
|
const isIff = (manager: AstManager, expr: number) =>
|
|
60
59
|
isAppOf(manager, expr, OP_EQ) && manager.sorts[manager.getArg(expr, 0)] === SORT_BOOL;
|
|
61
60
|
|
|
61
|
+
export const getBinaryArgs = (manager: AstManager, expr: number, op: number) =>
|
|
62
|
+
isAppOf(manager, expr, op) && manager.getNumArgs(expr) === 2
|
|
63
|
+
? [manager.getArg(expr, 0), manager.getArg(expr, 1)]
|
|
64
|
+
: undefined;
|
|
65
|
+
|
|
66
|
+
export const getNumeral = (manager: AstManager, expr: number) =>
|
|
67
|
+
isAppOf(manager, expr, OP_NUM) ? manager.getRationalValue(expr) : undefined;
|
|
68
|
+
|
|
62
69
|
export const markRec = (manager: AstManager, visited: Set<number>, expr: number) => {
|
|
63
70
|
const todo = [expr];
|
|
64
71
|
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
@@ -90,7 +97,7 @@ export const pickEquality = (context: MbpContext, distinct: number) => {
|
|
|
90
97
|
throw new SmtUnsupportedError("pick_equality found no equal arguments");
|
|
91
98
|
};
|
|
92
99
|
|
|
93
|
-
|
|
100
|
+
const eraseLit = (lits: RefVector, index: number) => {
|
|
94
101
|
lits.set(index, lits.items[lits.size - 1]);
|
|
95
102
|
lits.pop();
|
|
96
103
|
return index - 1;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -11,7 +10,6 @@ import {
|
|
|
11
10
|
OP_LE,
|
|
12
11
|
OP_MOD,
|
|
13
12
|
OP_MUL,
|
|
14
|
-
OP_NUM,
|
|
15
13
|
OP_SUB,
|
|
16
14
|
OP_UMINUS,
|
|
17
15
|
SORT_BOOL,
|
|
@@ -20,6 +18,7 @@ import {
|
|
|
20
18
|
} from "../ast";
|
|
21
19
|
import { isAppOf, mkNot } from "../ast-util";
|
|
22
20
|
import { Rational } from "../rational";
|
|
21
|
+
import { getBinaryArgs, getNumeral } from "./mbp-plugin";
|
|
23
22
|
|
|
24
23
|
export interface SolvePlugin {
|
|
25
24
|
readonly family: number;
|
|
@@ -33,14 +32,6 @@ interface SignedExpr {
|
|
|
33
32
|
expr: number;
|
|
34
33
|
}
|
|
35
34
|
|
|
36
|
-
const getBinaryArgs = (manager: AstManager, expr: number, op: number) =>
|
|
37
|
-
isAppOf(manager, expr, op) && manager.getNumArgs(expr) === 2
|
|
38
|
-
? [manager.getArg(expr, 0), manager.getArg(expr, 1)]
|
|
39
|
-
: undefined;
|
|
40
|
-
|
|
41
|
-
const getNumeral = (manager: AstManager, expr: number) =>
|
|
42
|
-
isAppOf(manager, expr, OP_NUM) ? manager.getRationalValue(expr) : undefined;
|
|
43
|
-
|
|
44
35
|
const isZero = (manager: AstManager, expr: number) => getNumeral(manager, expr)?.isZero() === true;
|
|
45
36
|
|
|
46
37
|
export const mkArithSolvePlugin = (
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_term_graph.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, KIND_APP, OP_AND, OP_DISTINCT, OP_EQ, SORT_BOOL } from "../ast";
|
|
3
2
|
import { getNumExprs, isAppOf } from "../ast-util";
|
|
4
3
|
import { RefVector } from "../ref-vector";
|
|
@@ -9,13 +8,11 @@ class Term {
|
|
|
9
8
|
repr: Term | undefined;
|
|
10
9
|
next: Term = this;
|
|
11
10
|
isMarked = false;
|
|
12
|
-
isInterpreted = false;
|
|
13
11
|
readonly isEq: boolean;
|
|
14
12
|
readonly isNeq: boolean;
|
|
15
13
|
readonly isDistinct: boolean;
|
|
16
14
|
isNeqChild = false;
|
|
17
15
|
isCgr = false;
|
|
18
|
-
isGr = false;
|
|
19
16
|
// Maintained for roots only.
|
|
20
17
|
readonly parents: Term[] = [];
|
|
21
18
|
readonly children: Term[] = [];
|
|
@@ -51,10 +48,6 @@ class Term {
|
|
|
51
48
|
this.root.isGrClass = value;
|
|
52
49
|
}
|
|
53
50
|
|
|
54
|
-
get isRoot() {
|
|
55
|
-
return this.root === this;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
51
|
get isRepr() {
|
|
59
52
|
return this.repr === this;
|
|
60
53
|
}
|
|
@@ -75,7 +68,6 @@ class Term {
|
|
|
75
68
|
other.isGrClass = false;
|
|
76
69
|
}
|
|
77
70
|
|
|
78
|
-
// Makes this term the representative of its class.
|
|
79
71
|
mkRepr() {
|
|
80
72
|
this.repr = this;
|
|
81
73
|
for (let current = this.next; current !== this; current = current.next) current.repr = this;
|
|
@@ -141,10 +133,7 @@ export class TermGraph {
|
|
|
141
133
|
this.lits = new RefVector(manager);
|
|
142
134
|
this.pinned = new RefVector(manager);
|
|
143
135
|
const isVariable = (expr: number) => this.isVar.isVariable(expr);
|
|
144
|
-
const pin = (expr: number) =>
|
|
145
|
-
this.pinned.push(expr);
|
|
146
|
-
return expr;
|
|
147
|
-
};
|
|
136
|
+
const pin = (expr: number) => this.pin(expr);
|
|
148
137
|
this.plugins = [
|
|
149
138
|
mkBasicSolvePlugin(manager, isVariable, pin),
|
|
150
139
|
mkArithSolvePlugin(manager, isVariable, pin),
|
|
@@ -251,11 +240,6 @@ export class TermGraph {
|
|
|
251
240
|
return this.terms.filter((term) => !term.isNeqChild).map((term) => term.expr);
|
|
252
241
|
}
|
|
253
242
|
|
|
254
|
-
isCgr(expr: number) {
|
|
255
|
-
const term = this.app2Term.get(expr);
|
|
256
|
-
return term !== undefined && !term.isEq && term.isCgr;
|
|
257
|
-
}
|
|
258
|
-
|
|
259
243
|
isInternalized(expr: number) {
|
|
260
244
|
return this.app2Term.has(expr);
|
|
261
245
|
}
|
|
@@ -272,14 +256,12 @@ export class TermGraph {
|
|
|
272
256
|
this.pin(expr);
|
|
273
257
|
const term = new Term(expr, manager, this.app2Term);
|
|
274
258
|
if (this.isGround(expr)) {
|
|
275
|
-
term.isGr = true;
|
|
276
259
|
term.isCgr = true;
|
|
277
260
|
term.isClassGr = true;
|
|
278
261
|
} else if (term.children.length > 0 && term.areAllChildrenGround()) {
|
|
279
262
|
term.isCgr = true;
|
|
280
263
|
term.isClassGr = true;
|
|
281
264
|
}
|
|
282
|
-
if (term.children.length === 0 && manager.isUniqueValue(expr)) term.isInterpreted = true;
|
|
283
265
|
this.terms.push(term);
|
|
284
266
|
this.app2Term.set(expr, term);
|
|
285
267
|
return term;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/simplex/model_based_opt.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { getEuclideanDiv, getEuclideanMod, getGcd, getLcm, Rational } from "./rational";
|
|
4
3
|
|
|
@@ -29,7 +28,7 @@ export const DEF_ADD = 0;
|
|
|
29
28
|
export const DEF_MUL = 1;
|
|
30
29
|
export const DEF_DIV = 2;
|
|
31
30
|
export const DEF_CONST = 3;
|
|
32
|
-
|
|
31
|
+
const DEF_VAR = 4;
|
|
33
32
|
|
|
34
33
|
interface AddDef {
|
|
35
34
|
readonly kind: typeof DEF_ADD;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_checker.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { KIND_APP, OP_NOT, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
@@ -23,8 +22,8 @@ class AuxContext {
|
|
|
23
22
|
private context: Context;
|
|
24
23
|
private asserted: AssertedFormulas;
|
|
25
24
|
|
|
26
|
-
//
|
|
27
|
-
//
|
|
25
|
+
// init_aux_context copies the kernel's smt_params and theories, so the context has a model
|
|
26
|
+
// finder too, though it never sees a quantifier.
|
|
28
27
|
constructor(parent: Context) {
|
|
29
28
|
this.asserted = new AssertedFormulas(parent.manager);
|
|
30
29
|
this.context = new Context(parent.manager, {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/model/model_evaluator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -32,6 +31,7 @@ import {
|
|
|
32
31
|
SORT_BOOL,
|
|
33
32
|
} from "./ast";
|
|
34
33
|
import type { AstManager } from "./ast";
|
|
34
|
+
import { DEFAULT_BV_OPTIONS } from "./bv-rewriter";
|
|
35
35
|
import { isConsideredUninterpreted } from "./fpa-decl-plugin";
|
|
36
36
|
import { FuncInterp, getManagerSomeValue } from "./proto-model";
|
|
37
37
|
import type { ProtoModel } from "./proto-model";
|
|
@@ -61,7 +61,10 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
61
61
|
private model: ProtoModel,
|
|
62
62
|
) {
|
|
63
63
|
super(manager);
|
|
64
|
-
this.rewriter = new Rewriter(manager,
|
|
64
|
+
this.rewriter = new Rewriter(manager, {
|
|
65
|
+
...TACTIC_REWRITER_OPTIONS,
|
|
66
|
+
bv: { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0, isMkbv2num: true },
|
|
67
|
+
});
|
|
65
68
|
this.rewriter.releaseResult = () => this.setLastResult(-1);
|
|
66
69
|
}
|
|
67
70
|
|
|
@@ -124,7 +127,7 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
124
127
|
if (interp === undefined) return -1;
|
|
125
128
|
if (interp.isPartial()) interp.setElse(model.getSomeValue(sort));
|
|
126
129
|
const result = this.substitute(interp.getInterp() as number, args);
|
|
127
|
-
return manager.
|
|
130
|
+
return manager.isGroundApp(result) ? { expr: result, depth: Infinity } : result;
|
|
128
131
|
}
|
|
129
132
|
const rewritten = this.rewriter.reduceAppCore(decl, args);
|
|
130
133
|
const reduced =
|
|
@@ -192,7 +195,7 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
192
195
|
model.registerFunc(decl, created);
|
|
193
196
|
return value;
|
|
194
197
|
}
|
|
195
|
-
if (!manager.
|
|
198
|
+
if (!manager.isGroundApp(args[0])) return manager.mkApp(decl, args, sort);
|
|
196
199
|
}
|
|
197
200
|
if (op === OP_DT_CONSTRUCTOR) return manager.mkApp(decl, args, sort);
|
|
198
201
|
if (interp === undefined) return -1;
|
|
@@ -221,11 +224,11 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
221
224
|
);
|
|
222
225
|
const elseExpr = interp?.elseExpr ?? null;
|
|
223
226
|
if (interp === undefined || elseExpr === null) return undefined;
|
|
224
|
-
let isGround = manager.
|
|
227
|
+
let isGround = manager.isGroundApp(elseExpr);
|
|
225
228
|
for (const entry of interp.entries) {
|
|
226
229
|
if (entry.result === elseExpr) continue;
|
|
227
230
|
const store = [...entry.args, entry.result];
|
|
228
|
-
isGround &&= store.every((arg) => manager.
|
|
231
|
+
isGround &&= store.every((arg) => manager.isGroundApp(arg));
|
|
229
232
|
stores.push(store);
|
|
230
233
|
}
|
|
231
234
|
return isGround ? { stores, elseExpr, areUnique } : undefined;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_generator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { FAMILY_BASIC, FAMILY_USER, SORT_BOOL } from "./ast";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
3
|
import { Enode } from "./enode";
|
|
@@ -105,7 +104,9 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
105
104
|
interp = new FuncInterp(manager, node.numArgs);
|
|
106
105
|
model.registerFunc(node.decl, interp);
|
|
107
106
|
}
|
|
108
|
-
const args = Array.from({ length: node.numArgs }, (
|
|
107
|
+
const args = Array.from({ length: node.numArgs }, (_value, index) =>
|
|
108
|
+
getValue(node.getArg(index)),
|
|
109
|
+
);
|
|
109
110
|
if (interp.getEntry(args) === undefined) interp.insertNewEntry(args, getValue(node));
|
|
110
111
|
}
|
|
111
112
|
for (const theory of context.theories) theory.finalizeModel();
|