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,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_conflict_resolution.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { BinJustification, type BJustification } from "./clause";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
3
|
import { Enode, EqJustification, Justification } from "./enode";
|
|
@@ -118,20 +117,16 @@ export class ConflictResolution {
|
|
|
118
117
|
this.processedEqs.clear();
|
|
119
118
|
}
|
|
120
119
|
|
|
121
|
-
private
|
|
120
|
+
private justificationToLiteralsCore(justification: Justification) {
|
|
122
121
|
const saved = this.antecedents;
|
|
123
122
|
this.antecedents = [];
|
|
124
|
-
|
|
123
|
+
this.markJustification(justification);
|
|
125
124
|
this.processJustifications();
|
|
126
125
|
const result = this.antecedents;
|
|
127
126
|
this.antecedents = saved;
|
|
128
127
|
return result;
|
|
129
128
|
}
|
|
130
129
|
|
|
131
|
-
private justificationToLiteralsCore(justification: Justification) {
|
|
132
|
-
return this.collectLiterals(() => this.markJustification(justification));
|
|
133
|
-
}
|
|
134
|
-
|
|
135
130
|
justificationToLiterals(justification: Justification) {
|
|
136
131
|
const result = this.justificationToLiteralsCore(justification);
|
|
137
132
|
this.unmarkJustifications(0);
|
|
@@ -139,7 +134,12 @@ export class ConflictResolution {
|
|
|
139
134
|
}
|
|
140
135
|
|
|
141
136
|
eqToLiterals(first: Enode, second: Enode) {
|
|
142
|
-
const
|
|
137
|
+
const saved = this.antecedents;
|
|
138
|
+
this.antecedents = [];
|
|
139
|
+
this.markEq(first, second);
|
|
140
|
+
this.processJustifications();
|
|
141
|
+
const result = this.antecedents;
|
|
142
|
+
this.antecedents = saved;
|
|
143
143
|
this.unmarkJustifications(0);
|
|
144
144
|
return result;
|
|
145
145
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_context.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { AssertedFormulas } from "./asserted-formulas";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
@@ -69,6 +68,7 @@ import { TheoryPolymorphism } from "./theory-polymorphism";
|
|
|
69
68
|
import { TheoryLra } from "./theory-lra";
|
|
70
69
|
import { shrink } from "./array";
|
|
71
70
|
import {
|
|
71
|
+
DEFAULT_CONFIG,
|
|
72
72
|
getSmtConfig,
|
|
73
73
|
PS_ALWAYS_FALSE,
|
|
74
74
|
PS_CACHING_CONSERVATIVE,
|
|
@@ -78,6 +78,7 @@ import {
|
|
|
78
78
|
RS_LUBY,
|
|
79
79
|
type SmtSetup,
|
|
80
80
|
} from "./smt-setup";
|
|
81
|
+
import type { KernelParams } from "./solver";
|
|
81
82
|
|
|
82
83
|
const ACTIVITY_LIMIT = 1e100;
|
|
83
84
|
const INV_ACTIVITY_LIMIT = 1e-100;
|
|
@@ -187,11 +188,13 @@ export class Context extends Internalizer {
|
|
|
187
188
|
private phaseDefault = false;
|
|
188
189
|
private lubyIndex = 1;
|
|
189
190
|
private finalCheckIndex = 0;
|
|
190
|
-
private
|
|
191
|
+
private literalAssumptions = new Map<Literal, number>();
|
|
191
192
|
unsatCore: number[] = [];
|
|
192
193
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
193
194
|
private erasedGenerations = new Map<Enode, number>();
|
|
194
195
|
private lastSearchFailure: SearchFailure = FAILURE_OK;
|
|
196
|
+
// As in Z3, a new search doesn't reset it.
|
|
197
|
+
reasonUnknown = "unknown";
|
|
195
198
|
private hasCaseSplit = true;
|
|
196
199
|
private incompleteTheories: Theory[] = [];
|
|
197
200
|
private modelState: ModelState = { kind: "none" };
|
|
@@ -204,7 +207,20 @@ export class Context extends Internalizer {
|
|
|
204
207
|
readonly params: SmtParams,
|
|
205
208
|
) {
|
|
206
209
|
super(manager, params.relevancyLevel > 0);
|
|
207
|
-
this.qmanager = new DefaultQuantifierManager(this
|
|
210
|
+
this.qmanager = new DefaultQuantifierManager(this);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
// As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite and relevancy.
|
|
214
|
+
updateParams(params: KernelParams) {
|
|
215
|
+
this.params.isMbqi = params.isMbqi;
|
|
216
|
+
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
217
|
+
this.config = {
|
|
218
|
+
...DEFAULT_CONFIG,
|
|
219
|
+
theories: this.config.theories,
|
|
220
|
+
isFindingMacros: params.isFindingMacros,
|
|
221
|
+
isEliminatingTermIte: this.config.isEliminatingTermIte,
|
|
222
|
+
};
|
|
223
|
+
this.qmanager.updateParams();
|
|
208
224
|
}
|
|
209
225
|
|
|
210
226
|
// setup_context and setup_components. The setup's theories come in its order, then setup_card's.
|
|
@@ -213,6 +229,7 @@ export class Context extends Internalizer {
|
|
|
213
229
|
isUsingStaticFeatures: boolean,
|
|
214
230
|
asserted: AssertedFormulas,
|
|
215
231
|
) {
|
|
232
|
+
if (this.isInconsistent() || asserted.isInconsistent) return false;
|
|
216
233
|
const config = getSmtConfig(
|
|
217
234
|
this.manager,
|
|
218
235
|
setup,
|
|
@@ -227,6 +244,7 @@ export class Context extends Internalizer {
|
|
|
227
244
|
if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
|
|
228
245
|
this.registerFamily(FAMILY_PB);
|
|
229
246
|
asserted.setup(config);
|
|
247
|
+
return true;
|
|
230
248
|
}
|
|
231
249
|
|
|
232
250
|
// register_plugin keeps the theory a family already has.
|
|
@@ -245,7 +263,9 @@ export class Context extends Internalizer {
|
|
|
245
263
|
}
|
|
246
264
|
|
|
247
265
|
checkCanceled() {
|
|
248
|
-
|
|
266
|
+
if (this.manager.limit.inc()) return false;
|
|
267
|
+
this.lastSearchFailure = FAILURE_CANCELED;
|
|
268
|
+
return true;
|
|
249
269
|
}
|
|
250
270
|
|
|
251
271
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
@@ -1272,14 +1292,13 @@ export class Context extends Internalizer {
|
|
|
1272
1292
|
return generated;
|
|
1273
1293
|
}
|
|
1274
1294
|
|
|
1275
|
-
// add_rec_funs gives each named expression without an interpretation its expression.
|
|
1276
1295
|
getLastFailureMessage() {
|
|
1277
1296
|
if (this.lastSearchFailure === FAILURE_CANCELED) return "canceled";
|
|
1278
1297
|
if (this.lastSearchFailure === FAILURE_NUM_CONFLICTS) return "max-conflicts-reached";
|
|
1279
1298
|
if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
|
|
1280
1299
|
if (this.lastSearchFailure === FAILURE_THEORY)
|
|
1281
1300
|
return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
|
|
1282
|
-
return
|
|
1301
|
+
return this.reasonUnknown;
|
|
1283
1302
|
}
|
|
1284
1303
|
|
|
1285
1304
|
private hasCaseSplits() {
|
|
@@ -1495,7 +1514,8 @@ export class Context extends Internalizer {
|
|
|
1495
1514
|
}
|
|
1496
1515
|
|
|
1497
1516
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
1498
|
-
this.
|
|
1517
|
+
this.literalAssumptions.clear();
|
|
1518
|
+
for (const assumption of this.unsatCore) this.manager.decRef(assumption);
|
|
1499
1519
|
this.unsatCore = [];
|
|
1500
1520
|
if (assumptions.length > 0) {
|
|
1501
1521
|
this.propagate();
|
|
@@ -1516,7 +1536,7 @@ export class Context extends Internalizer {
|
|
|
1516
1536
|
this.internalizeAssertion(proxy, 0);
|
|
1517
1537
|
const literal = this.getLiteral(proxy);
|
|
1518
1538
|
if (literal === this.trueLiteral || literal === this.falseLiteral) continue;
|
|
1519
|
-
this.
|
|
1539
|
+
this.literalAssumptions.set(literal, assumptions[index]);
|
|
1520
1540
|
}
|
|
1521
1541
|
}
|
|
1522
1542
|
this.searchLevel = this.scopeLevel;
|
|
@@ -1567,24 +1587,34 @@ export class Context extends Internalizer {
|
|
|
1567
1587
|
}
|
|
1568
1588
|
|
|
1569
1589
|
isAssumption(boolVar: BoolVar) {
|
|
1570
|
-
return
|
|
1590
|
+
return (
|
|
1591
|
+
this.literalAssumptions.has(mkLiteral(boolVar)) ||
|
|
1592
|
+
this.literalAssumptions.has(mkLiteral(boolVar, true))
|
|
1593
|
+
);
|
|
1571
1594
|
}
|
|
1572
1595
|
|
|
1573
1596
|
isTrackingAssumptions() {
|
|
1574
|
-
return this.
|
|
1597
|
+
return this.literalAssumptions.size > 0 && this.searchLevel > this.baseLevel;
|
|
1575
1598
|
}
|
|
1576
1599
|
|
|
1577
1600
|
mkUnsatCore(result: number) {
|
|
1578
1601
|
if (result !== L_FALSE || !this.isTrackingAssumptions()) return result;
|
|
1579
|
-
const
|
|
1602
|
+
const literalAssumptions = this.literalAssumptions;
|
|
1603
|
+
const found = new Set<Literal>();
|
|
1604
|
+
const core: number[] = [];
|
|
1580
1605
|
for (const literal of this.conflictResolution.unsatCore) {
|
|
1581
|
-
const
|
|
1582
|
-
|
|
1606
|
+
const assumed = literalAssumptions.has(literal) ? literal : negate(literal);
|
|
1607
|
+
const assumption = literalAssumptions.get(assumed);
|
|
1608
|
+
if (assumption === undefined || found.has(assumed)) continue;
|
|
1609
|
+
found.add(assumed);
|
|
1610
|
+
this.manager.incRef(assumption);
|
|
1611
|
+
core.push(assumption);
|
|
1583
1612
|
}
|
|
1584
|
-
|
|
1613
|
+
literalAssumptions.clear();
|
|
1585
1614
|
this.popToBaseLevel();
|
|
1586
1615
|
this.searchLevel = this.baseLevel;
|
|
1587
|
-
|
|
1616
|
+
const ids = this.manager.ids;
|
|
1617
|
+
this.unsatCore = core.sort((left, right) => ids[left] - ids[right]);
|
|
1588
1618
|
return L_FALSE;
|
|
1589
1619
|
}
|
|
1590
1620
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/ctx_simplify_tactic.cpp, src/ast/num_occurs.cpp, src/tactic/goal_num_occurs.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_OR, type AstManager } from "./ast";
|
|
3
2
|
import type { Goal } from "./goal";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -75,8 +74,7 @@ class CtxSimplifier {
|
|
|
75
74
|
for (const form of goal.forms.items) {
|
|
76
75
|
this.pinned.push(form);
|
|
77
76
|
visit(form);
|
|
78
|
-
|
|
79
|
-
const expr = stack.pop() as number;
|
|
77
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
80
78
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
81
79
|
for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
|
|
82
80
|
visit(manager.getArg(expr, index));
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/tactic/ctx_solver_simplify_tactic.cpp,
|
|
2
|
-
// src/ast/rewriter/mk_simplified_app.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, SORT_BOOL, SORT_INT } from "./ast";
|
|
4
2
|
import type { Goal } from "./goal";
|
|
5
3
|
import { L_FALSE } from "./lbool";
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
5
4
|
OP_DT_ACCESSOR,
|
|
@@ -328,7 +327,7 @@ const computeSizeFunctions = (manager: AstManager, names: string[]) => {
|
|
|
328
327
|
}
|
|
329
328
|
};
|
|
330
329
|
|
|
331
|
-
const
|
|
330
|
+
export const resetDatatypePlugin = (manager: AstManager) => {
|
|
332
331
|
manager.datatypeConstructors = [];
|
|
333
332
|
manager.constructorAccessors = [];
|
|
334
333
|
manager.constructorRecognizers = [];
|
|
@@ -338,7 +337,7 @@ const resetDeclarations = (manager: AstManager) => {
|
|
|
338
337
|
|
|
339
338
|
export const removeDatatype = (manager: AstManager, name: string) => {
|
|
340
339
|
manager.datatypeDefs.delete(name);
|
|
341
|
-
|
|
340
|
+
resetDatatypePlugin(manager);
|
|
342
341
|
};
|
|
343
342
|
|
|
344
343
|
export const mkDatatypeDef = (
|
|
@@ -358,7 +357,7 @@ export const mkDatatypeDef = (
|
|
|
358
357
|
|
|
359
358
|
export const mkDatatypes = (manager: AstManager, defs: DatatypeDef[]): number[] | string => {
|
|
360
359
|
for (const def of defs) {
|
|
361
|
-
if (manager.datatypeDefs.has(def.name))
|
|
360
|
+
if (manager.datatypeDefs.has(def.name)) resetDatatypePlugin(manager);
|
|
362
361
|
manager.datatypeDefs.set(def.name, def);
|
|
363
362
|
}
|
|
364
363
|
const sorts = defs.map((def) => instantiateDef(manager, def, []));
|
|
@@ -394,7 +393,12 @@ const getConstructorDef = (manager: AstManager, constructor: number) =>
|
|
|
394
393
|
manager.funcDecls[constructor].parameters[0]
|
|
395
394
|
];
|
|
396
395
|
|
|
397
|
-
const
|
|
396
|
+
export const instantiateAccessor = (
|
|
397
|
+
manager: AstManager,
|
|
398
|
+
sort: number,
|
|
399
|
+
constructorIndex: number,
|
|
400
|
+
index: number,
|
|
401
|
+
) => {
|
|
398
402
|
const def = getDef(manager, sort);
|
|
399
403
|
const constructor = def.constructors[constructorIndex];
|
|
400
404
|
const accessor = constructor.accessors[index];
|
|
@@ -411,7 +415,12 @@ const mkAccessor = (manager: AstManager, sort: number, constructorIndex: number,
|
|
|
411
415
|
export const getDatatypeConstructors = (manager: AstManager, sort: number) => {
|
|
412
416
|
const existing = manager.datatypeConstructors[sort];
|
|
413
417
|
if (existing !== undefined) return existing;
|
|
414
|
-
const def =
|
|
418
|
+
const def = getDatatypeDef(manager, sort);
|
|
419
|
+
if (def === undefined) {
|
|
420
|
+
// Z3 caches the empty list before it raises, so a later call gets no constructors.
|
|
421
|
+
manager.datatypeConstructors[sort] = [];
|
|
422
|
+
throw new SmtDefaultError("datatype constructors have not been created");
|
|
423
|
+
}
|
|
415
424
|
const parameters = manager.getSortParameters(sort);
|
|
416
425
|
const constructors = def.constructors.map((constructor, index) =>
|
|
417
426
|
manager.mkDatatypeDecl(
|
|
@@ -434,7 +443,7 @@ export const getConstructorAccessors = (manager: AstManager, constructor: number
|
|
|
434
443
|
if (existing !== undefined) return existing;
|
|
435
444
|
const funcDecl = manager.funcDecls[constructor];
|
|
436
445
|
const accessors = getConstructorDef(manager, constructor).accessors.map((_accessor, index) =>
|
|
437
|
-
|
|
446
|
+
instantiateAccessor(manager, funcDecl.range, funcDecl.parameters[0], index),
|
|
438
447
|
);
|
|
439
448
|
manager.constructorAccessors[constructor] = accessors;
|
|
440
449
|
return accessors;
|
|
@@ -502,13 +511,6 @@ export const instantiateConstructor = (
|
|
|
502
511
|
parameters: number[],
|
|
503
512
|
) => getDatatypeConstructors(manager, instantiateDef(manager, def, parameters))[index];
|
|
504
513
|
|
|
505
|
-
export const instantiateAccessor = (
|
|
506
|
-
manager: AstManager,
|
|
507
|
-
sort: number,
|
|
508
|
-
constructorIndex: number,
|
|
509
|
-
index: number,
|
|
510
|
-
) => mkAccessor(manager, sort, constructorIndex, index);
|
|
511
|
-
|
|
512
514
|
const getArrayRangeRec = (manager: AstManager, sort: number) => {
|
|
513
515
|
let current = sort;
|
|
514
516
|
while (manager.isArraySort(current)) current = manager.getArrayRange(current);
|
|
@@ -571,5 +573,8 @@ const getNonRecConstructorCore = (
|
|
|
571
573
|
return result === -1 ? { constructor: -1, depth: 0 } : remember(result, minDepth);
|
|
572
574
|
};
|
|
573
575
|
|
|
574
|
-
export const getNonRecConstructor = (manager: AstManager, sort: number) =>
|
|
575
|
-
getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
576
|
+
export const getNonRecConstructor = (manager: AstManager, sort: number) => {
|
|
577
|
+
const constructor = getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
578
|
+
if (constructor === -1) throw new SmtDefaultError("constructor not available");
|
|
579
|
+
return constructor;
|
|
580
|
+
};
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/substitution/demodulator_rewriter.cpp,
|
|
2
|
-
// src/ast/substitution/substitution.cpp, src/util/array_map.h,
|
|
3
|
-
// src/tactic/ufbv/ufbv_rewriter_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -379,8 +376,8 @@ class MatchSubstitution {
|
|
|
379
376
|
if (manager.kinds[right] === KIND_VAR) return false;
|
|
380
377
|
if (manager.kinds[left] === KIND_QUANTIFIER || manager.kinds[right] === KIND_QUANTIFIER)
|
|
381
378
|
return false;
|
|
382
|
-
if (manager.
|
|
383
|
-
if (left === right && manager.
|
|
379
|
+
if (manager.isGroundApp(left) && !manager.isGroundApp(right)) return false;
|
|
380
|
+
if (left === right && manager.isGroundApp(left)) {
|
|
384
381
|
this.todo.pop();
|
|
385
382
|
continue;
|
|
386
383
|
}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/dependent_expr_state_tactic.h,
|
|
2
|
-
// src/ast/simplifiers/dependent_expr_state.h, src/ast/simplifiers/dependent_expr_state.cpp), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import type { AstManager } from "./ast";
|
|
5
|
-
import type { Goal } from "./goal";
|
|
2
|
+
import type { Definition, Goal } from "./goal";
|
|
6
3
|
|
|
7
4
|
// The formula read last stays referenced, as m_dep, until the next read or the end of the tactic.
|
|
8
5
|
export class DependentExprState {
|
|
@@ -34,6 +31,22 @@ export class DependentExprState {
|
|
|
34
31
|
}
|
|
35
32
|
}
|
|
36
33
|
|
|
34
|
+
// A rewrite of -1 leaves the formula. The last result stays referenced until the next one.
|
|
35
|
+
rewriteEach(rewrite: (form: number) => number) {
|
|
36
|
+
const manager = this.manager;
|
|
37
|
+
const goal = this.goal;
|
|
38
|
+
let rewritten = -1;
|
|
39
|
+
this.forEachIndex((index) => {
|
|
40
|
+
const form = this.get(index);
|
|
41
|
+
const next = rewrite(form);
|
|
42
|
+
if (next === -1) return;
|
|
43
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
44
|
+
rewritten = next;
|
|
45
|
+
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
46
|
+
});
|
|
47
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
48
|
+
}
|
|
49
|
+
|
|
37
50
|
hasQuantifiers() {
|
|
38
51
|
let isFound = false;
|
|
39
52
|
for (let index = 0; index < this.goal.forms.size; index++)
|
|
@@ -47,6 +60,13 @@ export class DependentExprState {
|
|
|
47
60
|
}
|
|
48
61
|
}
|
|
49
62
|
|
|
63
|
+
export const finishSimplifier = (goal: Goal, definitions: Definition[] = []) => {
|
|
64
|
+
goal.elimTrue();
|
|
65
|
+
goal.elimRedundancies();
|
|
66
|
+
goal.depth++;
|
|
67
|
+
if (definitions.length > 0 || goal.isModelsEnabled) goal.addDefinitions(definitions);
|
|
68
|
+
};
|
|
69
|
+
|
|
50
70
|
interface Simplifier {
|
|
51
71
|
reduce(): void;
|
|
52
72
|
release(): void;
|
|
@@ -60,9 +80,7 @@ export const runSimplifier = (
|
|
|
60
80
|
const state = new DependentExprState(goal.manager, goal);
|
|
61
81
|
const simplifier = create(state);
|
|
62
82
|
if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
|
|
63
|
-
goal
|
|
64
|
-
goal.elimRedundancies();
|
|
65
|
-
goal.depth++;
|
|
83
|
+
finishSimplifier(goal);
|
|
66
84
|
simplifier.release();
|
|
67
85
|
state.release();
|
|
68
86
|
};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/arith/diff_neq_tactic.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtCanceledError, SmtTacticError } from "../../../errors";
|
|
3
2
|
import { type AstManager, OP_ADD, OP_EQ, OP_GE, OP_LE, SORT_INT } from "./ast";
|
|
4
3
|
import type { Goal } from "./goal";
|
|
@@ -152,8 +151,7 @@ class DiffNeq {
|
|
|
152
151
|
}
|
|
153
152
|
|
|
154
153
|
private resolveConflict() {
|
|
155
|
-
|
|
156
|
-
const value = this.stack.pop() as number;
|
|
154
|
+
for (let value = this.stack.pop(); value !== undefined; value = this.stack.pop()) {
|
|
157
155
|
const next = this.chooseValue(this.stack.length, value + 1);
|
|
158
156
|
if (next !== -1) {
|
|
159
157
|
this.stack.push(next);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/distribute_forall.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_AND, OP_IMPLIES, OP_OR, QUANTIFIER_FORALL } from "./ast";
|
|
3
2
|
import { flattenAndVector, flattenOrVector } from "./ast-util";
|
|
4
3
|
import { runSimplifier } from "./dependent-expr-state";
|
|
@@ -51,16 +50,7 @@ export const distributeForall = (manager: AstManager, goal: Goal) =>
|
|
|
51
50
|
reduce: () => {
|
|
52
51
|
if (!state.hasQuantifiers()) return;
|
|
53
52
|
const rewriter = new DistributeForallRewriter(manager);
|
|
54
|
-
|
|
55
|
-
state.forEachIndex((index) => {
|
|
56
|
-
const form = state.get(index);
|
|
57
|
-
if (!manager.hasQuantifierFlags[form]) return;
|
|
58
|
-
const next = rewriter.rewrite(form);
|
|
59
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
60
|
-
rewritten = next;
|
|
61
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
62
|
-
});
|
|
63
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
53
|
+
state.rewriteEach((form) => (manager.hasQuantifierFlags[form] ? rewriter.rewrite(form) : -1));
|
|
64
54
|
rewriter.release();
|
|
65
55
|
},
|
|
66
56
|
release: () => {},
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/dominator_simplifier.cpp, src/ast/rewriter/dom_simplifier.cpp,
|
|
2
|
-
// src/ast/expr_substitution.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_NOT, OP_OR } from "./ast";
|
|
4
2
|
import { mkNot } from "./ast-util";
|
|
5
3
|
import { type DependentExprState, runSimplifier } from "./dependent-expr-state";
|
|
@@ -199,7 +197,7 @@ class ExprSubstitutionSimplifier {
|
|
|
199
197
|
|
|
200
198
|
private updateSubstitution(expr: number) {
|
|
201
199
|
const manager = this.manager;
|
|
202
|
-
if (manager.
|
|
200
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
203
201
|
const lhs = manager.getArg(expr, 0);
|
|
204
202
|
const rhs = manager.getArg(expr, 1);
|
|
205
203
|
this.computeDepth(lhs);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/dt2bv_tactic.cpp, src/ast/rewriter/enum2bv_rewriter.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -176,13 +174,8 @@ class Enum2BvRewriter extends RewriterTpl {
|
|
|
176
174
|
: data.kind === QUANTIFIER_FORALL
|
|
177
175
|
? manager.mkApp(OP_IMPLIES, [manager.mkAnd(bounds.items), body], SORT_BOOL)
|
|
178
176
|
: manager.mkAnd(bounds.items);
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
sorts,
|
|
182
|
-
body: newBody,
|
|
183
|
-
patterns,
|
|
184
|
-
noPatterns: [],
|
|
185
|
-
});
|
|
177
|
+
// Z3 reads the no-patterns from a vector its rewriter has shrunk: they are the quantifier's own.
|
|
178
|
+
const result = manager.mkQuantifier({ ...data, sorts, body: newBody, patterns });
|
|
186
179
|
manager.incRef(result);
|
|
187
180
|
bounds.reset();
|
|
188
181
|
return result;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, KIND_VAR } from "./ast";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
3
|
import type { Enode } from "./enode";
|
|
@@ -310,7 +309,7 @@ export class Mam implements LabelHasher {
|
|
|
310
309
|
const numArgs = manager.getNumArgs(pattern);
|
|
311
310
|
let groundArgIndex = -1;
|
|
312
311
|
for (let index = 0; index < numArgs && groundArgIndex === -1; index++)
|
|
313
|
-
if (manager.
|
|
312
|
+
if (manager.isGroundApp(manager.getArg(pattern, index))) groundArgIndex = index;
|
|
314
313
|
const groundArg =
|
|
315
314
|
groundArgIndex === -1
|
|
316
315
|
? null
|
|
@@ -344,7 +343,7 @@ export class Mam implements LabelHasher {
|
|
|
344
343
|
if (!isFound) paths.push(path);
|
|
345
344
|
continue;
|
|
346
345
|
}
|
|
347
|
-
if (manager.
|
|
346
|
+
if (manager.isGroundApp(child)) {
|
|
348
347
|
const node = this.getGroundEnode(child, mp.quantifier);
|
|
349
348
|
if (node === null) continue;
|
|
350
349
|
this.updatePlbls(label);
|
|
@@ -361,7 +360,7 @@ export class Mam implements LabelHasher {
|
|
|
361
360
|
|
|
362
361
|
addPattern(quantifier: number, patterns: number[]) {
|
|
363
362
|
const manager = this.manager;
|
|
364
|
-
if (patterns.every((pattern) => manager.
|
|
363
|
+
if (patterns.every((pattern) => manager.isGroundApp(pattern))) return;
|
|
365
364
|
if (patterns.some((pattern) => manager.hasQuantifierFlags[pattern])) return;
|
|
366
365
|
const mp = { quantifier, patterns };
|
|
367
366
|
const numDecls = manager.getQuantifier(quantifier).sorts.length;
|
|
@@ -370,7 +369,7 @@ export class Mam implements LabelHasher {
|
|
|
370
369
|
this.collectGroundExprs(quantifier, patterns);
|
|
371
370
|
this.newPatterns.push(mp);
|
|
372
371
|
patterns.forEach((pattern, firstIndex) => {
|
|
373
|
-
if (manager.
|
|
372
|
+
if (manager.isGroundApp(pattern)) return;
|
|
374
373
|
const label = manager.decls[pattern];
|
|
375
374
|
const tree = this.trees.get(label);
|
|
376
375
|
if (tree !== undefined) {
|
|
@@ -387,7 +386,7 @@ export class Mam implements LabelHasher {
|
|
|
387
386
|
const manager = this.manager;
|
|
388
387
|
const todo: number[] = [];
|
|
389
388
|
for (const pattern of patterns) {
|
|
390
|
-
if (!manager.
|
|
389
|
+
if (!manager.isGroundApp(pattern)) {
|
|
391
390
|
todo.push(pattern);
|
|
392
391
|
continue;
|
|
393
392
|
}
|
|
@@ -397,7 +396,7 @@ export class Mam implements LabelHasher {
|
|
|
397
396
|
this.addSharedEnode(node);
|
|
398
397
|
}
|
|
399
398
|
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
400
|
-
if (manager.
|
|
399
|
+
if (manager.isGroundApp(term)) {
|
|
401
400
|
const node = this.getGroundEnode(term, quantifier);
|
|
402
401
|
if (node !== null) this.addSharedEnode(node);
|
|
403
402
|
} else
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
|
|
2
|
+
import type { Definition, Goal } from "./goal";
|
|
3
|
+
import { DefinedNames } from "./nnf";
|
|
4
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
5
|
+
|
|
6
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
7
|
+
readonly hidden: Definition[] = [];
|
|
8
|
+
|
|
9
|
+
constructor(
|
|
10
|
+
manager: AstManager,
|
|
11
|
+
private names: DefinedNames,
|
|
12
|
+
private goal: Goal,
|
|
13
|
+
) {
|
|
14
|
+
super(manager);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
18
|
+
const manager = this.manager;
|
|
19
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
20
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
21
|
+
manager.incRef(ite);
|
|
22
|
+
const named = this.names.mkName(ite);
|
|
23
|
+
if (named.definition !== -1) {
|
|
24
|
+
this.goal.assert(named.definition);
|
|
25
|
+
if (this.goal.isModelsEnabled) this.hidden.push({ decl: manager.decls[named.name], def: -1 });
|
|
26
|
+
}
|
|
27
|
+
manager.incRef(named.name);
|
|
28
|
+
if (named.definition !== -1) manager.decRef(named.definition);
|
|
29
|
+
manager.decRef(ite);
|
|
30
|
+
return named.name;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export const runElimTermIte = (manager: AstManager) => (goal: Goal) => {
|
|
35
|
+
const names = new DefinedNames(manager, null);
|
|
36
|
+
const rewriter = new ElimTermIteRw(manager, names, goal);
|
|
37
|
+
const size = goal.forms.size;
|
|
38
|
+
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
39
|
+
const result = rewriter.rewrite(goal.forms.items[index]);
|
|
40
|
+
goal.update(index, result, goal.getDependency(index));
|
|
41
|
+
manager.decRef(result);
|
|
42
|
+
}
|
|
43
|
+
if (rewriter.hidden.length > 0) goal.addDefinitions(rewriter.hidden);
|
|
44
|
+
goal.depth++;
|
|
45
|
+
names.release();
|
|
46
|
+
rewriter.release();
|
|
47
|
+
return [goal];
|
|
48
|
+
};
|