tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d166e0ae9
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 +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +14 -4
- package/dist/index.d.ts +14 -4
- 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 +69 -69
- package/dist/prove.js +79 -79
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +46 -44
- package/dist/transfer.js +42 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -78
- package/src/check.ts +474 -209
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +5 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +29 -9
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +96 -37
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +152 -55
- package/src/exit-codes.ts +29 -13
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +172 -83
- package/src/liveness.ts +52 -11
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +0 -2
- 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 +1 -1
- 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/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/source.ts +2 -0
- 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 +5 -0
- package/src/parser.ts +115 -145
- package/src/pretty-print.ts +1 -1
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +4 -8
- package/src/prover/isabelle/isar/context.ts +0 -4
- package/src/prover/isabelle/isar/induct.ts +0 -4
- package/src/prover/isabelle/isar/method.ts +0 -2
- package/src/prover/isabelle/isar/proof.ts +0 -2
- package/src/prover/isabelle/isar/rule-cases.ts +8 -8
- package/src/prover/isabelle/isar/toplevel.ts +0 -4
- 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 +0 -2
- 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/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -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 +0 -1
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +11 -4
- 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 +12 -3
- package/src/prover/smt/solver/asserted-formulas.ts +169 -59
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +0 -2
- package/src/prover/smt/solver/ast.ts +63 -15
- package/src/prover/smt/solver/auf-solver.ts +23 -13
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -3
- 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 +0 -1
- package/src/prover/smt/solver/bound-simplifier.ts +11 -15
- package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
- 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 +1 -3
- package/src/prover/smt/solver/bv1-blast.ts +0 -2
- 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 +35 -20
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +0 -2
- package/src/prover/smt/solver/check-logic.ts +0 -1
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -26
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +67 -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 +15 -8
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +0 -3
- package/src/prover/smt/solver/dependent-expr-state.ts +26 -18
- 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 +0 -1
- package/src/prover/smt/solver/dom-simplify.ts +0 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -22
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +0 -1
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- 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 +5 -10
- package/src/prover/smt/solver/enode.ts +0 -1
- 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 +1 -3
- 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 +0 -2
- package/src/prover/smt/solver/euf/egraph.ts +4 -12
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -5
- package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -7
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -4
- package/src/prover/smt/solver/euf/q-mbi.ts +0 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +0 -3
- package/src/prover/smt/solver/euf/q-solver.ts +0 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +36 -15
- package/src/prover/smt/solver/fd-solver.ts +148 -42
- 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 +0 -1
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -3
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- 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 +1 -2
- 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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -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 +0 -1
- 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 +0 -2
- 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 +0 -3
- package/src/prover/smt/solver/mam-compiler.ts +1 -2
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +0 -2
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +3 -3
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +0 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +0 -1
- 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 +1 -2
- package/src/prover/smt/solver/model-evaluator.ts +2 -1
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +85 -44
- package/src/prover/smt/solver/model-macro-solver.ts +0 -1
- 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 +22 -46
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -3
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -4
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -11
- package/src/prover/smt/solver/muz/hnf.ts +2 -3
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -3
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -4
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -5
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +0 -1
- 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 +1 -1
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -3
- package/src/prover/smt/solver/muz/spacer-util.ts +0 -1
- package/src/prover/smt/solver/muz/substitution.ts +0 -2
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +3 -3
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -94
- 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 +375 -218
- 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 +77 -75
- 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 +22 -9
- package/src/prover/smt/solver/opt-nlsat.ts +29 -19
- package/src/prover/smt/solver/opt-pareto.ts +19 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +10 -7
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +1 -3
- package/src/prover/smt/solver/parallel-tactic.ts +1 -3
- package/src/prover/smt/solver/pattern-inference.ts +0 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -7
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +75 -19
- package/src/prover/smt/solver/probes.ts +90 -27
- package/src/prover/smt/solver/propagate-values.ts +0 -1
- package/src/prover/smt/solver/proto-model.ts +8 -9
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +0 -1
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -6
- 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 +0 -1
- package/src/prover/smt/solver/qe.ts +3 -4
- 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 +23 -9
- 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 +0 -1
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +0 -2
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +0 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -2
- package/src/prover/smt/solver/recfun-rewriter.ts +0 -1
- 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 +7 -7
- package/src/prover/smt/solver/rewriter.ts +31 -26
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +0 -2
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -2
- package/src/prover/smt/solver/sat/clause.ts +0 -3
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +1 -4
- package/src/prover/smt/solver/sat/consequences.ts +0 -1
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -29
- package/src/prover/smt/solver/sat/model-converter.ts +1 -3
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -3
- package/src/prover/smt/solver/sat/probing.ts +0 -2
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -8
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -9
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +1 -4
- package/src/prover/smt/solver/sat/solver.ts +25 -49
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +0 -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 +1 -2
- package/src/prover/smt/solver/seq-derive.ts +4 -9
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -3
- 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 +0 -2
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -2
- package/src/prover/smt/solver/seq-re-util.ts +1 -3
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +2 -4
- package/src/prover/smt/solver/seq-rewriter.ts +31 -31
- 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 +1 -3
- package/src/prover/smt/solver/smt-kernel.ts +48 -9
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +99 -15
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +589 -226
- package/src/prover/smt/solver/smtlib-script.ts +674 -197
- package/src/prover/smt/solver/solve-eqs.ts +36 -39
- package/src/prover/smt/solver/solver.ts +19 -5
- 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 +332 -191
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +0 -2
- package/src/prover/smt/solver/theory-bv.ts +13 -5
- 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 +1 -2
- 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 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +10 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -4
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -2
- package/src/prover/smt/solver/theory-pb.ts +24 -9
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +0 -1
- package/src/prover/smt/solver/theory-seq-regex.ts +0 -1
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -3
- package/src/prover/smt/solver/theory-seq-state.ts +2 -23
- package/src/prover/smt/solver/theory-seq.ts +0 -1
- package/src/prover/smt/solver/theory.ts +0 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -2
- package/src/prover/smt/solver/var-subst.ts +0 -1
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1072 -253
- package/src/runtime.ts +11 -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 +38 -30
- package/src/sany/generator-proofs.ts +6 -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 +262 -144
- package/src/simulate.ts +168 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +56 -22
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- 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/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtTacticError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
3
2
|
import type { AstManager } from "../ast";
|
|
4
3
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
5
4
|
import { OVER, type Goal } from "../goal";
|
|
6
|
-
import { L_FALSE, L_TRUE } from "../lbool";
|
|
5
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
7
6
|
import { ProtoModel } from "../proto-model";
|
|
8
7
|
import type { SatParams } from "./config";
|
|
9
8
|
import { Goal2Sat } from "./goal2sat";
|
|
10
|
-
import { sat2goal } from "./sat2goal";
|
|
9
|
+
import { Sat2GoalConverter, sat2goal } from "./sat2goal";
|
|
11
10
|
import { Solver } from "./solver";
|
|
12
11
|
|
|
13
12
|
// With a theory factory, the sat solver runs the euf solver of sat.euf as its extension.
|
|
@@ -20,11 +19,19 @@ export const createSatTactic =
|
|
|
20
19
|
const goal2sat = new Goal2Sat(manager, solver, params.get("ite_extra") !== false, mkThSolver);
|
|
21
20
|
goal2sat.run(goal.forms.items);
|
|
22
21
|
goal.reset();
|
|
23
|
-
const result =
|
|
22
|
+
const result = (() => {
|
|
23
|
+
try {
|
|
24
|
+
return solver.check();
|
|
25
|
+
} catch (error) {
|
|
26
|
+
if (error instanceof SmtCanceledError) throw new SmtTacticError("canceled");
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
})();
|
|
30
|
+
if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
|
|
24
31
|
const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
|
|
25
32
|
if (result === L_FALSE) goal.assert(manager.falseExpr);
|
|
26
33
|
else if (result === L_TRUE && unhandledFuns.length === 0) {
|
|
27
|
-
const model = new ProtoModel(manager);
|
|
34
|
+
const model = new ProtoModel(manager).mkModel();
|
|
28
35
|
for (const [expr, boolVar] of goal2sat.atoms) {
|
|
29
36
|
if (!manager.isUninterpretedConst(expr)) continue;
|
|
30
37
|
const value = solver.model[boolVar];
|
|
@@ -32,11 +39,13 @@ export const createSatTactic =
|
|
|
32
39
|
else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
|
|
33
40
|
}
|
|
34
41
|
const euf = goal2sat.euf;
|
|
35
|
-
goal.model =
|
|
42
|
+
goal.model = euf?.updateModel(model) ?? model;
|
|
36
43
|
euf?.validateModel(goal.model);
|
|
37
44
|
} else {
|
|
38
45
|
solver.popToBaseLevel();
|
|
39
|
-
|
|
46
|
+
const converter = new Sat2GoalConverter(manager);
|
|
47
|
+
sat2goal(manager, solver, goal2sat.atoms, goal, converter);
|
|
48
|
+
goal.addDefinitions(converter.entries);
|
|
40
49
|
if (unhandledFuns.length > 0) goal.updatePrecision(OVER);
|
|
41
50
|
}
|
|
42
51
|
goal.depth++;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/tactic/sat2goal.h, src/sat/tactic/sat2goal.cpp,
|
|
2
|
-
// src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { type AstManager, SORT_BOOL } from "../ast";
|
|
5
3
|
import type { Definition, Goal } from "../goal";
|
|
@@ -14,9 +12,9 @@ export const isLiteral = (manager: AstManager, expr: number) =>
|
|
|
14
12
|
manager.isUninterpretedConst(expr) ||
|
|
15
13
|
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
|
|
16
14
|
|
|
17
|
-
class Sat2GoalConverter {
|
|
15
|
+
export class Sat2GoalConverter {
|
|
18
16
|
readonly smc = new ModelConverter();
|
|
19
|
-
var2expr: number[] = [];
|
|
17
|
+
readonly var2expr: number[] = [];
|
|
20
18
|
readonly entries: Definition[] = [];
|
|
21
19
|
|
|
22
20
|
constructor(private manager: AstManager) {}
|
|
@@ -24,17 +22,21 @@ class Sat2GoalConverter {
|
|
|
24
22
|
private add(expr: number, def: number) {
|
|
25
23
|
const manager = this.manager;
|
|
26
24
|
manager.incRef(def);
|
|
25
|
+
manager.incDeclRef(manager.decls[expr]);
|
|
27
26
|
this.entries.push({ decl: manager.decls[expr], def });
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
hide(expr: number) {
|
|
31
|
-
|
|
30
|
+
const manager = this.manager;
|
|
31
|
+
manager.incDeclRef(manager.decls[expr]);
|
|
32
|
+
this.entries.push({ decl: manager.decls[expr], def: -1 });
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
flushSmc(solver: Solver, atoms: Map<number, number>) {
|
|
35
36
|
this.smc.flush(solver.mc);
|
|
36
|
-
|
|
37
|
-
this.var2expr.
|
|
37
|
+
const numVars = solver.numVars();
|
|
38
|
+
while (this.var2expr.length < numVars) this.var2expr.push(-1);
|
|
39
|
+
this.var2expr.length = numVars;
|
|
38
40
|
for (const [expr, boolVar] of atoms) this.var2expr[boolVar] = expr;
|
|
39
41
|
this.flushGmc();
|
|
40
42
|
}
|
|
@@ -108,12 +110,12 @@ export const sat2goal = (
|
|
|
108
110
|
solver: Solver,
|
|
109
111
|
atoms: Map<number, number>,
|
|
110
112
|
goal: Goal,
|
|
113
|
+
converter: Sat2GoalConverter,
|
|
111
114
|
) => {
|
|
112
115
|
if (solver.atBaseLvl() && solver.isInconsistent) {
|
|
113
116
|
goal.assert(manager.falseExpr);
|
|
114
117
|
return;
|
|
115
118
|
}
|
|
116
|
-
const converter = new Sat2GoalConverter(manager);
|
|
117
119
|
converter.flushSmc(solver, atoms);
|
|
118
120
|
const lit2expr = new Int32Array(2 * solver.numVars()).fill(-1);
|
|
119
121
|
for (const [expr, boolVar] of atoms) {
|
|
@@ -163,5 +165,4 @@ export const sat2goal = (
|
|
|
163
165
|
const formulas: number[] = [];
|
|
164
166
|
solver.ext?.toFormulas(getExpr, formulas);
|
|
165
167
|
for (const formula of formulas) goal.assert(formula);
|
|
166
|
-
goal.addDefinitions(converter.entries);
|
|
167
168
|
};
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_simplifier.h, src/sat/sat_simplifier.cpp,
|
|
2
|
-
// src/sat/sat_simplifier_params.pyg, src/sat/sat_clause_set.h, src/sat/sat_clause_set.cpp,
|
|
3
|
-
// src/util/heap.h, src/util/util.h), MIT license, see z3-license.txt.
|
|
4
1
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
5
2
|
import type { RandomGen } from "../random-gen";
|
|
6
3
|
import { type ClauseArena, NULL_LITERAL, UINT_MAX } from "./clause";
|
|
@@ -1273,7 +1270,7 @@ export class Simplifier {
|
|
|
1273
1270
|
for (const wlist of solver.watches) {
|
|
1274
1271
|
solver.checkpoint();
|
|
1275
1272
|
const size = wlist.size;
|
|
1276
|
-
const order = Array.from({ length: size }, (
|
|
1273
|
+
const order = Array.from({ length: size }, (_value, index) => index);
|
|
1277
1274
|
const getRank = (index: number) =>
|
|
1278
1275
|
wlist.isBinary(index)
|
|
1279
1276
|
? 2 * wlist.getLiteral(index) + (wlist.isLearned(index) ? 1 : 0)
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_solver.h, src/sat/sat_solver.cpp, src/sat/sat_gc.cpp,
|
|
2
|
-
// src/sat/sat_justification.h, src/util/ema.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtCanceledError } from "../../../../errors";
|
|
4
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
5
3
|
import { RandomGen } from "../random-gen";
|
|
@@ -76,7 +74,7 @@ const RANDOM_MAX_VALUE = 0x7fff;
|
|
|
76
74
|
const S_SAT = 0;
|
|
77
75
|
const S_UNSAT = 1;
|
|
78
76
|
|
|
79
|
-
|
|
77
|
+
class Ema {
|
|
80
78
|
private beta = 1;
|
|
81
79
|
value = 0;
|
|
82
80
|
private period = 0;
|
|
@@ -141,7 +139,6 @@ export class Solver {
|
|
|
141
139
|
model = new Int8Array(0);
|
|
142
140
|
isModelCurrent = false;
|
|
143
141
|
isInconsistent = false;
|
|
144
|
-
isSearching = false;
|
|
145
142
|
conflictJustLevel = 0;
|
|
146
143
|
conflictLevel = 0;
|
|
147
144
|
conflictVal = 0;
|
|
@@ -149,7 +146,6 @@ export class Solver {
|
|
|
149
146
|
notL = NULL_LITERAL;
|
|
150
147
|
clauses: number[] = [];
|
|
151
148
|
learned: number[] = [];
|
|
152
|
-
numFrozen = 0;
|
|
153
149
|
watches: WatchList[] = [];
|
|
154
150
|
assignment = new Int8Array(16);
|
|
155
151
|
justLevel = new Uint32Array(8);
|
|
@@ -198,7 +194,6 @@ export class Solver {
|
|
|
198
194
|
scopes: Scope[] = [];
|
|
199
195
|
core: number[] = [];
|
|
200
196
|
conflicts = 0;
|
|
201
|
-
decisions = 0;
|
|
202
197
|
conflictsSinceInit = 0;
|
|
203
198
|
restarts = 0;
|
|
204
199
|
conflictsSinceRestart = 0;
|
|
@@ -394,7 +389,6 @@ export class Solver {
|
|
|
394
389
|
}
|
|
395
390
|
|
|
396
391
|
delClause(clause: number) {
|
|
397
|
-
if (this.arena.isFrozen(clause)) this.numFrozen--;
|
|
398
392
|
this.arena.delClause(clause);
|
|
399
393
|
}
|
|
400
394
|
|
|
@@ -881,38 +875,33 @@ export class Solver {
|
|
|
881
875
|
check(assumptions: readonly number[] = []) {
|
|
882
876
|
this.reasonUnknown = "no reason given";
|
|
883
877
|
this.popToBaseLevel();
|
|
884
|
-
this.isSearching = true;
|
|
885
878
|
this.isGivenUp = false;
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
879
|
+
this.initSearch();
|
|
880
|
+
if (this.checkInconsistent()) return L_FALSE;
|
|
881
|
+
this.propagate(false);
|
|
882
|
+
if (this.checkInconsistent()) return L_FALSE;
|
|
883
|
+
this.initAssumptions(assumptions);
|
|
884
|
+
this.propagate(false);
|
|
885
|
+
if (this.checkInconsistent()) return L_FALSE;
|
|
886
|
+
if (this.config.isForcingCleanup) this.doCleanup(true);
|
|
887
|
+
if (this.config.isGcBurst) {
|
|
888
|
+
this.conflictsSinceGc = this.gcThreshold + 1;
|
|
889
|
+
this.doGc();
|
|
890
|
+
}
|
|
891
|
+
if (this.config.isEnablingPreSimplify) {
|
|
892
|
+
this.doSimplify();
|
|
893
893
|
if (this.checkInconsistent()) return L_FALSE;
|
|
894
|
-
if (this.config.isForcingCleanup) this.doCleanup(true);
|
|
895
|
-
if (this.config.isGcBurst) {
|
|
896
|
-
this.conflictsSinceGc = this.gcThreshold + 1;
|
|
897
|
-
this.doGc();
|
|
898
|
-
}
|
|
899
|
-
if (this.config.isEnablingPreSimplify) {
|
|
900
|
-
this.doSimplify();
|
|
901
|
-
if (this.checkInconsistent()) return L_FALSE;
|
|
902
|
-
}
|
|
903
|
-
if (this.config.maxConflicts === 0) return L_UNDEF;
|
|
904
|
-
if (this.config.maxConflicts > 0 && this.config.burstSearch > 0) {
|
|
905
|
-
this.restartThreshold = this.config.burstSearch;
|
|
906
|
-
const result = this.boundedSearch();
|
|
907
|
-
if (result !== L_UNDEF || this.isGivenUp) return result;
|
|
908
|
-
this.popReinit(this.scopeLvl);
|
|
909
|
-
this.conflictsSinceRestart = 0;
|
|
910
|
-
this.restartThreshold = this.config.restartInitial;
|
|
911
|
-
}
|
|
912
|
-
return this.basicSearch();
|
|
913
|
-
} finally {
|
|
914
|
-
this.isSearching = false;
|
|
915
894
|
}
|
|
895
|
+
if (this.config.maxConflicts === 0) return L_UNDEF;
|
|
896
|
+
if (this.config.maxConflicts > 0 && this.config.burstSearch > 0) {
|
|
897
|
+
this.restartThreshold = this.config.burstSearch;
|
|
898
|
+
const result = this.boundedSearch();
|
|
899
|
+
if (result !== L_UNDEF || this.isGivenUp) return result;
|
|
900
|
+
this.popReinit(this.scopeLvl);
|
|
901
|
+
this.conflictsSinceRestart = 0;
|
|
902
|
+
this.restartThreshold = this.config.restartInitial;
|
|
903
|
+
}
|
|
904
|
+
return this.basicSearch();
|
|
916
905
|
}
|
|
917
906
|
|
|
918
907
|
checkInconsistent() {
|
|
@@ -1128,7 +1117,6 @@ export class Solver {
|
|
|
1128
1117
|
const next = this.nextVar();
|
|
1129
1118
|
if (next === -1) return false;
|
|
1130
1119
|
this.push();
|
|
1131
|
-
this.decisions++;
|
|
1132
1120
|
this.assignScoped(2 * next + (this.guess(next) ? 0 : 1));
|
|
1133
1121
|
return true;
|
|
1134
1122
|
}
|
|
@@ -1934,16 +1922,6 @@ export class Solver {
|
|
|
1934
1922
|
this.activityInc >>>= 14;
|
|
1935
1923
|
}
|
|
1936
1924
|
|
|
1937
|
-
numClauses() {
|
|
1938
|
-
let numClauses = this.trail.length;
|
|
1939
|
-
for (let lit = 0; lit < this.watches.length; lit++) {
|
|
1940
|
-
const wlist = this.watches[lit];
|
|
1941
|
-
for (let index = 0; index < wlist.size; index++)
|
|
1942
|
-
if (wlist.isBinary(index) && (lit ^ 1) < wlist.getLiteral(index)) numClauses++;
|
|
1943
|
-
}
|
|
1944
|
-
return numClauses + this.clauses.length + this.learned.length;
|
|
1945
|
-
}
|
|
1946
|
-
|
|
1947
1925
|
doCleanup(isForced: boolean) {
|
|
1948
1926
|
if (this.conflictsSinceInit === 0 && !isForced) return false;
|
|
1949
1927
|
return this.atBaseLvl() && !this.isInconsistent && this.cleaner.run(isForced);
|
|
@@ -2065,12 +2043,10 @@ export class Solver {
|
|
|
2065
2043
|
this.detachClause(clause);
|
|
2066
2044
|
arena.inactRounds[clause] = 0;
|
|
2067
2045
|
arena.setFrozen(clause, true);
|
|
2068
|
-
this.numFrozen++;
|
|
2069
2046
|
}
|
|
2070
2047
|
}
|
|
2071
2048
|
} else if (this.psm(clause) <= Math.trunc(arena.size[clause] * this.minDTk)) {
|
|
2072
2049
|
arena.setFrozen(clause, false);
|
|
2073
|
-
this.numFrozen--;
|
|
2074
2050
|
if (!this.activateFrozenClause(clause)) {
|
|
2075
2051
|
this.delClause(clause);
|
|
2076
2052
|
continue;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_axioms.cpp, src/smt/seq_axioms.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
import { SmtUnsupportedError } from "../../../errors";
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
FAMILY_ARITH,
|
|
@@ -25,7 +23,6 @@ import {
|
|
|
25
23
|
OP_SEQ_PREFIX,
|
|
26
24
|
OP_SEQ_UNIT,
|
|
27
25
|
OP_STRING_FROM_CODE,
|
|
28
|
-
OP_STRING_ITOS,
|
|
29
26
|
OP_STRING_LT,
|
|
30
27
|
OP_STRING_STOI,
|
|
31
28
|
OP_STRING_TO_CODE,
|
|
@@ -37,7 +34,7 @@ import { FALSE_LITERAL, type Literal, TRUE_LITERAL, negate } from "./literal";
|
|
|
37
34
|
import { isBinaryApp, isEmptySeq, mkConcatOf, mkEmptySeq, mkSeqApp } from "./seq-decl-plugin";
|
|
38
35
|
import { SeqSkolem } from "./seq-skolem";
|
|
39
36
|
|
|
40
|
-
|
|
37
|
+
interface SeqAxiomsHost {
|
|
41
38
|
rewrite(expr: number): number;
|
|
42
39
|
mkEqLiteral(first: number, second: number): Literal;
|
|
43
40
|
ensureEnode(expr: number): void;
|
|
@@ -63,7 +60,7 @@ export const getMinLengthOf = (manager: AstManager, seq: number): number => {
|
|
|
63
60
|
|
|
64
61
|
const UINT_MAX = 0xffffffff;
|
|
65
62
|
|
|
66
|
-
|
|
63
|
+
const getMaxLengthOf = (manager: AstManager, seq: number): number => {
|
|
67
64
|
const getLength = (expr: number) => {
|
|
68
65
|
if (isEmptySeq(manager, expr)) return 0;
|
|
69
66
|
const op = manager.getOp(expr);
|
|
@@ -181,13 +178,8 @@ export class SeqAxioms {
|
|
|
181
178
|
return result;
|
|
182
179
|
}
|
|
183
180
|
|
|
184
|
-
|
|
185
|
-
return this.host.rewrite(this.mkSeq(OP_SEQ_LENGTH, [seq]));
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
private purify(expr: number | undefined) {
|
|
181
|
+
private purify(expr: number) {
|
|
189
182
|
const manager = this.manager;
|
|
190
|
-
if (expr === undefined) return undefined;
|
|
191
183
|
if (manager.depths[expr] === 1 || manager.isValue(expr)) return expr;
|
|
192
184
|
if (this.host.rewrite(expr) === expr) return expr;
|
|
193
185
|
let result = this.purified.get(expr);
|
|
@@ -257,9 +249,9 @@ export class SeqAxioms {
|
|
|
257
249
|
extractAxiom(expr: number) {
|
|
258
250
|
const manager = this.manager;
|
|
259
251
|
const [seqArg, indexArg, lengthArg] = manager.getArgs(expr);
|
|
260
|
-
const seq = this.purify(seqArg)
|
|
261
|
-
const index = this.purify(indexArg)
|
|
262
|
-
const length = this.purify(lengthArg)
|
|
252
|
+
const seq = this.purify(seqArg);
|
|
253
|
+
const index = this.purify(indexArg);
|
|
254
|
+
const length = this.purify(lengthArg);
|
|
263
255
|
if (this.smallSegmentAxiom(expr, seqArg, indexArg, lengthArg)) return;
|
|
264
256
|
if (this.isTail(seq, indexArg, lengthArg)) {
|
|
265
257
|
this.tailAxiom(expr, seq);
|
|
@@ -437,9 +429,9 @@ export class SeqAxioms {
|
|
|
437
429
|
const args = manager.getArgs(index);
|
|
438
430
|
const minusOne = this.mkInt(-1);
|
|
439
431
|
const zero = this.mkInt(0);
|
|
440
|
-
const offset = this.purify(args[2]);
|
|
441
|
-
const pattern = this.purify(args[1])
|
|
442
|
-
const text = this.purify(args[0])
|
|
432
|
+
const offset = args.length > 2 ? this.purify(args[2]) : undefined;
|
|
433
|
+
const pattern = this.purify(args[1]);
|
|
434
|
+
const text = this.purify(args[0]);
|
|
443
435
|
const contains = this.mkSeq(OP_SEQ_CONTAINS, [text, pattern]);
|
|
444
436
|
const isMinusOne = this.mkEq(index, minusOne);
|
|
445
437
|
const isZero = this.mkEq(index, zero);
|
|
@@ -512,8 +504,8 @@ export class SeqAxioms {
|
|
|
512
504
|
lastIndexofAxiom(index: number) {
|
|
513
505
|
const manager = this.manager;
|
|
514
506
|
const [textArg, patternArg] = manager.getArgs(index);
|
|
515
|
-
const text = this.purify(textArg)
|
|
516
|
-
const pattern = this.purify(patternArg)
|
|
507
|
+
const text = this.purify(textArg);
|
|
508
|
+
const pattern = this.purify(patternArg);
|
|
517
509
|
const minusOne = this.mkInt(-1);
|
|
518
510
|
const zero = this.mkInt(0);
|
|
519
511
|
const skolem = this.skolem;
|
|
@@ -540,9 +532,9 @@ export class SeqAxioms {
|
|
|
540
532
|
replaceAxiom(replace: number) {
|
|
541
533
|
const manager = this.manager;
|
|
542
534
|
const [source, patternArg, targetArg] = manager.getArgs(replace);
|
|
543
|
-
const text = this.purify(source)
|
|
544
|
-
const pattern = this.purify(patternArg)
|
|
545
|
-
const target = this.purify(targetArg)
|
|
535
|
+
const text = this.purify(source);
|
|
536
|
+
const pattern = this.purify(patternArg);
|
|
537
|
+
const target = this.purify(targetArg);
|
|
546
538
|
const skolem = this.skolem;
|
|
547
539
|
const left = skolem.mkIndexofLeft(text, pattern);
|
|
548
540
|
const right = skolem.mkIndexofRight(text, pattern);
|
|
@@ -566,8 +558,8 @@ export class SeqAxioms {
|
|
|
566
558
|
atAxiom(expr: number) {
|
|
567
559
|
const manager = this.manager;
|
|
568
560
|
const [seqArg, indexArg] = manager.getArgs(expr);
|
|
569
|
-
const seq = this.purify(seqArg)
|
|
570
|
-
const index = this.purify(indexArg)
|
|
561
|
+
const seq = this.purify(seqArg);
|
|
562
|
+
const index = this.purify(indexArg);
|
|
571
563
|
this.mkInt(0);
|
|
572
564
|
const one = this.mkInt(1);
|
|
573
565
|
const empty = this.mkEmpty(manager.sorts[expr]);
|
|
@@ -748,8 +740,8 @@ export class SeqAxioms {
|
|
|
748
740
|
ltAxiom(expr: number) {
|
|
749
741
|
const manager = this.manager;
|
|
750
742
|
const [firstArg, secondArg] = manager.getArgs(expr);
|
|
751
|
-
const first = this.purify(firstArg)
|
|
752
|
-
const second = this.purify(secondArg)
|
|
743
|
+
const first = this.purify(firstArg);
|
|
744
|
+
const second = this.purify(secondArg);
|
|
753
745
|
const charSort = manager.getSeqElementSort(manager.sorts[first]);
|
|
754
746
|
const lt = expr;
|
|
755
747
|
const gt = this.mkSeq(OP_STRING_LT, [second, first]);
|
|
@@ -896,8 +888,8 @@ export class SeqAxioms {
|
|
|
896
888
|
private affixAxiom(expr: number, name: string, isPrefix: boolean) {
|
|
897
889
|
const manager = this.manager;
|
|
898
890
|
const [firstArg, secondArg] = manager.getArgs(expr);
|
|
899
|
-
const first = this.purify(firstArg)
|
|
900
|
-
const second = this.purify(secondArg)
|
|
891
|
+
const first = this.purify(firstArg);
|
|
892
|
+
const second = this.purify(secondArg);
|
|
901
893
|
const firstLength = this.mkLenAxiom(first);
|
|
902
894
|
const secondLength = this.mkLenAxiom(second);
|
|
903
895
|
const isLonger = this.mkGe(this.mkSub(firstLength, secondLength), 1);
|
|
@@ -1000,12 +992,4 @@ export class SeqAxioms {
|
|
|
1000
992
|
this.addClause([this.mkNot(tracker), this.mkLe(this.mkLenAxiom(target), limit)]);
|
|
1001
993
|
return tracker;
|
|
1002
994
|
}
|
|
1003
|
-
|
|
1004
|
-
ubvAxiom(): never {
|
|
1005
|
-
throw new SmtUnsupportedError("str.from_ubv in the theory of sequences");
|
|
1006
|
-
}
|
|
1007
|
-
|
|
1008
|
-
isItos(expr: number) {
|
|
1009
|
-
return this.manager.getOp(expr) === OP_STRING_ITOS;
|
|
1010
|
-
}
|
|
1011
995
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq_decl_plugin.cpp, src/ast/char_decl_plugin.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -272,7 +271,7 @@ const SEQ_VARIANTS = new Map([
|
|
|
272
271
|
[OP_INTERNAL_STRING_SUBSTR, OP_SEQ_EXTRACT],
|
|
273
272
|
]);
|
|
274
273
|
|
|
275
|
-
const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map((
|
|
274
|
+
const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map((entry) => [entry[1], entry[0]]));
|
|
276
275
|
|
|
277
276
|
const getPsig = (op: number) => {
|
|
278
277
|
const sig = SIGS.get(op);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_derive.cpp, src/ast/rewriter/bool_rewriter.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -65,7 +63,7 @@ import {
|
|
|
65
63
|
import { type ReRewriter, getResultExpr } from "./seq-re-rewriter";
|
|
66
64
|
|
|
67
65
|
export const DERIVATIVE_ANTIMIROV = 0;
|
|
68
|
-
|
|
66
|
+
const DERIVATIVE_BRZOZOWSKI = 1;
|
|
69
67
|
export const TRANSITION_BRZOZOWSKI = 0;
|
|
70
68
|
export const TRANSITION_LIGHT_ANTIMIROV = 1;
|
|
71
69
|
|
|
@@ -1244,12 +1242,9 @@ export class Derive {
|
|
|
1244
1242
|
}
|
|
1245
1243
|
|
|
1246
1244
|
derivativeCofactors(regex: number, result: RefVector) {
|
|
1247
|
-
const
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
const derivative = this.derive(DERIVATIVE_BRZOZOWSKI, element, regex);
|
|
1251
|
-
// Deviation from Z3: a cached derivative leaves m_ele null there, which stops the pruning.
|
|
1252
|
-
this.getCofactors(element, derivative, result);
|
|
1245
|
+
const derivative = this.deriveSymbolic(DERIVATIVE_BRZOZOWSKI, regex);
|
|
1246
|
+
// Like Z3, a cached derivative whose lookup reset the op caches leaves the element unset, which stops the interval pruning.
|
|
1247
|
+
this.getCofactors(this.element, derivative, result);
|
|
1253
1248
|
}
|
|
1254
1249
|
|
|
1255
1250
|
lightAntDerivativeCofactors(regex: number, result: RefVector) {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_eq_approx.cpp, src/ast/seq/seq_eq_approx.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { type AstManager, OP_SEQ_CONCAT, OP_SEQ_UNIT } from "./ast";
|
|
4
2
|
import { GuardSet, GuardSetCache } from "./guard-set";
|
|
5
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_eq_solver.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -28,7 +27,7 @@ export interface SeqLength {
|
|
|
28
27
|
value: Rational;
|
|
29
28
|
}
|
|
30
29
|
|
|
31
|
-
|
|
30
|
+
interface SeqEqSolverHost {
|
|
32
31
|
addConsequence(isUsingDeps: boolean, clause: number[]): void;
|
|
33
32
|
addSolution(variable: number, term: number): void;
|
|
34
33
|
expr2rep(expr: number): number;
|
|
@@ -42,7 +41,7 @@ export interface BinaryEq {
|
|
|
42
41
|
y: number;
|
|
43
42
|
}
|
|
44
43
|
|
|
45
|
-
|
|
44
|
+
interface TernaryEq {
|
|
46
45
|
x: number;
|
|
47
46
|
xs: number[];
|
|
48
47
|
y1: number;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/model/seq_factory.h, src/model/char_factory.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import { type AstManager, OP_SEQ_TO_RE, OP_SEQ_UNIT } from "./ast";
|
|
4
3
|
import { mkConcatOf, mkSeqApp } from "./seq-decl-plugin";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_monadic.cpp, src/ast/seq/seq_monadic.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
3
|
KIND_APP,
|
|
@@ -37,15 +35,15 @@ import {
|
|
|
37
35
|
ViewWitness,
|
|
38
36
|
} from "./seq-view-witness";
|
|
39
37
|
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
const ORIENTATION_FORWARD = 0;
|
|
39
|
+
const ORIENTATION_REVERSED = 1;
|
|
42
40
|
export const ORIENTATION_RETRY = 2;
|
|
43
41
|
|
|
44
42
|
const LIVE_STATE_CAP = 1 << 12;
|
|
45
43
|
const COFACTOR_CACHE_CAP = 1 << 16;
|
|
46
44
|
const LENGTH_CONSTRAINING_KEY = 2 ** 40;
|
|
47
45
|
|
|
48
|
-
|
|
46
|
+
interface Memberships {
|
|
49
47
|
terms: number[];
|
|
50
48
|
regexes: number[];
|
|
51
49
|
deps: number[];
|
|
@@ -135,8 +133,10 @@ export class Monadic {
|
|
|
135
133
|
this.pins.push(regex);
|
|
136
134
|
this.pins.push(element);
|
|
137
135
|
this.pins.pushOwned(derivative);
|
|
138
|
-
|
|
139
|
-
|
|
136
|
+
const derivatives = this.derivativeCache.get(regex);
|
|
137
|
+
if (derivatives === undefined)
|
|
138
|
+
this.derivativeCache.set(regex, new Map([[element, derivative]]));
|
|
139
|
+
else derivatives.set(element, derivative);
|
|
140
140
|
return derivative;
|
|
141
141
|
}
|
|
142
142
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -485,7 +484,8 @@ export class ReRewriter {
|
|
|
485
484
|
left === right ? 0 : getId(left) < getId(right) ? -1 : 1;
|
|
486
485
|
const composeResult = (suffix: number) => {
|
|
487
486
|
let result = suffix;
|
|
488
|
-
|
|
487
|
+
for (let regex = prefix.pop(); regex !== undefined; regex = prefix.pop())
|
|
488
|
+
result = compose(regex, result);
|
|
489
489
|
return result;
|
|
490
490
|
};
|
|
491
491
|
let left = first;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq_decl_plugin.cpp, src/ast/char_decl_plugin.cpp,
|
|
2
|
-
// src/util/len_abs.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -59,7 +57,7 @@ export interface LenAbs {
|
|
|
59
57
|
residues: bigint;
|
|
60
58
|
}
|
|
61
59
|
|
|
62
|
-
|
|
60
|
+
interface ReInfo extends LenAbs {
|
|
63
61
|
isKnown: boolean;
|
|
64
62
|
isInterpreted: boolean;
|
|
65
63
|
nullable: number;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_regex_bisim.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_RE_XOR } from "./ast";
|
|
3
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -118,7 +117,7 @@ export class RegexBisim {
|
|
|
118
117
|
this.worklist.pop();
|
|
119
118
|
const cofactors = new RefVector(manager);
|
|
120
119
|
derive.derivativeCofactors(regex, cofactors);
|
|
121
|
-
const leaves = cofactors.items.filter((
|
|
120
|
+
const leaves = cofactors.items.filter((_value, index) => index % 2 === 1);
|
|
122
121
|
const status = this.areLeavesEquivalent(leaves);
|
|
123
122
|
if (status === L_TRUE)
|
|
124
123
|
for (const leaf of leaves) {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_regex_live.cpp, src/ast/seq/seq_regex_live.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import type { AstManager } from "./ast";
|
|
4
2
|
import { L_FALSE, L_TRUE } from "./lbool";
|
|
5
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -7,8 +5,8 @@ import type { ReRewriter } from "./seq-re-rewriter";
|
|
|
7
5
|
import { isReEmpty } from "./seq-re-util";
|
|
8
6
|
|
|
9
7
|
export const LIVE_FAILURE_NONE = 0;
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
const LIVE_FAILURE_STATE_CAP = 1;
|
|
9
|
+
const LIVE_FAILURE_RESOURCE = 2;
|
|
12
10
|
|
|
13
11
|
const NULLABLE_UNKNOWN = 2;
|
|
14
12
|
const NULLABLE_UNDEF = 3;
|