tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- 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 +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +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.ts +2 -2
- package/src/parser.ts +151 -42
- 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 +6 -16
- 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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +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 +1 -0
- 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 +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- 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/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- 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 +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- 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 +1 -7
- 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 +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- 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 +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- 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 -9
- 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 +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- 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 +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +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 +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- 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 +25 -6
- 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 +0 -2
- 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 +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- 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 +0 -1
- 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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- 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 +76 -14
- 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 +91 -55
- 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 +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- 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 +3 -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 +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- 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 +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- 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 +0 -1
- 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 +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- 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 +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- 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 +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- 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 +66 -16
- 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 +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- 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 +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- 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/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 +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- 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 +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- 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 +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- 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/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
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/elim_uncnstr_tactic.cpp, src/tactic/core/collect_occs.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
FAMILY_ARITH,
|
|
@@ -51,21 +49,10 @@ import {
|
|
|
51
49
|
} from "./datatype-decl-plugin";
|
|
52
50
|
import type { Definition, Goal } from "./goal";
|
|
53
51
|
import { getManagerSomeValue } from "./proto-model";
|
|
54
|
-
import { Rational } from "./rational";
|
|
52
|
+
import { getMultInverse, Rational } from "./rational";
|
|
55
53
|
import { RefVector } from "./ref-vector";
|
|
56
54
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
57
55
|
|
|
58
|
-
const getModInverse = (value: bigint, modulus: bigint) => {
|
|
59
|
-
let [oldRemainder, remainder] = [((value % modulus) + modulus) % modulus, modulus];
|
|
60
|
-
let [oldCoefficient, coefficient] = [1n, 0n];
|
|
61
|
-
while (remainder !== 0n) {
|
|
62
|
-
const quotient = oldRemainder / remainder;
|
|
63
|
-
[oldRemainder, remainder] = [remainder, oldRemainder - quotient * remainder];
|
|
64
|
-
[oldCoefficient, coefficient] = [coefficient, oldCoefficient - quotient * coefficient];
|
|
65
|
-
}
|
|
66
|
-
return oldRemainder === 1n ? ((oldCoefficient % modulus) + modulus) % modulus : undefined;
|
|
67
|
-
};
|
|
68
|
-
|
|
69
56
|
export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
|
|
70
57
|
const visited = new Set<number>();
|
|
71
58
|
const vars: number[] = [];
|
|
@@ -381,7 +368,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
381
368
|
}
|
|
382
369
|
if (args.length !== 2 || !this.isUncnstr(args[1]) || !manager.isBvNumeral(args[0]))
|
|
383
370
|
return -1;
|
|
384
|
-
const inverse =
|
|
371
|
+
const inverse = getMultInverse(manager.getBvNumeralValue(args[0]), width);
|
|
385
372
|
if (inverse === undefined) return -1;
|
|
386
373
|
const found = this.mkFreshFor(decl, args, sort);
|
|
387
374
|
if (found.isNew)
|
|
@@ -502,7 +489,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
502
489
|
|
|
503
490
|
reduceApp(decl: number, args: number[], sort: number) {
|
|
504
491
|
const manager = this.manager;
|
|
505
|
-
if (args.length === 0 || !args.every((arg) => manager.
|
|
492
|
+
if (args.length === 0 || !args.every((arg) => manager.isGroundApp(arg))) return -1;
|
|
506
493
|
const info = manager.funcDecls[decl];
|
|
507
494
|
const result =
|
|
508
495
|
info.family === FAMILY_BASIC
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_enode.h, src/smt/smt_eq_justification.h, src/smt/smt_justification.h), MIT license, see z3-license.txt.
|
|
2
1
|
import type { Literal } from "./literal";
|
|
3
2
|
|
|
4
3
|
export interface Antecedents {
|
|
@@ -36,9 +35,11 @@ const IS_CGC_ENABLED = 8;
|
|
|
36
35
|
const IS_MARKED = 16;
|
|
37
36
|
const IS_MARKED2 = 32;
|
|
38
37
|
const IS_INTERPRETED = 64;
|
|
39
|
-
const
|
|
38
|
+
const IS_COMMUTATIVE = 128;
|
|
39
|
+
const IS_COMMUTATIVE_TABLE = 256;
|
|
40
|
+
const NUM_ARGS_SHIFT = 9;
|
|
40
41
|
|
|
41
|
-
|
|
42
|
+
class ThVarCell {
|
|
42
43
|
constructor(
|
|
43
44
|
public thId: number,
|
|
44
45
|
public thVar: number,
|
|
@@ -77,6 +78,8 @@ export class Enode {
|
|
|
77
78
|
moreArgs: Enode[],
|
|
78
79
|
public generation: number,
|
|
79
80
|
isEq: boolean,
|
|
81
|
+
isCommutative: boolean,
|
|
82
|
+
isCommutativeTable: boolean,
|
|
80
83
|
isBool: boolean,
|
|
81
84
|
isMergeTf: boolean,
|
|
82
85
|
isCgcEnabled: boolean,
|
|
@@ -88,6 +91,8 @@ export class Enode {
|
|
|
88
91
|
this.flags =
|
|
89
92
|
(numArgs << NUM_ARGS_SHIFT) |
|
|
90
93
|
(isEq ? IS_EQ : 0) |
|
|
94
|
+
(isCommutative ? IS_COMMUTATIVE : 0) |
|
|
95
|
+
(isCommutativeTable ? IS_COMMUTATIVE_TABLE : 0) |
|
|
91
96
|
(isBool ? IS_BOOL : 0) |
|
|
92
97
|
(isMergeTf ? IS_MERGE_TF : 0) |
|
|
93
98
|
(isCgcEnabled ? IS_CGC_ENABLED : 0);
|
|
@@ -109,6 +114,14 @@ export class Enode {
|
|
|
109
114
|
return (this.flags & IS_EQ) !== 0;
|
|
110
115
|
}
|
|
111
116
|
|
|
117
|
+
get isCommutative() {
|
|
118
|
+
return (this.flags & IS_COMMUTATIVE) !== 0;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
get isCommutativeTable() {
|
|
122
|
+
return (this.flags & IS_COMMUTATIVE_TABLE) !== 0;
|
|
123
|
+
}
|
|
124
|
+
|
|
112
125
|
get isBool() {
|
|
113
126
|
return (this.flags & IS_BOOL) !== 0;
|
|
114
127
|
}
|
|
@@ -157,13 +170,6 @@ export class Enode {
|
|
|
157
170
|
return -1;
|
|
158
171
|
}
|
|
159
172
|
|
|
160
|
-
getNumThVars() {
|
|
161
|
-
if (this.thVar < 0) return 0;
|
|
162
|
-
let count = 1;
|
|
163
|
-
for (let cell = this.thNext; cell !== null; cell = cell.next) count++;
|
|
164
|
-
return count;
|
|
165
|
-
}
|
|
166
|
-
|
|
167
173
|
forEachThVar(visit: (thId: number, thVar: number) => void) {
|
|
168
174
|
if (this.thVar < 0) return;
|
|
169
175
|
visit(this.thId, this.thVar);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/arith_solver.h, src/sat/smt/arith_internalize.cpp,
|
|
2
|
-
// src/math/lp/lp_api.h), MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
FAMILY_ARITH,
|
|
5
3
|
OP_ABS,
|
|
@@ -49,7 +47,7 @@ export interface ArithBound {
|
|
|
49
47
|
|
|
50
48
|
export const SOURCE_INEQUALITY = 0;
|
|
51
49
|
export const SOURCE_EQUALITY = 1;
|
|
52
|
-
|
|
50
|
+
const SOURCE_DEFINITION = 2;
|
|
53
51
|
|
|
54
52
|
interface InternalizeState {
|
|
55
53
|
terms: number[];
|
|
@@ -120,10 +118,6 @@ export abstract class ArithInternalize extends ThSolver {
|
|
|
120
118
|
return this.manager.isInt(this.var2expr(thVar));
|
|
121
119
|
}
|
|
122
120
|
|
|
123
|
-
protected isRealVar(thVar: number) {
|
|
124
|
-
return this.manager.isReal(this.var2expr(thVar));
|
|
125
|
-
}
|
|
126
|
-
|
|
127
121
|
protected isBoolVar(thVar: number) {
|
|
128
122
|
return this.manager.isBool(this.var2expr(thVar));
|
|
129
123
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/arith_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkBoundAtom, mkTermEqSides } from "../arith-terms";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -48,7 +47,6 @@ import { CR_CONTINUE, CR_DONE, CR_GIVEUP } from "../sat/solver";
|
|
|
48
47
|
import type { ArithBound } from "./arith-internalize";
|
|
49
48
|
import { ArithAxioms } from "./arith-axioms";
|
|
50
49
|
import { type Enode, NULL_THEORY_VAR } from "./egraph";
|
|
51
|
-
import type { EufSolver } from "./euf-solver";
|
|
52
50
|
import { addDependency, type Dependencies } from "./th-solver";
|
|
53
51
|
|
|
54
52
|
const SMALL_LEMMA_SIZE = 16;
|
|
@@ -85,10 +83,6 @@ export class ArithSolver extends ArithAxioms {
|
|
|
85
83
|
private assumeEqCandidates: [number, number][] = [];
|
|
86
84
|
private assumeEqHead = 0;
|
|
87
85
|
|
|
88
|
-
constructor(ctx: EufSolver, id: number) {
|
|
89
|
-
super(ctx, id);
|
|
90
|
-
}
|
|
91
|
-
|
|
92
86
|
override asserted(lit: number) {
|
|
93
87
|
this.forcePush();
|
|
94
88
|
this.assertedLits.push(lit);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/array_solver.h, src/sat/smt/array_solver.cpp,
|
|
2
|
-
// src/sat/smt/array_internalize.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { mkArrayDecl } from "../array-decl-plugin";
|
|
4
2
|
import {
|
|
5
3
|
FAMILY_ARRAY,
|
|
@@ -25,7 +23,7 @@ export const KIND_CONGRUENCE = 4;
|
|
|
25
23
|
|
|
26
24
|
export const STATE_NEW = 0;
|
|
27
25
|
export const STATE_DELAYED = 1;
|
|
28
|
-
|
|
26
|
+
const STATE_APPLIED = 2;
|
|
29
27
|
|
|
30
28
|
export interface AxiomRecord {
|
|
31
29
|
readonly kind: number;
|
|
@@ -42,20 +40,31 @@ export interface VarData {
|
|
|
42
40
|
readonly parentSelects: Enode[];
|
|
43
41
|
}
|
|
44
42
|
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
43
|
+
const PACKED_EXPR_LIMIT = 2 ** 24;
|
|
44
|
+
|
|
45
|
+
// The kind, the node and the select or its only index in one exact integer, when both
|
|
46
|
+
// expressions are small enough.
|
|
47
|
+
const getAxiomKey = (record: AxiomRecord) => {
|
|
48
|
+
const node = record.node.owner;
|
|
49
|
+
const select = record.select;
|
|
50
|
+
const isSelect = record.kind === KIND_SELECT && select !== null;
|
|
51
|
+
if (isSelect && select.args.length !== 2)
|
|
52
|
+
return `${record.kind},${node},${select.args
|
|
53
|
+
.slice(1)
|
|
54
|
+
.map((arg) => arg.owner)
|
|
55
|
+
.join(",")}`;
|
|
56
|
+
const other = select === null ? 0 : (isSelect ? select.args[1].owner : select.owner) + 1;
|
|
57
|
+
return node < PACKED_EXPR_LIMIT && other < PACKED_EXPR_LIMIT
|
|
58
|
+
? (node * PACKED_EXPR_LIMIT + other) * 8 + record.kind
|
|
59
|
+
: `${record.kind},${node},${other}`;
|
|
60
|
+
};
|
|
52
61
|
|
|
53
62
|
export abstract class ArrayInternalize extends ThSolver {
|
|
54
63
|
protected readonly varData: VarData[] = [];
|
|
55
64
|
protected readonly find: UnionFind;
|
|
56
65
|
private sort2diffs = new Map<number, number[]>();
|
|
57
66
|
protected readonly axiomTrail: AxiomRecord[] = [];
|
|
58
|
-
private axioms = new Map<string, number>();
|
|
67
|
+
private axioms = new Map<number | string, number>();
|
|
59
68
|
protected qhead = 0;
|
|
60
69
|
protected delayQhead = 0;
|
|
61
70
|
protected isDelayEnabled = true;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/smt/dt_solver.h, src/sat/smt/dt_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import { mkArrayApp } from "../array-decl-plugin";
|
|
5
3
|
import {
|
|
@@ -39,7 +37,7 @@ const ENTER = 0;
|
|
|
39
37
|
const EXIT = 1;
|
|
40
38
|
|
|
41
39
|
interface VarData {
|
|
42
|
-
|
|
40
|
+
constructorNode: Enode | null;
|
|
43
41
|
readonly recognizers: (Enode | null)[];
|
|
44
42
|
}
|
|
45
43
|
|
|
@@ -187,12 +185,12 @@ export class DtSolver extends ThSolver {
|
|
|
187
185
|
const manager = this.manager;
|
|
188
186
|
const thVar = super.mkVar(node);
|
|
189
187
|
this.find.mkVar();
|
|
190
|
-
const data: VarData = {
|
|
188
|
+
const data: VarData = { constructorNode: null, recognizers: [] };
|
|
191
189
|
this.varData.push(data);
|
|
192
190
|
this.ctx.egraph.addThVar(node, thVar, this.id);
|
|
193
191
|
const expr = node.owner;
|
|
194
192
|
if (this.isConstructor(expr)) {
|
|
195
|
-
data.
|
|
193
|
+
data.constructorNode = node;
|
|
196
194
|
this.assertAccessorAxioms(node);
|
|
197
195
|
} else if (this.isUpdateField(expr)) this.assertUpdateFieldAxioms(node);
|
|
198
196
|
else if (!this.isRecognizer(expr)) {
|
|
@@ -283,11 +281,11 @@ export class DtSolver extends ThSolver {
|
|
|
283
281
|
const data = this.varData[thVar];
|
|
284
282
|
const constructor = getRecognizerConstructor(manager, node.decl);
|
|
285
283
|
if ((lit & 1) === 0) {
|
|
286
|
-
if (data.
|
|
284
|
+
if (data.constructorNode !== null && data.constructorNode.decl === constructor) return;
|
|
287
285
|
this.assertIsConstructorAxiom(arg, constructor, lit);
|
|
288
|
-
} else if (data.
|
|
289
|
-
else if (data.
|
|
290
|
-
this.signRecognizerConflict(data.
|
|
286
|
+
} else if (data.constructorNode === null) this.propagateRecognizer(thVar, node);
|
|
287
|
+
else if (data.constructorNode.decl === constructor)
|
|
288
|
+
this.signRecognizerConflict(data.constructorNode, node);
|
|
291
289
|
}
|
|
292
290
|
|
|
293
291
|
private addRecognizer(inputVar: number, recognizer: Enode) {
|
|
@@ -303,9 +301,9 @@ export class DtSolver extends ThSolver {
|
|
|
303
301
|
if (data.recognizers[index] !== null) return;
|
|
304
302
|
const value = this.value(recognizer);
|
|
305
303
|
if (value === L_TRUE) return;
|
|
306
|
-
if (value === L_FALSE && data.
|
|
307
|
-
if (data.
|
|
308
|
-
this.signRecognizerConflict(data.
|
|
304
|
+
if (value === L_FALSE && data.constructorNode !== null) {
|
|
305
|
+
if (data.constructorNode.decl === constructor)
|
|
306
|
+
this.signRecognizerConflict(data.constructorNode, recognizer);
|
|
309
307
|
return;
|
|
310
308
|
}
|
|
311
309
|
this.ctx.trail.push(() => {
|
|
@@ -365,8 +363,8 @@ export class DtSolver extends ThSolver {
|
|
|
365
363
|
const manager = this.manager;
|
|
366
364
|
const firstData = this.varData[first];
|
|
367
365
|
const secondData = this.varData[second];
|
|
368
|
-
const firstConstructor = firstData.
|
|
369
|
-
const secondConstructor = secondData.
|
|
366
|
+
const firstConstructor = firstData.constructorNode;
|
|
367
|
+
const secondConstructor = secondData.constructorNode;
|
|
370
368
|
if (
|
|
371
369
|
firstConstructor !== null &&
|
|
372
370
|
secondConstructor !== null &&
|
|
@@ -375,7 +373,7 @@ export class DtSolver extends ThSolver {
|
|
|
375
373
|
this.setConflict([], [[firstConstructor, secondConstructor]]);
|
|
376
374
|
else if (secondConstructor !== null && firstConstructor === null) {
|
|
377
375
|
this.ctx.trail.push(() => {
|
|
378
|
-
firstData.
|
|
376
|
+
firstData.constructorNode = null;
|
|
379
377
|
});
|
|
380
378
|
if (firstData.recognizers.length > 0) {
|
|
381
379
|
const recognizer =
|
|
@@ -385,7 +383,7 @@ export class DtSolver extends ThSolver {
|
|
|
385
383
|
return;
|
|
386
384
|
}
|
|
387
385
|
}
|
|
388
|
-
firstData.
|
|
386
|
+
firstData.constructorNode = secondConstructor;
|
|
389
387
|
}
|
|
390
388
|
for (const recognizer of secondData.recognizers)
|
|
391
389
|
if (recognizer !== null) this.addRecognizer(first, recognizer);
|
|
@@ -404,7 +402,7 @@ export class DtSolver extends ThSolver {
|
|
|
404
402
|
private ocGetConstructor(app: Enode) {
|
|
405
403
|
const thVar = app.root.getThVar(this.id);
|
|
406
404
|
if (thVar === NULL_THEORY_VAR) return null;
|
|
407
|
-
return this.varData[this.find.find(thVar)].
|
|
405
|
+
return this.varData[this.find.find(thVar)].constructorNode;
|
|
408
406
|
}
|
|
409
407
|
|
|
410
408
|
private explainIsChild(parent: Enode, child: Enode) {
|
|
@@ -439,7 +437,7 @@ export class DtSolver extends ThSolver {
|
|
|
439
437
|
const app = inputApp.root;
|
|
440
438
|
const thVar = app.getThVar(this.id);
|
|
441
439
|
if (thVar === NULL_THEORY_VAR) return false;
|
|
442
|
-
const parent = this.varData[this.find.find(thVar)].
|
|
440
|
+
const parent = this.varData[this.find.find(thVar)].constructorNode;
|
|
443
441
|
if (parent === null) return false;
|
|
444
442
|
this.ocMarkOnStack(parent);
|
|
445
443
|
const processArg = (arg: Enode) => {
|
|
@@ -510,7 +508,7 @@ export class DtSolver extends ThSolver {
|
|
|
510
508
|
this.clearMark();
|
|
511
509
|
return CR_CONTINUE;
|
|
512
510
|
}
|
|
513
|
-
if (this.varData[thVar].
|
|
511
|
+
if (this.varData[thVar].constructorNode !== null) continue;
|
|
514
512
|
this.clearMark();
|
|
515
513
|
this.mkSplit(thVar);
|
|
516
514
|
result = CR_CONTINUE;
|
|
@@ -530,7 +528,7 @@ export class DtSolver extends ThSolver {
|
|
|
530
528
|
values[node.root.owner] = model.getFreshValue(this.manager.sorts[node.owner]) ?? undefined;
|
|
531
529
|
return;
|
|
532
530
|
}
|
|
533
|
-
const constructor = this.varData[this.find.find(thVar)].
|
|
531
|
+
const constructor = this.varData[this.find.find(thVar)].constructorNode as Enode;
|
|
534
532
|
values[node.root.owner] = this.mkApp(
|
|
535
533
|
constructor.decl,
|
|
536
534
|
constructor.args.map((arg) => values[arg.root.owner] as number),
|
|
@@ -541,7 +539,7 @@ export class DtSolver extends ThSolver {
|
|
|
541
539
|
if (!this.isDatatype(node.owner)) return false;
|
|
542
540
|
const thVar = node.getThVar(this.id);
|
|
543
541
|
if (thVar === NULL_THEORY_VAR) return false;
|
|
544
|
-
const constructor = this.varData[this.find.find(thVar)].
|
|
542
|
+
const constructor = this.varData[this.find.find(thVar)].constructorNode as Enode;
|
|
545
543
|
if (constructor.numArgs === 0) deps.set(node, null);
|
|
546
544
|
for (const arg of constructor.args) addDependency(deps, node, arg.root);
|
|
547
545
|
return true;
|