tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +3 -6
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +1 -4
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +2 -3
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast.h, src/ast/ast.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { FlatLiterals } from "./flat-literals";
|
|
4
3
|
import { astArrayHash, bytesHash, combineHash, getCompositeHash, mkMix, stringHash } from "./hash";
|
|
@@ -299,7 +298,6 @@ export const OP_INTERNAL_STRING_STRIDOF = SEQ_OP_BASE + 64;
|
|
|
299
298
|
export const OP_INTERNAL_STRING_POWER = SEQ_OP_BASE + 65;
|
|
300
299
|
export const OP_INTERNAL_REGEXP_EMPTY = SEQ_OP_BASE + 66;
|
|
301
300
|
export const OP_INTERNAL_REGEXP_FULL_CHAR = SEQ_OP_BASE + 67;
|
|
302
|
-
export const OP_RE_IS_NULLABLE = SEQ_OP_BASE + 68;
|
|
303
301
|
export const OP_SEQ_SKOLEM = SEQ_OP_BASE + 69;
|
|
304
302
|
const CHAR_OP_BASE = 600;
|
|
305
303
|
export const OP_CHAR_CONST = CHAR_OP_BASE;
|
|
@@ -841,28 +839,19 @@ export class AstManager {
|
|
|
841
839
|
domain: number[],
|
|
842
840
|
range: number,
|
|
843
841
|
) {
|
|
844
|
-
|
|
845
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
842
|
+
return this.addDecl(
|
|
846
843
|
name,
|
|
844
|
+
FAMILY_RECFUN,
|
|
845
|
+
op,
|
|
847
846
|
domain,
|
|
848
847
|
range,
|
|
848
|
+
parameters,
|
|
849
849
|
getInfoHash(
|
|
850
850
|
Z3_RECFUN_FAMILY,
|
|
851
851
|
op - RECFUN_OP_BASE,
|
|
852
852
|
op === OP_FUN_CASE_PRED ? [parameters[0], this.declHashes[parameters[1]]] : parameters,
|
|
853
853
|
),
|
|
854
854
|
);
|
|
855
|
-
this.funcDecls.push({
|
|
856
|
-
name,
|
|
857
|
-
family: FAMILY_RECFUN,
|
|
858
|
-
op,
|
|
859
|
-
domain,
|
|
860
|
-
range,
|
|
861
|
-
isSkolem: false,
|
|
862
|
-
smallId: this.mkSmallId(),
|
|
863
|
-
parameters,
|
|
864
|
-
});
|
|
865
|
-
return decl;
|
|
866
855
|
}
|
|
867
856
|
|
|
868
857
|
private getSignature(expr: number) {
|
|
@@ -1112,35 +1101,33 @@ export class AstManager {
|
|
|
1112
1101
|
}
|
|
1113
1102
|
|
|
1114
1103
|
mkSort(name: SmtSymbol) {
|
|
1115
|
-
this.
|
|
1104
|
+
const sort = this.addSort(
|
|
1105
|
+
getSymbolName(name),
|
|
1106
|
+
FAMILY_USER,
|
|
1107
|
+
[],
|
|
1116
1108
|
combineHash(
|
|
1117
1109
|
getSymbolHash(name),
|
|
1118
1110
|
getInfoHash(Z3_USER_SORT_FAMILY, this.getUserSortKind(name), []),
|
|
1119
1111
|
),
|
|
1120
1112
|
);
|
|
1121
|
-
this.sortNames.push(getSymbolName(name));
|
|
1122
|
-
this.sortFamilies.push(FAMILY_USER);
|
|
1123
|
-
this.sortWidths.push(0);
|
|
1124
|
-
this.sortSbits.push(0);
|
|
1125
|
-
this.sortParameters.push([]);
|
|
1126
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1127
1113
|
this.mkSmallId();
|
|
1128
|
-
return
|
|
1114
|
+
return sort;
|
|
1129
1115
|
}
|
|
1130
1116
|
|
|
1131
1117
|
mkBvSort(width: number) {
|
|
1132
1118
|
const existing = this.bvSorts.get(width);
|
|
1133
1119
|
if (existing !== undefined) return existing;
|
|
1134
|
-
this.
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1120
|
+
const sort = this.addSort(
|
|
1121
|
+
"bv",
|
|
1122
|
+
FAMILY_BV,
|
|
1123
|
+
[],
|
|
1124
|
+
combineHash(getSymbolHash("bv"), getInfoHash(Z3_BV_FAMILY, 0, [width])),
|
|
1125
|
+
width,
|
|
1126
|
+
0,
|
|
1127
|
+
width < 64 ? 1n << BigInt(width) : SORT_SIZE_VERY_BIG,
|
|
1128
|
+
);
|
|
1141
1129
|
// bv_decl_plugin makes the sorts up to 64 bits when Z3 starts.
|
|
1142
1130
|
if (width > 64) this.mkSmallId();
|
|
1143
|
-
const sort = this.sortNames.length - 1;
|
|
1144
1131
|
this.bvSorts.set(width, sort);
|
|
1145
1132
|
return sort;
|
|
1146
1133
|
}
|
|
@@ -1149,40 +1136,35 @@ export class AstManager {
|
|
|
1149
1136
|
const key = `${ebits}:${sbits}`;
|
|
1150
1137
|
const existing = this.fpSorts.get(key);
|
|
1151
1138
|
if (existing !== undefined) return existing;
|
|
1152
|
-
this.
|
|
1139
|
+
const sort = this.addSort(
|
|
1140
|
+
"FloatingPoint",
|
|
1141
|
+
FAMILY_FPA,
|
|
1142
|
+
[],
|
|
1153
1143
|
combineHash(
|
|
1154
1144
|
getSymbolHash("FloatingPoint"),
|
|
1155
1145
|
getInfoHash(Z3_FPA_FAMILY, Z3_FLOATING_POINT_SORT, [ebits, sbits]),
|
|
1156
1146
|
),
|
|
1147
|
+
ebits,
|
|
1148
|
+
sbits,
|
|
1149
|
+
SORT_SIZE_VERY_BIG,
|
|
1157
1150
|
);
|
|
1158
|
-
this.sortNames.push("FloatingPoint");
|
|
1159
|
-
this.sortFamilies.push(FAMILY_FPA);
|
|
1160
|
-
this.sortWidths.push(ebits);
|
|
1161
|
-
this.sortSbits.push(sbits);
|
|
1162
|
-
this.sortParameters.push([]);
|
|
1163
|
-
this.sortSizes.push(SORT_SIZE_VERY_BIG);
|
|
1164
1151
|
this.mkSmallId();
|
|
1165
|
-
const sort = this.sortNames.length - 1;
|
|
1166
1152
|
this.fpSorts.set(key, sort);
|
|
1167
1153
|
return sort;
|
|
1168
1154
|
}
|
|
1169
1155
|
|
|
1170
1156
|
mkRmSort() {
|
|
1171
1157
|
if (this.rmSort !== -1) return this.rmSort;
|
|
1172
|
-
this.
|
|
1158
|
+
this.rmSort = this.addSort(
|
|
1159
|
+
"RoundingMode",
|
|
1160
|
+
FAMILY_FPA,
|
|
1161
|
+
[],
|
|
1173
1162
|
combineHash(
|
|
1174
1163
|
getSymbolHash("RoundingMode"),
|
|
1175
1164
|
getInfoHash(Z3_FPA_FAMILY, Z3_ROUNDING_MODE_SORT, []),
|
|
1176
1165
|
),
|
|
1177
1166
|
);
|
|
1178
|
-
this.sortNames.push("RoundingMode");
|
|
1179
|
-
this.sortFamilies.push(FAMILY_FPA);
|
|
1180
|
-
this.sortWidths.push(0);
|
|
1181
|
-
this.sortSbits.push(0);
|
|
1182
|
-
this.sortParameters.push([]);
|
|
1183
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1184
1167
|
this.mkSmallId();
|
|
1185
|
-
this.rmSort = this.sortNames.length - 1;
|
|
1186
1168
|
return this.rmSort;
|
|
1187
1169
|
}
|
|
1188
1170
|
|
|
@@ -1202,27 +1184,44 @@ export class AstManager {
|
|
|
1202
1184
|
return this.sortSbits[sort];
|
|
1203
1185
|
}
|
|
1204
1186
|
|
|
1205
|
-
|
|
1206
|
-
|
|
1207
|
-
|
|
1208
|
-
|
|
1187
|
+
private addDecl(
|
|
1188
|
+
name: SmtSymbol,
|
|
1189
|
+
family: number,
|
|
1190
|
+
op: number,
|
|
1191
|
+
domain: number[],
|
|
1192
|
+
range: number,
|
|
1193
|
+
parameters: number[],
|
|
1194
|
+
infoHash: number,
|
|
1195
|
+
hasSmallId = true,
|
|
1196
|
+
) {
|
|
1209
1197
|
const decl = this.funcDecls.length;
|
|
1210
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1211
|
-
name,
|
|
1212
|
-
domain,
|
|
1213
|
-
range,
|
|
1214
|
-
getInfoHash(Z3_FPA_FAMILY, op - FPA_OP_BASE, parameters),
|
|
1215
|
-
);
|
|
1198
|
+
this.declHashes[decl] = this.getFuncDeclHash(name, domain, range, infoHash);
|
|
1216
1199
|
this.funcDecls.push({
|
|
1217
1200
|
name,
|
|
1218
|
-
family
|
|
1201
|
+
family,
|
|
1219
1202
|
op,
|
|
1220
1203
|
domain,
|
|
1221
1204
|
range,
|
|
1222
1205
|
isSkolem: false,
|
|
1223
|
-
smallId: this.mkSmallId(),
|
|
1206
|
+
smallId: hasSmallId ? this.mkSmallId() : -1,
|
|
1224
1207
|
parameters,
|
|
1225
1208
|
});
|
|
1209
|
+
return decl;
|
|
1210
|
+
}
|
|
1211
|
+
|
|
1212
|
+
mkFpaDecl(op: number, name: string, parameters: number[], domain: number[], range: number) {
|
|
1213
|
+
const key = `${op}:${name}:${parameters.join(",")}:${domain.join(",")}:${range}`;
|
|
1214
|
+
const existing = this.fpaDecls.get(key);
|
|
1215
|
+
if (existing !== undefined) return existing;
|
|
1216
|
+
const decl = this.addDecl(
|
|
1217
|
+
name,
|
|
1218
|
+
FAMILY_FPA,
|
|
1219
|
+
op,
|
|
1220
|
+
domain,
|
|
1221
|
+
range,
|
|
1222
|
+
parameters,
|
|
1223
|
+
getInfoHash(Z3_FPA_FAMILY, op - FPA_OP_BASE, parameters),
|
|
1224
|
+
);
|
|
1226
1225
|
this.fpaDecls.set(key, decl);
|
|
1227
1226
|
return decl;
|
|
1228
1227
|
}
|
|
@@ -1232,12 +1231,13 @@ export class AstManager {
|
|
|
1232
1231
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1233
1232
|
const existing = this.pbDecls.get(key);
|
|
1234
1233
|
if (existing !== undefined) return existing;
|
|
1235
|
-
const decl = this.
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1234
|
+
const decl = this.addDecl(
|
|
1235
|
+
PB_OP_NAMES[op - PB_OP_BASE],
|
|
1236
|
+
FAMILY_PB,
|
|
1237
|
+
op,
|
|
1239
1238
|
domain,
|
|
1240
1239
|
SORT_BOOL,
|
|
1240
|
+
[],
|
|
1241
1241
|
getInfoHash(
|
|
1242
1242
|
Z3_PB_FAMILY,
|
|
1243
1243
|
op - PB_OP_BASE,
|
|
@@ -1248,16 +1248,6 @@ export class AstManager {
|
|
|
1248
1248
|
),
|
|
1249
1249
|
),
|
|
1250
1250
|
);
|
|
1251
|
-
this.funcDecls.push({
|
|
1252
|
-
name,
|
|
1253
|
-
family: FAMILY_PB,
|
|
1254
|
-
op,
|
|
1255
|
-
domain,
|
|
1256
|
-
range: SORT_BOOL,
|
|
1257
|
-
isSkolem: false,
|
|
1258
|
-
smallId: this.mkSmallId(),
|
|
1259
|
-
parameters: [],
|
|
1260
|
-
});
|
|
1261
1251
|
this.pbParameters.set(decl, parameters);
|
|
1262
1252
|
this.pbDecls.set(key, decl);
|
|
1263
1253
|
return decl;
|
|
@@ -1280,14 +1270,22 @@ export class AstManager {
|
|
|
1280
1270
|
return this.fpValues[id];
|
|
1281
1271
|
}
|
|
1282
1272
|
|
|
1283
|
-
private addSort(
|
|
1273
|
+
private addSort(
|
|
1274
|
+
name: string,
|
|
1275
|
+
family: number,
|
|
1276
|
+
parameters: number[],
|
|
1277
|
+
hash: number,
|
|
1278
|
+
width = 0,
|
|
1279
|
+
sbits = 0,
|
|
1280
|
+
size = SORT_SIZE_INFINITE,
|
|
1281
|
+
) {
|
|
1284
1282
|
this.sortHashes.push(hash);
|
|
1285
1283
|
this.sortNames.push(name);
|
|
1286
1284
|
this.sortFamilies.push(family);
|
|
1287
|
-
this.sortWidths.push(
|
|
1288
|
-
this.sortSbits.push(
|
|
1285
|
+
this.sortWidths.push(width);
|
|
1286
|
+
this.sortSbits.push(sbits);
|
|
1289
1287
|
this.sortParameters.push(parameters);
|
|
1290
|
-
this.sortSizes.push(
|
|
1288
|
+
this.sortSizes.push(size);
|
|
1291
1289
|
return this.sortNames.length - 1;
|
|
1292
1290
|
}
|
|
1293
1291
|
|
|
@@ -1394,27 +1392,19 @@ export class AstManager {
|
|
|
1394
1392
|
const existing = this.seqDecls.get(key);
|
|
1395
1393
|
if (existing !== undefined) return existing;
|
|
1396
1394
|
const isChar = op >= CHAR_OP_BASE;
|
|
1397
|
-
const decl = this.
|
|
1398
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1395
|
+
const decl = this.addDecl(
|
|
1399
1396
|
name,
|
|
1397
|
+
isChar ? FAMILY_CHAR : FAMILY_SEQ,
|
|
1398
|
+
op,
|
|
1400
1399
|
domain,
|
|
1401
1400
|
range,
|
|
1401
|
+
parameters,
|
|
1402
1402
|
getInfoHash(
|
|
1403
1403
|
isChar ? Z3_CHAR_FAMILY : Z3_SEQ_FAMILY,
|
|
1404
1404
|
op - (isChar ? CHAR_OP_BASE : SEQ_OP_BASE),
|
|
1405
1405
|
parameterHashes,
|
|
1406
1406
|
),
|
|
1407
1407
|
);
|
|
1408
|
-
this.funcDecls.push({
|
|
1409
|
-
name,
|
|
1410
|
-
family: isChar ? FAMILY_CHAR : FAMILY_SEQ,
|
|
1411
|
-
op,
|
|
1412
|
-
domain,
|
|
1413
|
-
range,
|
|
1414
|
-
isSkolem: false,
|
|
1415
|
-
smallId: this.mkSmallId(),
|
|
1416
|
-
parameters,
|
|
1417
|
-
});
|
|
1418
1408
|
this.seqDecls.set(key, decl);
|
|
1419
1409
|
return decl;
|
|
1420
1410
|
}
|
|
@@ -1468,7 +1458,10 @@ export class AstManager {
|
|
|
1468
1458
|
const key = parameters.join(",");
|
|
1469
1459
|
const existing = this.arraySorts.get(key);
|
|
1470
1460
|
if (existing !== undefined) return existing;
|
|
1471
|
-
this.
|
|
1461
|
+
const sort = this.addSort(
|
|
1462
|
+
"Array",
|
|
1463
|
+
FAMILY_ARRAY,
|
|
1464
|
+
parameters,
|
|
1472
1465
|
combineHash(
|
|
1473
1466
|
getSymbolHash("Array"),
|
|
1474
1467
|
getInfoHash(
|
|
@@ -1477,15 +1470,11 @@ export class AstManager {
|
|
|
1477
1470
|
parameters.map((parameter) => this.sortHashes[parameter]),
|
|
1478
1471
|
),
|
|
1479
1472
|
),
|
|
1473
|
+
0,
|
|
1474
|
+
0,
|
|
1475
|
+
this.getArraySortSize(parameters),
|
|
1480
1476
|
);
|
|
1481
|
-
this.sortNames.push("Array");
|
|
1482
|
-
this.sortFamilies.push(FAMILY_ARRAY);
|
|
1483
|
-
this.sortWidths.push(0);
|
|
1484
|
-
this.sortSbits.push(0);
|
|
1485
|
-
this.sortParameters.push(parameters);
|
|
1486
|
-
this.sortSizes.push(this.getArraySortSize(parameters));
|
|
1487
1477
|
this.mkSmallId();
|
|
1488
|
-
const sort = this.sortNames.length - 1;
|
|
1489
1478
|
this.arraySorts.set(key, sort);
|
|
1490
1479
|
return sort;
|
|
1491
1480
|
}
|
|
@@ -1535,7 +1524,6 @@ export class AstManager {
|
|
|
1535
1524
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1536
1525
|
const existing = this.arrayDecls.get(key);
|
|
1537
1526
|
if (existing !== undefined) return existing;
|
|
1538
|
-
const decl = this.funcDecls.length;
|
|
1539
1527
|
const parameterHashes = parameters.map((parameter) =>
|
|
1540
1528
|
op === OP_CONST_ARRAY
|
|
1541
1529
|
? this.sortHashes[parameter]
|
|
@@ -1544,22 +1532,15 @@ export class AstManager {
|
|
|
1544
1532
|
(this.getDeclHash(parameter) ?? 0)
|
|
1545
1533
|
: parameter,
|
|
1546
1534
|
);
|
|
1547
|
-
|
|
1548
|
-
name,
|
|
1549
|
-
domain,
|
|
1550
|
-
range,
|
|
1551
|
-
getInfoHash(Z3_ARRAY_FAMILY, op - ARRAY_OP_BASE, parameterHashes),
|
|
1552
|
-
);
|
|
1553
|
-
this.funcDecls.push({
|
|
1535
|
+
const decl = this.addDecl(
|
|
1554
1536
|
name,
|
|
1555
|
-
|
|
1537
|
+
FAMILY_ARRAY,
|
|
1556
1538
|
op,
|
|
1557
1539
|
domain,
|
|
1558
1540
|
range,
|
|
1559
|
-
isSkolem: false,
|
|
1560
|
-
smallId: this.mkSmallId(),
|
|
1561
1541
|
parameters,
|
|
1562
|
-
|
|
1542
|
+
getInfoHash(Z3_ARRAY_FAMILY, op - ARRAY_OP_BASE, parameterHashes),
|
|
1543
|
+
);
|
|
1563
1544
|
this.arrayDecls.set(key, decl);
|
|
1564
1545
|
return decl;
|
|
1565
1546
|
}
|
|
@@ -1573,14 +1554,12 @@ export class AstManager {
|
|
|
1573
1554
|
const key = `${family}:${typeof name}:${name}:${parameters.join(",")}`;
|
|
1574
1555
|
const existing = this.parametricSorts.get(key);
|
|
1575
1556
|
if (existing !== undefined) return existing;
|
|
1576
|
-
this.
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
this.sortSizes.push(SORT_SIZE_INFINITE);
|
|
1583
|
-
const sort = this.sortNames.length - 1;
|
|
1557
|
+
const sort = this.addSort(
|
|
1558
|
+
getSymbolName(name),
|
|
1559
|
+
family,
|
|
1560
|
+
parameters,
|
|
1561
|
+
combineHash(getSymbolHash(name), infoHash),
|
|
1562
|
+
);
|
|
1584
1563
|
this.sortSmallIds[sort] = this.mkSmallId();
|
|
1585
1564
|
this.parametricSorts.set(key, sort);
|
|
1586
1565
|
return sort;
|
|
@@ -1653,23 +1632,15 @@ export class AstManager {
|
|
|
1653
1632
|
const key = `${op}:${name}:${parameters.join(",")}:${domain.join(",")}:${range}`;
|
|
1654
1633
|
const existing = this.datatypeDecls.get(key);
|
|
1655
1634
|
if (existing !== undefined) return existing;
|
|
1656
|
-
const decl = this.
|
|
1657
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1658
|
-
name,
|
|
1659
|
-
domain,
|
|
1660
|
-
range,
|
|
1661
|
-
getInfoHash(Z3_DATATYPE_FAMILY, op - DATATYPE_OP_BASE, parameterHashes),
|
|
1662
|
-
);
|
|
1663
|
-
this.funcDecls.push({
|
|
1635
|
+
const decl = this.addDecl(
|
|
1664
1636
|
name,
|
|
1665
|
-
|
|
1637
|
+
FAMILY_DATATYPE,
|
|
1666
1638
|
op,
|
|
1667
1639
|
domain,
|
|
1668
1640
|
range,
|
|
1669
|
-
isSkolem: false,
|
|
1670
|
-
smallId: this.mkSmallId(),
|
|
1671
1641
|
parameters,
|
|
1672
|
-
|
|
1642
|
+
getInfoHash(Z3_DATATYPE_FAMILY, op - DATATYPE_OP_BASE, parameterHashes),
|
|
1643
|
+
);
|
|
1673
1644
|
this.datatypeDecls.set(key, decl);
|
|
1674
1645
|
return decl;
|
|
1675
1646
|
}
|
|
@@ -1686,23 +1657,16 @@ export class AstManager {
|
|
|
1686
1657
|
const key = `${op}:${parameters.join(",")}:${domain.join(",")}`;
|
|
1687
1658
|
const existing = this.bvDecls.get(key);
|
|
1688
1659
|
if (existing !== undefined) return existing;
|
|
1689
|
-
const decl = this.
|
|
1690
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
1691
|
-
name,
|
|
1692
|
-
domain,
|
|
1693
|
-
range,
|
|
1694
|
-
getInfoHash(Z3_BV_FAMILY, op - BV_OP_BASE, parameters),
|
|
1695
|
-
);
|
|
1696
|
-
this.funcDecls.push({
|
|
1660
|
+
const decl = this.addDecl(
|
|
1697
1661
|
name,
|
|
1698
|
-
|
|
1662
|
+
FAMILY_BV,
|
|
1699
1663
|
op,
|
|
1700
1664
|
domain,
|
|
1701
1665
|
range,
|
|
1702
|
-
isSkolem: false,
|
|
1703
|
-
smallId: UNCACHED_BV_OPS.has(op) ? -1 : this.mkSmallId(),
|
|
1704
1666
|
parameters,
|
|
1705
|
-
|
|
1667
|
+
getInfoHash(Z3_BV_FAMILY, op - BV_OP_BASE, parameters),
|
|
1668
|
+
!UNCACHED_BV_OPS.has(op),
|
|
1669
|
+
);
|
|
1706
1670
|
this.bvDecls.set(key, decl);
|
|
1707
1671
|
return decl;
|
|
1708
1672
|
}
|
|
@@ -1767,7 +1731,7 @@ export class AstManager {
|
|
|
1767
1731
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1768
1732
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1769
1733
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1770
|
-
const domain = Array.from({ length: arity }, (
|
|
1734
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1771
1735
|
op === OP_PATTERN
|
|
1772
1736
|
? this.sorts[args[index]]
|
|
1773
1737
|
: op === OP_ITE && index === 0
|
|
@@ -2086,7 +2050,7 @@ export class AstManager {
|
|
|
2086
2050
|
}
|
|
2087
2051
|
|
|
2088
2052
|
get am() {
|
|
2089
|
-
this.algebraicManager ??= new AlgebraicManager();
|
|
2053
|
+
this.algebraicManager ??= new AlgebraicManager(this.limit);
|
|
2090
2054
|
return this.algebraicManager;
|
|
2091
2055
|
}
|
|
2092
2056
|
|
|
@@ -2207,7 +2171,7 @@ export class AstManager {
|
|
|
2207
2171
|
const noPatterns = data.patterns.length > 0 ? [] : data.noPatterns;
|
|
2208
2172
|
const key = `q${data.kind}:${data.sorts.join(",")}:${JSON.stringify(data.names)}:${
|
|
2209
2173
|
data.body
|
|
2210
|
-
}:${data.patterns.join(",")}:${noPatterns.join(",")}:${data.weight}`;
|
|
2174
|
+
}:${data.patterns.join(",")}:${noPatterns.join(",")}:${data.weight}:${data.qid}`;
|
|
2211
2175
|
const existing = this.table.get(key);
|
|
2212
2176
|
if (existing !== undefined) {
|
|
2213
2177
|
// A dead quantifier comes back as the new one Z3 makes, with its skolem id.
|
|
@@ -2270,27 +2234,19 @@ export class AstManager {
|
|
|
2270
2234
|
const name = op === OP_LABEL_LIT ? "lbl-lit" : isPositive ? "lblpos" : "lblneg";
|
|
2271
2235
|
const domain = op === OP_LABEL ? [SORT_BOOL] : [];
|
|
2272
2236
|
const parameterHashes = names.map(getSymbolHash);
|
|
2273
|
-
const decl = this.
|
|
2274
|
-
this.declHashes[decl] = this.getFuncDeclHash(
|
|
2237
|
+
const decl = this.addDecl(
|
|
2275
2238
|
name,
|
|
2239
|
+
FAMILY_LABEL,
|
|
2240
|
+
op,
|
|
2276
2241
|
domain,
|
|
2277
2242
|
SORT_BOOL,
|
|
2243
|
+
parameters,
|
|
2278
2244
|
getInfoHash(
|
|
2279
2245
|
Z3_LABEL_FAMILY,
|
|
2280
2246
|
op - LABEL_OP_BASE,
|
|
2281
2247
|
op === OP_LABEL ? [isPositive ? 1 : 0, ...parameterHashes] : parameterHashes,
|
|
2282
2248
|
),
|
|
2283
2249
|
);
|
|
2284
|
-
this.funcDecls.push({
|
|
2285
|
-
name,
|
|
2286
|
-
family: FAMILY_LABEL,
|
|
2287
|
-
op,
|
|
2288
|
-
domain,
|
|
2289
|
-
range: SORT_BOOL,
|
|
2290
|
-
isSkolem: false,
|
|
2291
|
-
smallId: this.mkSmallId(),
|
|
2292
|
-
parameters,
|
|
2293
|
-
});
|
|
2294
2250
|
this.labelDecls.set(key, decl);
|
|
2295
2251
|
return decl;
|
|
2296
2252
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp,
|
|
2
|
-
// src/tactic/bv/bit_blaster_tactic.cpp, src/tactic/bv/bit_blaster_model_converter.cpp), MIT
|
|
3
|
-
// license, see z3-license.txt.
|
|
4
1
|
import { SmtTacticError } from "../../../errors";
|
|
5
2
|
import {
|
|
6
3
|
type AstManager,
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h,
|
|
2
|
-
// src/ast/rewriter/bit_blaster/bit_blaster.cpp,
|
|
3
|
-
// src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import { SmtCanceledError } from "../../../errors";
|
|
5
2
|
import { OP_EQ, SORT_BOOL, type AstManager } from "./ast";
|
|
6
3
|
import { TACTIC_ARITH_OPTIONS } from "./arith-rewriter";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/simplifiers/bound_manager.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
OP_EQ,
|
|
@@ -10,6 +9,7 @@ import {
|
|
|
10
9
|
OP_OR,
|
|
11
10
|
OP_UMINUS,
|
|
12
11
|
} from "./ast";
|
|
12
|
+
import type { Dependency } from "./goal";
|
|
13
13
|
import { Rational } from "./rational";
|
|
14
14
|
|
|
15
15
|
interface Limit {
|
|
@@ -34,6 +34,8 @@ const NEGATED = new Map([
|
|
|
34
34
|
export class BoundManager {
|
|
35
35
|
readonly lowers = new Map<number, Limit>();
|
|
36
36
|
readonly uppers = new Map<number, Limit>();
|
|
37
|
+
readonly lowerDependencies = new Map<number, Dependency>();
|
|
38
|
+
readonly upperDependencies = new Map<number, Dependency>();
|
|
37
39
|
readonly boundedVars: number[] = [];
|
|
38
40
|
|
|
39
41
|
constructor(readonly manager: AstManager) {}
|
|
@@ -48,9 +50,9 @@ export class BoundManager {
|
|
|
48
50
|
return { value: manager.getRationalValue(expr), isInt: manager.isInt(expr) };
|
|
49
51
|
}
|
|
50
52
|
|
|
51
|
-
add(form: number) {
|
|
53
|
+
add(form: number, dependency?: Dependency) {
|
|
52
54
|
const manager = this.manager;
|
|
53
|
-
if (this.isDisjunctiveBound(form) || this.isEqualityBound(form)) return;
|
|
55
|
+
if (this.isDisjunctiveBound(form, dependency) || this.isEqualityBound(form, dependency)) return;
|
|
54
56
|
let atom = form;
|
|
55
57
|
let isPositive = true;
|
|
56
58
|
while (manager.isNot(atom)) {
|
|
@@ -79,35 +81,43 @@ export class BoundManager {
|
|
|
79
81
|
: { value: found.numeral.value, op };
|
|
80
82
|
const isStrict = normalized.op === OP_LT || normalized.op === OP_GT;
|
|
81
83
|
if (normalized.op === OP_GT || normalized.op === OP_GE)
|
|
82
|
-
this.insertLower(found.variable, isStrict, normalized.value);
|
|
83
|
-
else this.insertUpper(found.variable, isStrict, normalized.value);
|
|
84
|
+
this.insertLower(found.variable, isStrict, normalized.value, dependency);
|
|
85
|
+
else this.insertUpper(found.variable, isStrict, normalized.value, dependency);
|
|
84
86
|
}
|
|
85
87
|
|
|
86
|
-
private insertUpper(
|
|
88
|
+
private insertUpper(
|
|
89
|
+
variable: number,
|
|
90
|
+
isStrict: boolean,
|
|
91
|
+
value: Rational,
|
|
92
|
+
dependency: Dependency | undefined,
|
|
93
|
+
) {
|
|
87
94
|
const old = this.uppers.get(variable);
|
|
88
|
-
if (old
|
|
89
|
-
|
|
90
|
-
if (!
|
|
91
|
-
return;
|
|
95
|
+
if (old !== undefined) {
|
|
96
|
+
const order = value.compare(old.value);
|
|
97
|
+
if (order > 0 || (order === 0 && (!isStrict || old.isStrict))) return;
|
|
92
98
|
}
|
|
93
|
-
|
|
94
|
-
if (
|
|
95
|
-
|
|
99
|
+
this.uppers.set(variable, { value, isStrict });
|
|
100
|
+
if (dependency !== undefined) this.upperDependencies.set(variable, dependency);
|
|
101
|
+
if (old === undefined && !this.lowers.has(variable)) this.boundedVars.push(variable);
|
|
96
102
|
}
|
|
97
103
|
|
|
98
|
-
private insertLower(
|
|
104
|
+
private insertLower(
|
|
105
|
+
variable: number,
|
|
106
|
+
isStrict: boolean,
|
|
107
|
+
value: Rational,
|
|
108
|
+
dependency: Dependency | undefined,
|
|
109
|
+
) {
|
|
99
110
|
const old = this.lowers.get(variable);
|
|
100
|
-
if (old
|
|
101
|
-
|
|
102
|
-
if (!
|
|
103
|
-
return;
|
|
111
|
+
if (old !== undefined) {
|
|
112
|
+
const order = value.compare(old.value);
|
|
113
|
+
if (order < 0 || (order === 0 && (!isStrict || old.isStrict))) return;
|
|
104
114
|
}
|
|
105
|
-
|
|
106
|
-
if (
|
|
107
|
-
|
|
115
|
+
this.lowers.set(variable, { value, isStrict });
|
|
116
|
+
if (dependency !== undefined) this.lowerDependencies.set(variable, dependency);
|
|
117
|
+
if (old === undefined && !this.uppers.has(variable)) this.boundedVars.push(variable);
|
|
108
118
|
}
|
|
109
119
|
|
|
110
|
-
private isEqualityBound(form: number) {
|
|
120
|
+
private isEqualityBound(form: number, dependency: Dependency | undefined) {
|
|
111
121
|
const manager = this.manager;
|
|
112
122
|
if (manager.getOp(form) !== OP_EQ) return false;
|
|
113
123
|
const first = manager.getArg(form, 0);
|
|
@@ -117,19 +127,19 @@ export class BoundManager {
|
|
|
117
127
|
const other = isSwapped ? first : second;
|
|
118
128
|
const numeral = this.getNumeral(other);
|
|
119
129
|
if (manager.isUninterpretedConst(variable) && numeral !== undefined) {
|
|
120
|
-
this.insertLower(variable, false, numeral.value);
|
|
121
|
-
this.insertUpper(variable, false, numeral.value);
|
|
130
|
+
this.insertLower(variable, false, numeral.value, dependency);
|
|
131
|
+
this.insertUpper(variable, false, numeral.value, dependency);
|
|
122
132
|
return true;
|
|
123
133
|
}
|
|
124
134
|
if (manager.getOp(other) !== OP_MOD) return false;
|
|
125
135
|
const modulus = this.getNumeral(manager.getArg(other, 1));
|
|
126
136
|
if (modulus === undefined || !modulus.value.isPositive()) return false;
|
|
127
|
-
this.insertLower(variable, false, Rational.zero);
|
|
128
|
-
this.insertUpper(variable, false, modulus.value.sub(Rational.one));
|
|
137
|
+
this.insertLower(variable, false, Rational.zero, dependency);
|
|
138
|
+
this.insertUpper(variable, false, modulus.value.sub(Rational.one), dependency);
|
|
129
139
|
return true;
|
|
130
140
|
}
|
|
131
141
|
|
|
132
|
-
private isDisjunctiveBound(form: number) {
|
|
142
|
+
private isDisjunctiveBound(form: number, dependency: Dependency | undefined) {
|
|
133
143
|
const manager = this.manager;
|
|
134
144
|
if (manager.getOp(form) !== OP_OR || manager.getNumArgs(form) === 0) return false;
|
|
135
145
|
let variable = -1;
|
|
@@ -160,8 +170,8 @@ export class BoundManager {
|
|
|
160
170
|
if (found.value.compare(lower) < 0) lower = found.value;
|
|
161
171
|
if (found.value.compare(upper) > 0) upper = found.value;
|
|
162
172
|
}
|
|
163
|
-
this.insertLower(variable, false, lower);
|
|
164
|
-
this.insertUpper(variable, false, upper);
|
|
173
|
+
this.insertLower(variable, false, lower, dependency);
|
|
174
|
+
this.insertUpper(variable, false, upper, dependency);
|
|
165
175
|
return true;
|
|
166
176
|
}
|
|
167
177
|
|