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/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { OP_ITE, OP_SUB, SORT_BOOL } from "./ast";
|
|
3
2
|
import { TheoryJustification } from "./enode";
|
|
4
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -34,7 +33,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
34
33
|
private delayIneqsQhead = 0;
|
|
35
34
|
protected explanation = new Explanation();
|
|
36
35
|
protected coreLiterals: Literal[] = [];
|
|
37
|
-
protected numConflicts = 0;
|
|
38
36
|
private lowerTerms: (TermBound | undefined)[] = [];
|
|
39
37
|
private upperTerms: (TermBound | undefined)[] = [];
|
|
40
38
|
protected isModelInitialized = false;
|
|
@@ -132,11 +130,15 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
132
130
|
: bound.isLower
|
|
133
131
|
? bound.value.sub(Rational.one)
|
|
134
132
|
: bound.value.add(Rational.one);
|
|
135
|
-
if (isTrue ? bound.eps.isZero() : bound.isInt)
|
|
133
|
+
if (this.isPropagatingEqs() && (isTrue ? bound.eps.isZero() : bound.isInt))
|
|
136
134
|
this.propagateEqs(bound.column, constraint, kind, bound, value);
|
|
137
135
|
return true;
|
|
138
136
|
}
|
|
139
137
|
|
|
138
|
+
protected isPropagatingEqs() {
|
|
139
|
+
return this.context.config.isArithPropagatingEqs;
|
|
140
|
+
}
|
|
141
|
+
|
|
140
142
|
private propagateEqs(
|
|
141
143
|
column: number,
|
|
142
144
|
constraint: number,
|
|
@@ -257,7 +259,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
257
259
|
}
|
|
258
260
|
|
|
259
261
|
protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
|
|
260
|
-
if (this.context.isInconsistent()) return false;
|
|
262
|
+
if (this.context.isInconsistent() || !this.isPropagatingEqs()) return false;
|
|
261
263
|
const v1 = this.solver.getExternal(first);
|
|
262
264
|
const v2 = this.solver.getExternal(second);
|
|
263
265
|
if (v1 === NULL_THEORY_VAR || v2 === NULL_THEORY_VAR) return false;
|
|
@@ -383,7 +385,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
383
385
|
|
|
384
386
|
protected setConflict() {
|
|
385
387
|
this.resetEvidence();
|
|
386
|
-
this.numConflicts++;
|
|
387
388
|
for (const constraint of this.explanation) this.setEvidence(constraint);
|
|
388
389
|
this.context.setConflict(new TheoryJustification(this.id, this.coreLiterals, []), null);
|
|
389
390
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp, src/smt/arith_eq_adapter.cpp, src/math/lp/lp_api.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "./array";
|
|
3
2
|
import { coeffsToApp, getTermCoeffs } from "./arith-terms";
|
|
4
3
|
import { OP_GE, OP_GT, OP_LE, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
@@ -61,11 +60,6 @@ export class TheoryLra extends TheoryLraFinalCheck {
|
|
|
61
60
|
return thVar;
|
|
62
61
|
}
|
|
63
62
|
|
|
64
|
-
getObjectiveValue(thVar: number) {
|
|
65
|
-
const value = this.solver.getValue(this.solver.externalToLocalColumn(thVar));
|
|
66
|
-
return InfEps.of(value.x, value.y);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
63
|
// With isComputingUpper, the maximum of the linear relaxation is also an upper bound of the
|
|
70
64
|
// objective when the bounds that prove it hold; it holds globally when they hold at the base
|
|
71
65
|
// level.
|
|
@@ -236,7 +230,6 @@ export class TheoryLra extends TheoryLraFinalCheck {
|
|
|
236
230
|
}
|
|
237
231
|
|
|
238
232
|
initSearchEh() {
|
|
239
|
-
this.numConflicts = 0;
|
|
240
233
|
this.restartPairs = [];
|
|
241
234
|
}
|
|
242
235
|
}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { SmtInvariantError } from "../../../errors";
|
|
2
|
+
import {
|
|
3
|
+
FAMILY_PB,
|
|
4
|
+
OP_AT_LEAST_K,
|
|
5
|
+
OP_AT_MOST_K,
|
|
6
|
+
OP_PB_AUX_BOOL,
|
|
7
|
+
OP_PB_EQ,
|
|
8
|
+
OP_PB_GE,
|
|
9
|
+
OP_PB_LE,
|
|
10
|
+
} from "./ast";
|
|
5
11
|
import { mkNot } from "./ast-util";
|
|
6
12
|
import { BinJustification, CLS_TH_LEMMA } from "./clause";
|
|
7
13
|
import type { Context } from "./context";
|
|
@@ -223,7 +229,6 @@ class Card {
|
|
|
223
229
|
constructor(
|
|
224
230
|
public lit: Literal,
|
|
225
231
|
public k: number,
|
|
226
|
-
readonly isAux: boolean,
|
|
227
232
|
) {}
|
|
228
233
|
|
|
229
234
|
get size() {
|
|
@@ -311,6 +316,10 @@ export class TheoryPb extends Theory {
|
|
|
311
316
|
const context = this.context;
|
|
312
317
|
const manager = this.manager;
|
|
313
318
|
if (context.isBInternalized(atom)) return true;
|
|
319
|
+
if (manager.getOp(atom) === OP_PB_AUX_BOOL) {
|
|
320
|
+
context.setVarTheory(context.mkBoolVar(atom), this.id);
|
|
321
|
+
return true;
|
|
322
|
+
}
|
|
314
323
|
if (this.internalizeCard(atom)) return true;
|
|
315
324
|
const boolVar = context.mkBoolVar(atom);
|
|
316
325
|
context.setVarTheory(boolVar, this.id);
|
|
@@ -319,7 +328,7 @@ export class TheoryPb extends Theory {
|
|
|
319
328
|
const args = manager.getArgs(atom);
|
|
320
329
|
const op = manager.getOp(atom);
|
|
321
330
|
if (op === OP_PB_EQ) {
|
|
322
|
-
const coeffs = args.map((
|
|
331
|
+
const coeffs = args.map((_value, index) => getPbCoeff(manager, decl, index));
|
|
323
332
|
const sum = coeffs.reduce((total, coeff) => total.add(coeff), Rational.zero);
|
|
324
333
|
const k = getPbK(manager, decl);
|
|
325
334
|
const le = mkPbGe(
|
|
@@ -397,8 +406,14 @@ export class TheoryPb extends Theory {
|
|
|
397
406
|
hasBoolVar = true;
|
|
398
407
|
isNot = !isNot;
|
|
399
408
|
}
|
|
400
|
-
if (!hasBoolVar)
|
|
401
|
-
|
|
409
|
+
if (!hasBoolVar) {
|
|
410
|
+
const proxy = manager.mkPbAuxBool();
|
|
411
|
+
const definition = manager.mkEq(proxy, arg);
|
|
412
|
+
context.internalize(definition, false);
|
|
413
|
+
boolVar = context.getBoolVar(proxy);
|
|
414
|
+
context.mkThAxiom([mkLiteral(context.getBoolVar(definition))]);
|
|
415
|
+
context.markAsRelevant(proxy);
|
|
416
|
+
}
|
|
402
417
|
return mkLiteral(boolVar, isNot);
|
|
403
418
|
}
|
|
404
419
|
|
|
@@ -475,7 +490,7 @@ export class TheoryPb extends Theory {
|
|
|
475
490
|
context.mkThAxiom([negate(lit)]);
|
|
476
491
|
return true;
|
|
477
492
|
}
|
|
478
|
-
const card = new Card(lit, bound
|
|
493
|
+
const card = new Card(lit, bound);
|
|
479
494
|
for (const arg of args) card.addArg(this.compileArg(arg));
|
|
480
495
|
if (bound === card.size) this.card2conjunction(card);
|
|
481
496
|
else if (card.size === 1) this.card2disjunction(card);
|
|
@@ -694,19 +709,23 @@ export class TheoryPb extends Theory {
|
|
|
694
709
|
override popScopeEh(numScopes: number) {
|
|
695
710
|
let newLim = this.ineqsLim.length - numScopes;
|
|
696
711
|
let size = this.ineqsLim[newLim];
|
|
697
|
-
|
|
698
|
-
const boolVar = this.ineqsTrail
|
|
699
|
-
this.
|
|
712
|
+
for (let index = this.ineqsTrail.length - 1; index >= size; index--) {
|
|
713
|
+
const boolVar = this.ineqsTrail[index];
|
|
714
|
+
const ineq = this.ineqs[boolVar];
|
|
715
|
+
if (ineq !== undefined) this.clearIneqWatch(ineq);
|
|
700
716
|
this.ineqs[boolVar] = undefined;
|
|
701
717
|
}
|
|
718
|
+
this.ineqsTrail.length = size;
|
|
702
719
|
this.ineqsLim.length = newLim;
|
|
703
720
|
newLim = this.cardLim.length - numScopes;
|
|
704
721
|
size = this.cardLim[newLim];
|
|
705
|
-
|
|
706
|
-
const boolVar = this.cardTrail
|
|
707
|
-
this.
|
|
722
|
+
for (let index = this.cardTrail.length - 1; index >= size; index--) {
|
|
723
|
+
const boolVar = this.cardTrail[index];
|
|
724
|
+
const card = this.cards[boolVar];
|
|
725
|
+
if (card !== undefined) this.clearCardWatch(card);
|
|
708
726
|
this.cards[boolVar] = undefined;
|
|
709
727
|
}
|
|
728
|
+
this.cardTrail.length = size;
|
|
710
729
|
this.cardLim.length = newLim;
|
|
711
730
|
super.popScopeEh(numScopes);
|
|
712
731
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// a Boolean variable as Z3's does.
|
|
1
|
+
// The port parses no polymorphic axioms, so the theory never has instances to assert. It still
|
|
2
|
+
// assumes a fresh constant whenever formulas were asserted since its last assumption, which takes a
|
|
3
|
+
// fresh name and a Boolean variable as Z3's does.
|
|
5
4
|
import { FAMILY_POLY, SORT_BOOL } from "./ast";
|
|
6
5
|
import type { Context } from "./context";
|
|
7
6
|
import { Theory } from "./theory";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_recfun.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_RECFUN,
|
|
@@ -112,8 +111,8 @@ export class TheoryRecfun extends Theory {
|
|
|
112
111
|
for (const expr of exprs) this.keep(expr);
|
|
113
112
|
this.propagationQueue.push({ kind, exprs });
|
|
114
113
|
this.context.pushTrail(() => {
|
|
115
|
-
|
|
116
|
-
|
|
114
|
+
this.propagationQueue.pop();
|
|
115
|
+
for (const expr of exprs) this.manager.decRef(expr);
|
|
117
116
|
});
|
|
118
117
|
}
|
|
119
118
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/seq_regex.cpp, src/smt/seq_regex.h), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
KIND_APP,
|
|
4
3
|
OP_ITE,
|
|
@@ -218,8 +217,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
218
217
|
private collectVars(seq: number, vars: number[]) {
|
|
219
218
|
const manager = this.manager;
|
|
220
219
|
const todo = [seq];
|
|
221
|
-
|
|
222
|
-
const expr = todo.pop()!;
|
|
220
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
223
221
|
if (manager.getOp(expr) === OP_SEQ_CONCAT) {
|
|
224
222
|
todo.push(...manager.getArgs(expr));
|
|
225
223
|
continue;
|
|
@@ -257,8 +255,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
257
255
|
const manager = this.manager;
|
|
258
256
|
const todo = [term];
|
|
259
257
|
let length = 0;
|
|
260
|
-
|
|
261
|
-
const expr = todo.pop()!;
|
|
258
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
262
259
|
if (this.isConcat(expr)) {
|
|
263
260
|
todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
264
261
|
continue;
|
|
@@ -508,8 +505,7 @@ export abstract class TheorySeqRegex extends TheorySeqSolve {
|
|
|
508
505
|
if (this.hasLength(seq)) return true;
|
|
509
506
|
const todo = [seq];
|
|
510
507
|
let hasVar = false;
|
|
511
|
-
|
|
512
|
-
const expr = todo.pop()!;
|
|
508
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
513
509
|
if (this.isConcat(expr)) {
|
|
514
510
|
todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
515
511
|
continue;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp, src/smt/seq_eq_solver.cpp, src/smt/seq_ne_solver.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
OP_ADD,
|
|
5
3
|
OP_EQ,
|
|
@@ -32,7 +30,7 @@ import { getConcat, mkSeqApp } from "./seq-decl-plugin";
|
|
|
32
30
|
import type { EqPair } from "./seq-rewriter";
|
|
33
31
|
import { type DecomposedEq, type DepEq, type Ne, TheorySeqState } from "./theory-seq-state";
|
|
34
32
|
|
|
35
|
-
|
|
33
|
+
interface DepState {
|
|
36
34
|
dep: Dependency;
|
|
37
35
|
isChanged: boolean;
|
|
38
36
|
}
|
|
@@ -360,11 +358,11 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
360
358
|
this.propagateEq(deps, front, ls[0], rs[0], true);
|
|
361
359
|
return true;
|
|
362
360
|
}
|
|
363
|
-
const back = this.reduceLength(ls.
|
|
361
|
+
const back = this.reduceLength(ls[ls.length - 1], rs[rs.length - 1]);
|
|
364
362
|
if (back !== undefined) {
|
|
365
363
|
const deps = this.mkJoinLiterals(inputDeps, back);
|
|
366
364
|
this.eqs.push(this.mkDepEq(this.eqId++, ls.slice(0, -1), rs.slice(0, -1), deps));
|
|
367
|
-
this.propagateEq(deps, back, ls.
|
|
365
|
+
this.propagateEq(deps, back, ls[ls.length - 1], rs[rs.length - 1], true);
|
|
368
366
|
return true;
|
|
369
367
|
}
|
|
370
368
|
const getLength = (expr: number) => this.getLengthValue(expr);
|
|
@@ -404,7 +402,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
404
402
|
const sumBack = (first: number, others: readonly number[], isStrict: boolean) => {
|
|
405
403
|
const firstLength = getLength(first);
|
|
406
404
|
if (firstLength === undefined) return undefined;
|
|
407
|
-
let total = getLength(others.
|
|
405
|
+
let total = getLength(others[others.length - 1]);
|
|
408
406
|
if (total === undefined) return undefined;
|
|
409
407
|
if (isStrict ? firstLength.compare(total) <= 0 : firstLength.compare(total) < 0)
|
|
410
408
|
return undefined;
|
|
@@ -417,7 +415,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
417
415
|
return firstLength.equals(total) && index > 0 ? index : undefined;
|
|
418
416
|
};
|
|
419
417
|
if (ls.length > 1) {
|
|
420
|
-
const index = sumBack(ls.
|
|
418
|
+
const index = sumBack(ls[ls.length - 1], rs, false);
|
|
421
419
|
if (
|
|
422
420
|
index !== undefined &&
|
|
423
421
|
index < rs.length &&
|
|
@@ -426,7 +424,7 @@ export abstract class TheorySeqSolve extends TheorySeqState {
|
|
|
426
424
|
return true;
|
|
427
425
|
}
|
|
428
426
|
if (rs.length > 1) {
|
|
429
|
-
const index = sumBack(rs.
|
|
427
|
+
const index = sumBack(rs[rs.length - 1], ls, true);
|
|
430
428
|
if (
|
|
431
429
|
index !== undefined &&
|
|
432
430
|
index < ls.length &&
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp, src/smt/theory_seq.h, src/smt/smt_arith_value.cpp,
|
|
2
|
-
// src/util/scoped_vector.h), MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
|
-
OP_ADD,
|
|
6
3
|
OP_GE,
|
|
7
4
|
OP_LE,
|
|
8
5
|
OP_SEQ_CONCAT,
|
|
@@ -55,7 +52,7 @@ export interface Ne {
|
|
|
55
52
|
dep: Dependency;
|
|
56
53
|
}
|
|
57
54
|
|
|
58
|
-
|
|
55
|
+
interface Nc {
|
|
59
56
|
contains: number;
|
|
60
57
|
lengthGreater: Literal;
|
|
61
58
|
dep: Dependency;
|
|
@@ -66,7 +63,7 @@ interface ExprDep {
|
|
|
66
63
|
dep: Dependency;
|
|
67
64
|
}
|
|
68
65
|
|
|
69
|
-
|
|
66
|
+
class ScopedVector<T> {
|
|
70
67
|
items: T[] = [];
|
|
71
68
|
private undoIndexes: number[] = [];
|
|
72
69
|
private undoValues: T[] = [];
|
|
@@ -148,10 +145,6 @@ class SolutionMap {
|
|
|
148
145
|
private deps: Dependency[] = [];
|
|
149
146
|
private limits: number[] = [];
|
|
150
147
|
|
|
151
|
-
get isEmpty() {
|
|
152
|
-
return this.map.size === 0;
|
|
153
|
-
}
|
|
154
|
-
|
|
155
148
|
private reducesTo(input: number, expr: number) {
|
|
156
149
|
let current = input;
|
|
157
150
|
while (current !== expr) {
|
|
@@ -239,10 +232,6 @@ class ExclusionTable {
|
|
|
239
232
|
|
|
240
233
|
constructor(private manager: AstManager) {}
|
|
241
234
|
|
|
242
|
-
get isEmpty() {
|
|
243
|
-
return this.table.size === 0;
|
|
244
|
-
}
|
|
245
|
-
|
|
246
235
|
private getKey(first: number, second: number) {
|
|
247
236
|
return this.manager.ids[first] > this.manager.ids[second]
|
|
248
237
|
? `${second},${first}`
|
|
@@ -348,7 +337,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
348
337
|
protected intStrings: number[] = [];
|
|
349
338
|
protected hasLengthSet = new Set<number>();
|
|
350
339
|
protected lengths: number[] = [];
|
|
351
|
-
protected lengthLimitMap = new Map<number, number>();
|
|
352
340
|
protected lengthLimits: number[] = [];
|
|
353
341
|
protected replay: (() => void)[] = [];
|
|
354
342
|
protected strRewriter: Rewriter;
|
|
@@ -475,10 +463,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
475
463
|
return this.rewrite(this.mkArith(OP_SUB, [first, second]));
|
|
476
464
|
}
|
|
477
465
|
|
|
478
|
-
protected mkAdd(first: number, second: number) {
|
|
479
|
-
return this.rewrite(this.mkArith(OP_ADD, [first, second]));
|
|
480
|
-
}
|
|
481
|
-
|
|
482
466
|
protected mkLength(seq: number) {
|
|
483
467
|
return mkSeqApp(this.manager, OP_SEQ_LENGTH, [seq]);
|
|
484
468
|
}
|
|
@@ -493,16 +477,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
493
477
|
return { id: this.eqId++, ls, rs, dep };
|
|
494
478
|
}
|
|
495
479
|
|
|
496
|
-
protected mkEqDepOf(lefts: readonly number[], rights: readonly number[], dep: Dependency): DepEq {
|
|
497
|
-
const ls: number[] = [];
|
|
498
|
-
const rs: number[] = [];
|
|
499
|
-
for (const expr of lefts) this.getConcatUnits(expr, ls);
|
|
500
|
-
for (const expr of rights) this.getConcatUnits(expr, rs);
|
|
501
|
-
for (const expr of ls) this.keep(expr);
|
|
502
|
-
for (const expr of rs) this.keep(expr);
|
|
503
|
-
return { id: ++this.eqId, ls, rs, dep };
|
|
504
|
-
}
|
|
505
|
-
|
|
506
480
|
protected mkDepEq(id: number, ls: readonly number[], rs: readonly number[], dep: Dependency) {
|
|
507
481
|
return {
|
|
508
482
|
id,
|
|
@@ -531,12 +505,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
531
505
|
return dep;
|
|
532
506
|
}
|
|
533
507
|
|
|
534
|
-
protected addDependency(dep: Dependency, first: Enode, second: Enode) {
|
|
535
|
-
return first === second
|
|
536
|
-
? dep
|
|
537
|
-
: mkJoin(dep, this.mkAssumption({ first, second, literal: undefined }));
|
|
538
|
-
}
|
|
539
|
-
|
|
540
508
|
protected linearizeOf(dep: Dependency, eqs: Enode[], literals: Literal[]) {
|
|
541
509
|
for (const index of linearize([dep])) {
|
|
542
510
|
const assumption = this.assumptions[index];
|
|
@@ -610,8 +578,7 @@ export abstract class TheorySeqState extends Theory {
|
|
|
610
578
|
const manager = this.manager;
|
|
611
579
|
let value = Rational.zero;
|
|
612
580
|
const todo = [input];
|
|
613
|
-
|
|
614
|
-
const expr = todo.pop()!;
|
|
581
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
615
582
|
const op = manager.getOp(expr);
|
|
616
583
|
const chars = manager.getString(expr);
|
|
617
584
|
if (this.isConcat(expr)) todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
@@ -758,8 +725,13 @@ export abstract class TheorySeqState extends Theory {
|
|
|
758
725
|
isAddingToEqs = true,
|
|
759
726
|
) {
|
|
760
727
|
const context = this.context;
|
|
728
|
+
const manager = this.manager;
|
|
729
|
+
manager.incRef(firstExpr);
|
|
730
|
+
manager.incRef(secondExpr);
|
|
761
731
|
const first = this.ensureEnodeOf(firstExpr);
|
|
762
732
|
const second = this.ensureEnodeOf(secondExpr);
|
|
733
|
+
manager.decRef(secondExpr);
|
|
734
|
+
manager.decRef(firstExpr);
|
|
763
735
|
if (first.root === second.root) return false;
|
|
764
736
|
context.markAsRelevant(first.owner);
|
|
765
737
|
context.markAsRelevant(second.owner);
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_SEQ,
|
|
5
4
|
OP_EQ,
|
|
6
|
-
OP_ITE,
|
|
7
5
|
OP_SEQ_AT,
|
|
8
6
|
OP_SEQ_CONTAINS,
|
|
9
7
|
OP_SEQ_EXTRACT,
|
|
@@ -79,29 +77,26 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
79
77
|
finalCheckEh() {
|
|
80
78
|
if (!this.hasSeq) return FC_DONE;
|
|
81
79
|
this.isNewPropagation = false;
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
() => this.finalCheckRegex(),
|
|
103
|
-
];
|
|
104
|
-
if (checks.some((check) => check())) return FC_CONTINUE;
|
|
80
|
+
if (this.simplifyAndSolveEqs()) return FC_CONTINUE;
|
|
81
|
+
if (this.checkEquationConflict()) return FC_CONTINUE;
|
|
82
|
+
if (this.checkLts()) return FC_CONTINUE;
|
|
83
|
+
if (this.solveNqs(0)) return FC_CONTINUE;
|
|
84
|
+
if (this.checkFixedLength(true, false)) return FC_CONTINUE;
|
|
85
|
+
if (this.checkFixedLength(false, false)) return FC_CONTINUE;
|
|
86
|
+
if (this.checkFixedLength(false, true)) return FC_CONTINUE;
|
|
87
|
+
if (this.checkContains()) return FC_CONTINUE;
|
|
88
|
+
if (this.checkIntString()) return FC_CONTINUE;
|
|
89
|
+
if (this.reduceLengthEq()) return FC_CONTINUE;
|
|
90
|
+
if (this.branchUnitVariable()) return FC_CONTINUE;
|
|
91
|
+
if (this.branchBinaryVariable()) return FC_CONTINUE;
|
|
92
|
+
if (this.branchVariable()) return FC_CONTINUE;
|
|
93
|
+
if (this.checkLengthCoherence()) return FC_CONTINUE;
|
|
94
|
+
if (!this.checkExtensionality()) return FC_CONTINUE;
|
|
95
|
+
if (this.branchNqs()) return FC_CONTINUE;
|
|
96
|
+
if (this.branchItos()) return FC_CONTINUE;
|
|
97
|
+
if (this.checkFixedLength(false, true)) return FC_CONTINUE;
|
|
98
|
+
if (this.solveRecfuns()) return FC_CONTINUE;
|
|
99
|
+
if (this.finalCheckRegex()) return FC_CONTINUE;
|
|
105
100
|
if (this.unhandledExpr !== undefined) return FC_GIVEUP;
|
|
106
101
|
return this.eqs.size === 0 && this.ncs.size === 0 ? FC_DONE : FC_GIVEUP;
|
|
107
102
|
}
|
|
@@ -140,8 +135,9 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
140
135
|
if (op === OP_STRING_UBVTOS || op === OP_STRING_SBVTOS)
|
|
141
136
|
throw new SmtUnsupportedError("str.from_ubv in the theory of sequences");
|
|
142
137
|
if (op === OP_SEQ_LENGTH) this.mkVar(this.ensureEnodeOf(manager.getArg(term, 0)));
|
|
143
|
-
|
|
144
|
-
|
|
138
|
+
const existing = context.getEnode(term);
|
|
139
|
+
if (existing !== undefined) {
|
|
140
|
+
this.mkVar(existing);
|
|
145
141
|
return true;
|
|
146
142
|
}
|
|
147
143
|
const isBool = manager.isBool(term);
|
|
@@ -155,10 +151,7 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
155
151
|
context.setVarTheory(context.mkBoolVar(term), this.id);
|
|
156
152
|
context.markAsRelevant(term);
|
|
157
153
|
}
|
|
158
|
-
|
|
159
|
-
? context.getEnode(term)!
|
|
160
|
-
: context.mkEnode(term, false, isBool, true);
|
|
161
|
-
this.mkVar(node);
|
|
154
|
+
this.mkVar(context.getEnode(term) ?? context.mkEnode(term, false, isBool, true));
|
|
162
155
|
if (!context.relevancy.isEnabled) this.relevantEh(term);
|
|
163
156
|
return true;
|
|
164
157
|
}
|
|
@@ -389,8 +382,7 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
389
382
|
private addLengthLimit(input: number, limit: number, isSearching: boolean) {
|
|
390
383
|
const manager = this.manager;
|
|
391
384
|
const todo = [input];
|
|
392
|
-
|
|
393
|
-
const expr = todo.pop()!;
|
|
385
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
394
386
|
if (this.isConcat(expr)) {
|
|
395
387
|
todo.push(...manager.getArgs(expr));
|
|
396
388
|
continue;
|
|
@@ -810,16 +802,16 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
810
802
|
minSeq = limit.seq;
|
|
811
803
|
}
|
|
812
804
|
}
|
|
813
|
-
if (minLimit < MAX_UNFOLDING) {
|
|
805
|
+
if (minSeq !== undefined && minLimit < MAX_UNFOLDING) {
|
|
814
806
|
this.maxUnfoldingDepth++;
|
|
815
807
|
let limit = minLimit * 2;
|
|
816
|
-
if (this.isSeq(minSeq
|
|
817
|
-
limit = Math.max(this.getMinLength(minSeq
|
|
818
|
-
const lower = this.lowerBound2(minSeq
|
|
808
|
+
if (this.isSeq(minSeq)) {
|
|
809
|
+
limit = Math.max(this.getMinLength(minSeq), limit);
|
|
810
|
+
const lower = this.lowerBound2(minSeq);
|
|
819
811
|
if (lower !== undefined && !lower.isNegative() && lower.num <= 0xffffffffn)
|
|
820
812
|
limit = Math.max(Number(lower.num), limit);
|
|
821
813
|
}
|
|
822
|
-
this.addLengthLimit(minSeq
|
|
814
|
+
this.addLengthLimit(minSeq, limit, false);
|
|
823
815
|
return true;
|
|
824
816
|
}
|
|
825
817
|
if (hasMaxUnfolding) {
|
|
@@ -860,21 +852,6 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
860
852
|
this.rep.popScope(1);
|
|
861
853
|
}
|
|
862
854
|
|
|
863
|
-
private getIteValue(input: number) {
|
|
864
|
-
const context = this.context;
|
|
865
|
-
const manager = this.manager;
|
|
866
|
-
let expr = input;
|
|
867
|
-
while (this.isOp(expr, OP_ITE) && context.isEInternalized(expr)) {
|
|
868
|
-
const root = context.getEnode(expr)!.root;
|
|
869
|
-
const thenExpr = manager.getArg(expr, 1);
|
|
870
|
-
const elseExpr = manager.getArg(expr, 2);
|
|
871
|
-
if (context.getEnode(thenExpr)!.root === root) expr = thenExpr;
|
|
872
|
-
else if (context.getEnode(elseExpr)!.root === root) expr = elseExpr;
|
|
873
|
-
else break;
|
|
874
|
-
}
|
|
875
|
-
return expr;
|
|
876
|
-
}
|
|
877
|
-
|
|
878
855
|
mkValue(node: Enode): number | DependentValue {
|
|
879
856
|
const manager = this.manager;
|
|
880
857
|
const context = this.context;
|
|
@@ -882,8 +859,8 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
882
859
|
if (!this.isSeq(expr)) return this.mkValueOf(expr);
|
|
883
860
|
const concats: number[] = [];
|
|
884
861
|
const todo = [expr];
|
|
885
|
-
|
|
886
|
-
const current = this.rep.find(this.getIteValue(this.rep.find(
|
|
862
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
863
|
+
const current = this.rep.find(this.getIteValue(this.rep.find(next)));
|
|
887
864
|
if (this.isConcat(current)) todo.push(manager.getArg(current, 1), manager.getArg(current, 0));
|
|
888
865
|
else concats.push(current);
|
|
889
866
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_theory.h, src/smt/smt_theory.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "./array";
|
|
3
|
-
import type
|
|
2
|
+
import { type AstManager, OP_ITE } from "./ast";
|
|
4
3
|
import type { Context } from "./context";
|
|
5
4
|
import type { Enode } from "./enode";
|
|
6
5
|
import { type BoolVar, FALSE_LITERAL, type Literal, negate, TRUE_LITERAL } from "./literal";
|
|
@@ -86,6 +85,21 @@ export abstract class Theory {
|
|
|
86
85
|
return node;
|
|
87
86
|
}
|
|
88
87
|
|
|
88
|
+
protected getIteValue(expr: number) {
|
|
89
|
+
const context = this.context;
|
|
90
|
+
const manager = this.manager;
|
|
91
|
+
let current = expr;
|
|
92
|
+
while (manager.getOp(current) === OP_ITE && context.isEInternalized(current)) {
|
|
93
|
+
const root = context.getEnode(current)?.root;
|
|
94
|
+
const thenExpr = manager.getArg(current, 1);
|
|
95
|
+
const elseExpr = manager.getArg(current, 2);
|
|
96
|
+
if (context.getEnode(thenExpr)?.root === root) current = thenExpr;
|
|
97
|
+
else if (context.getEnode(elseExpr)?.root === root) current = elseExpr;
|
|
98
|
+
else break;
|
|
99
|
+
}
|
|
100
|
+
return current;
|
|
101
|
+
}
|
|
102
|
+
|
|
89
103
|
abstract internalizeAtom(atom: number, isGateContext: boolean): boolean;
|
|
90
104
|
|
|
91
105
|
abstract internalizeTerm(term: number): boolean;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/tseitin_cnf_tactic.cpp, src/ast/shared_occs.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -47,8 +45,8 @@ const getSharedApps = (manager: AstManager, forms: readonly number[]) => {
|
|
|
47
45
|
return shared;
|
|
48
46
|
};
|
|
49
47
|
|
|
50
|
-
const getOrderedById = (first: number, second: number) =>
|
|
51
|
-
first > second ? [second, first] : [first, second];
|
|
48
|
+
const getOrderedById = (manager: AstManager, first: number, second: number) =>
|
|
49
|
+
manager.ids[first] > manager.ids[second] ? [second, first] : [first, second];
|
|
52
50
|
|
|
53
51
|
const getProductNext = (sizes: readonly number[], iterator: number[]) => {
|
|
54
52
|
for (let index = 0; index < sizes.length; index++) {
|
|
@@ -168,7 +166,7 @@ export const tseitinCnf = (manager: AstManager, goal: Goal) => {
|
|
|
168
166
|
if (!manager.isNot(arg)) return null;
|
|
169
167
|
const inner = manager.getArg(arg, 0);
|
|
170
168
|
if (isShared(inner) || !isOrOf(inner, 2)) return null;
|
|
171
|
-
ors.push(getOrderedById(manager.getArg(inner, 0), manager.getArg(inner, 1)));
|
|
169
|
+
ors.push(getOrderedById(manager, manager.getArg(inner, 0), manager.getArg(inner, 1)));
|
|
172
170
|
}
|
|
173
171
|
const [[a1, a2], [b1, b2], [c1, c2]] = ors;
|
|
174
172
|
if (
|