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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_rewriter.cpp, src/ast/rewriter/char_rewriter.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -184,7 +182,7 @@ const isDigit = (code: number) => code >= 48 && code <= 57;
|
|
|
184
182
|
const getCount = (bag: Map<number, number>, key: number) => bag.get(key) ?? 0;
|
|
185
183
|
|
|
186
184
|
const isSameBag = (first: Map<number, number>, second: Map<number, number>) =>
|
|
187
|
-
first.size === second.size && [...first].every((
|
|
185
|
+
first.size === second.size && [...first].every((entry) => second.get(entry[0]) === entry[1]);
|
|
188
186
|
|
|
189
187
|
export class SeqRewriter {
|
|
190
188
|
readonly re: ReRewriter;
|
|
@@ -501,8 +499,7 @@ export class SeqRewriter {
|
|
|
501
499
|
return manager.mkString([...firstChars, ...secondChars]);
|
|
502
500
|
const elements: number[] = [];
|
|
503
501
|
const todo = [second, first];
|
|
504
|
-
|
|
505
|
-
const expr = todo.pop()!;
|
|
502
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
506
503
|
if (this.isConcat2(expr)) {
|
|
507
504
|
todo.push(this.getArg(expr, 1), this.getArg(expr, 0));
|
|
508
505
|
continue;
|
|
@@ -512,7 +509,8 @@ export class SeqRewriter {
|
|
|
512
509
|
if (elements.length === 0) return this.mkEmpty(manager.sorts[first]);
|
|
513
510
|
const coalesced: number[] = [];
|
|
514
511
|
for (const element of elements) {
|
|
515
|
-
const previous =
|
|
512
|
+
const previous =
|
|
513
|
+
coalesced.length > 0 ? manager.getString(coalesced[coalesced.length - 1]) : undefined;
|
|
516
514
|
const chars = manager.getString(element);
|
|
517
515
|
if (this.isCoalescingChars && previous !== undefined && chars !== undefined)
|
|
518
516
|
coalesced[coalesced.length - 1] = manager.mkString([...previous, ...chars]);
|
|
@@ -520,7 +518,10 @@ export class SeqRewriter {
|
|
|
520
518
|
}
|
|
521
519
|
return coalesced
|
|
522
520
|
.slice(0, -1)
|
|
523
|
-
.reduceRight(
|
|
521
|
+
.reduceRight(
|
|
522
|
+
(tail, element) => this.mkConcat(element, tail),
|
|
523
|
+
coalesced[coalesced.length - 1],
|
|
524
|
+
);
|
|
524
525
|
}
|
|
525
526
|
|
|
526
527
|
private mkSeqLength(seq: number): Result {
|
|
@@ -767,8 +768,7 @@ export class SeqRewriter {
|
|
|
767
768
|
let isOtherFactorAtLeastOne = true;
|
|
768
769
|
const todo = [offset];
|
|
769
770
|
const visited = new Set<number>();
|
|
770
|
-
|
|
771
|
-
const arg = todo.pop()!;
|
|
771
|
+
for (let arg = todo.pop(); arg !== undefined; arg = todo.pop()) {
|
|
772
772
|
if (visited.has(arg)) continue;
|
|
773
773
|
visited.add(arg);
|
|
774
774
|
if (this.isOp(arg, OP_MUL)) todo.push(...manager.getArgs(arg));
|
|
@@ -958,7 +958,7 @@ export class SeqRewriter {
|
|
|
958
958
|
let start = 0;
|
|
959
959
|
let end = seqUnits.length;
|
|
960
960
|
const first = otherUnits[0];
|
|
961
|
-
const last = otherUnits.
|
|
961
|
+
const last = otherUnits[otherUnits.length - 1];
|
|
962
962
|
while (start < seqUnits.length && this.isNotContainingPrefix(seqUnits[start], first)) start++;
|
|
963
963
|
while (end > start && this.isNotContainingSuffix(seqUnits[end - 1], last)) end--;
|
|
964
964
|
if (start === end) return rewrite(this.mkIsEmpty(other), BR_REWRITE2);
|
|
@@ -1703,7 +1703,7 @@ export class SeqRewriter {
|
|
|
1703
1703
|
const seq = this.getArg(value, 0);
|
|
1704
1704
|
const maxLength = this.getMaxLength(seq);
|
|
1705
1705
|
if (!maxLength.isBounded || maxLength.length > 1n) return undefined;
|
|
1706
|
-
const eqs = Array.from({ length: 10 }, (
|
|
1706
|
+
const eqs = Array.from({ length: 10 }, (_value, digit) =>
|
|
1707
1707
|
this.mkEq(seq, manager.mkString([48 + digit])),
|
|
1708
1708
|
);
|
|
1709
1709
|
const isDigitString = manager.mkApp(OP_OR, eqs, SORT_BOOL);
|
|
@@ -1740,8 +1740,8 @@ export class SeqRewriter {
|
|
|
1740
1740
|
}
|
|
1741
1741
|
const units = getConcatUnits(manager, seq, []);
|
|
1742
1742
|
if (units.length === 0) return this.minusOne();
|
|
1743
|
-
if (this.isUnit(units.
|
|
1744
|
-
const tail = this.mkSeq(OP_STRING_STOI, [units.
|
|
1743
|
+
if (this.isUnit(units[units.length - 1])) {
|
|
1744
|
+
const tail = this.mkSeq(OP_STRING_STOI, [units[units.length - 1]]);
|
|
1745
1745
|
const head = this.mkConcatOf(units.slice(0, -1), manager.sorts[seq]);
|
|
1746
1746
|
const headValue = this.mkSeq(OP_STRING_STOI, [head]);
|
|
1747
1747
|
const isHeadValid = this.mkGe(headValue, this.zero());
|
|
@@ -1791,24 +1791,20 @@ export class SeqRewriter {
|
|
|
1791
1791
|
if (isVisited) cache.set(expr, { isBounded: isValid, length: count });
|
|
1792
1792
|
return isVisited;
|
|
1793
1793
|
} else if (this.isOp(expr, OP_ITE)) {
|
|
1794
|
-
const size = pending.length;
|
|
1795
1794
|
const thenLength = cache.get(this.getArg(expr, 1));
|
|
1796
1795
|
const elseLength = cache.get(this.getArg(expr, 2));
|
|
1797
1796
|
if (thenLength === undefined) pending.push(this.getArg(expr, 1));
|
|
1798
1797
|
if (elseLength === undefined) pending.push(this.getArg(expr, 2));
|
|
1799
|
-
if (
|
|
1798
|
+
if (thenLength === undefined || elseLength === undefined) return false;
|
|
1800
1799
|
cache.set(expr, {
|
|
1801
1800
|
isBounded:
|
|
1802
|
-
thenLength
|
|
1803
|
-
|
|
1804
|
-
thenLength!.length === elseLength!.length,
|
|
1805
|
-
length: Math.min(thenLength!.length, elseLength!.length),
|
|
1801
|
+
thenLength.isBounded && elseLength.isBounded && thenLength.length === elseLength.length,
|
|
1802
|
+
length: Math.min(thenLength.length, elseLength.length),
|
|
1806
1803
|
});
|
|
1807
1804
|
} else cache.set(expr, { isBounded: false, length: 0 });
|
|
1808
1805
|
return true;
|
|
1809
1806
|
};
|
|
1810
|
-
|
|
1811
|
-
const expr = todo.pop()!;
|
|
1807
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
1812
1808
|
const chars = manager.getString(expr);
|
|
1813
1809
|
if (this.isUnit(expr)) length++;
|
|
1814
1810
|
else if (this.isEmpty(expr)) continue;
|
|
@@ -1818,7 +1814,7 @@ export class SeqRewriter {
|
|
|
1818
1814
|
const thenExpr = this.getArg(expr, 1);
|
|
1819
1815
|
const elseExpr = this.getArg(expr, 2);
|
|
1820
1816
|
pending.push(thenExpr, elseExpr);
|
|
1821
|
-
while (pending.length > 0) if (visit(pending.
|
|
1817
|
+
while (pending.length > 0) if (visit(pending[pending.length - 1])) pending.pop();
|
|
1822
1818
|
const thenLength = cache.get(thenExpr) ?? { isBounded: false, length: 0 };
|
|
1823
1819
|
const elseLength = cache.get(elseExpr) ?? { isBounded: false, length: 0 };
|
|
1824
1820
|
if (
|
|
@@ -1837,8 +1833,7 @@ export class SeqRewriter {
|
|
|
1837
1833
|
const manager = this.manager;
|
|
1838
1834
|
const todo = [seq];
|
|
1839
1835
|
let length = 0n;
|
|
1840
|
-
|
|
1841
|
-
const expr = todo.pop()!;
|
|
1836
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
1842
1837
|
const chars = manager.getString(expr);
|
|
1843
1838
|
if (this.isUnit(expr) || this.isApp(expr, OP_SEQ_AT, 2)) length += 1n;
|
|
1844
1839
|
else if (chars !== undefined) length += BigInt(chars.length);
|
|
@@ -2038,8 +2033,7 @@ export class SeqRewriter {
|
|
|
2038
2033
|
const manager = this.manager;
|
|
2039
2034
|
const elements: number[] = [];
|
|
2040
2035
|
const todo = [seq];
|
|
2041
|
-
|
|
2042
|
-
const expr = todo.pop()!;
|
|
2036
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
2043
2037
|
if (this.isOp(expr, OP_SEQ_CONCAT)) {
|
|
2044
2038
|
todo.push(...manager.getArgs(expr));
|
|
2045
2039
|
continue;
|
|
@@ -2115,10 +2109,13 @@ export class SeqRewriter {
|
|
|
2115
2109
|
private reduceBack(pair: SeqPair, eqs: EqPair[]) {
|
|
2116
2110
|
const manager = this.manager;
|
|
2117
2111
|
while (pair.left.length > 0 && pair.right.length > 0) {
|
|
2118
|
-
if (
|
|
2112
|
+
if (
|
|
2113
|
+
this.isUnit(pair.right[pair.right.length - 1]) &&
|
|
2114
|
+
manager.getString(pair.left[pair.left.length - 1]) !== undefined
|
|
2115
|
+
)
|
|
2119
2116
|
this.swap(pair);
|
|
2120
|
-
const left = pair.left.
|
|
2121
|
-
const right = pair.right.
|
|
2117
|
+
const left = pair.left[pair.left.length - 1];
|
|
2118
|
+
const right = pair.right[pair.right.length - 1];
|
|
2122
2119
|
const rightChars = manager.getString(right);
|
|
2123
2120
|
const leftChars = manager.getString(left);
|
|
2124
2121
|
if (left === right) {
|
|
@@ -2130,7 +2127,10 @@ export class SeqRewriter {
|
|
|
2130
2127
|
pair.left.pop();
|
|
2131
2128
|
pair.right.pop();
|
|
2132
2129
|
} else if (this.isUnit(left) && rightChars !== undefined) {
|
|
2133
|
-
eqs.push({
|
|
2130
|
+
eqs.push({
|
|
2131
|
+
left: manager.mkChar(rightChars[rightChars.length - 1]),
|
|
2132
|
+
right: this.getArg(left, 0),
|
|
2133
|
+
});
|
|
2134
2134
|
pair.left.pop();
|
|
2135
2135
|
if (rightChars.length === 1) pair.right.pop();
|
|
2136
2136
|
else pair.right[pair.right.length - 1] = manager.mkString(rightChars.slice(0, -1));
|
|
@@ -2231,7 +2231,7 @@ export class SeqRewriter {
|
|
|
2231
2231
|
for (const expr of right) {
|
|
2232
2232
|
const index = remaining.indexOf(expr);
|
|
2233
2233
|
if (index !== -1) {
|
|
2234
|
-
remaining[index] = remaining.
|
|
2234
|
+
remaining[index] = remaining[remaining.length - 1];
|
|
2235
2235
|
remaining.pop();
|
|
2236
2236
|
continue;
|
|
2237
2237
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_skolem.cpp, src/ast/seq/seq_skolem.h), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
OP_SEQ_CONCAT,
|
|
@@ -49,10 +48,6 @@ export class SeqSkolem {
|
|
|
49
48
|
return this.manager.mkNumeral(BigInt(value));
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
mkAlign(args: number[]) {
|
|
53
|
-
return this.mk("seq.align", args);
|
|
54
|
-
}
|
|
55
|
-
|
|
56
51
|
mkAlignL(args: number[]) {
|
|
57
52
|
return this.mk("seq.align.l", args);
|
|
58
53
|
}
|
|
@@ -202,12 +197,6 @@ export class SeqSkolem {
|
|
|
202
197
|
return this.isNamed(expr, TAIL);
|
|
203
198
|
}
|
|
204
199
|
|
|
205
|
-
getTailIndex(expr: number) {
|
|
206
|
-
if (!this.isTail(expr)) return undefined;
|
|
207
|
-
const index = this.manager.getNumeral(this.manager.getArg(expr, 1));
|
|
208
|
-
return index !== undefined && index >= 0n && index <= 0xffffffffn ? Number(index) : undefined;
|
|
209
|
-
}
|
|
210
|
-
|
|
211
200
|
isSeqFirst(expr: number) {
|
|
212
201
|
return this.isNamed(expr, SEQ_FIRST);
|
|
213
202
|
}
|
|
@@ -232,10 +221,6 @@ export class SeqSkolem {
|
|
|
232
221
|
return this.isNamed(expr, EQ) && this.manager.getNumArgs(expr) === 2;
|
|
233
222
|
}
|
|
234
223
|
|
|
235
|
-
isDigit(expr: number) {
|
|
236
|
-
return this.isNamed(expr, "seq.is_digit");
|
|
237
|
-
}
|
|
238
|
-
|
|
239
224
|
isMaxUnfolding(expr: number) {
|
|
240
225
|
return this.isNamed(expr, MAX_UNFOLDING);
|
|
241
226
|
}
|
|
@@ -258,15 +243,6 @@ export class SeqSkolem {
|
|
|
258
243
|
return this.isNamed(expr, "seq.align.r");
|
|
259
244
|
}
|
|
260
245
|
|
|
261
|
-
isRegexSkolem(expr: number) {
|
|
262
|
-
return (
|
|
263
|
-
this.isNamed(expr, ACCEPT) ||
|
|
264
|
-
this.isNamed(expr, "re.is_empty") ||
|
|
265
|
-
this.isNamed(expr, "re.is_non_empty") ||
|
|
266
|
-
this.isNamed(expr, "aut.step")
|
|
267
|
-
);
|
|
268
|
-
}
|
|
269
|
-
|
|
270
246
|
decompose(input: number): Decomposition {
|
|
271
247
|
const manager = this.manager;
|
|
272
248
|
const mkNthUnit = (seq: number, index: number | bigint) =>
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_view_witness.cpp, src/ast/seq/seq_view_witness.h,
|
|
2
|
-
// src/ast/seq/seq_view.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, OP_SEQ_UNIT } from "./ast";
|
|
4
2
|
import { GuardSet, GuardSetCache } from "./guard-set";
|
|
5
3
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -10,12 +8,12 @@ import type { ReRewriter } from "./seq-re-rewriter";
|
|
|
10
8
|
import { isReEmpty } from "./seq-re-util";
|
|
11
9
|
|
|
12
10
|
export const VIEW_FAILURE_NONE = 0;
|
|
13
|
-
|
|
11
|
+
const VIEW_FAILURE_UNSUPPORTED = 1;
|
|
14
12
|
export const VIEW_FAILURE_BUDGET = 2;
|
|
15
13
|
export const VIEW_FAILURE_RESOURCE = 3;
|
|
16
14
|
export const VIEW_FAILURE_STATE_EXPANSION = 4;
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const VIEW_FAILURE_NULLABILITY = 5;
|
|
16
|
+
const VIEW_FAILURE_GUARD = 6;
|
|
19
17
|
|
|
20
18
|
const INNER_LIMIT = 1 << 16;
|
|
21
19
|
const RANGE_CACHE_CAP = 1 << 16;
|
|
@@ -26,7 +24,7 @@ interface IntervalList {
|
|
|
26
24
|
isOk: boolean;
|
|
27
25
|
}
|
|
28
26
|
|
|
29
|
-
|
|
27
|
+
interface ProductResult {
|
|
30
28
|
status: number;
|
|
31
29
|
word: number;
|
|
32
30
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_consequences.cpp, src/smt/smt_solver.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import { KIND_APP, OP_DT_IS, OP_DT_RECOGNISER, OP_EQ, OP_IMPLIES, OP_NOT, SORT_BOOL } from "./ast";
|
|
5
3
|
import { BinJustification, CLS_AUX } from "./clause";
|
|
@@ -241,7 +239,7 @@ class ConsequenceFinder {
|
|
|
241
239
|
const result = kernel.check(assumptions);
|
|
242
240
|
if (result !== L_TRUE) return result;
|
|
243
241
|
if (context.qmanager.hasQuantifiers()) return L_UNDEF;
|
|
244
|
-
const model = context.
|
|
242
|
+
const model = context.getSatModel();
|
|
245
243
|
for (const variable of vars) {
|
|
246
244
|
const value = model.eval(variable, false);
|
|
247
245
|
trail.pushOwned(value);
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
import { SmtCanceledError } from "../../../errors";
|
|
1
|
+
import { SmtDefaultError } from "../../../errors";
|
|
4
2
|
import { type AstManager } from "./ast";
|
|
5
3
|
import type { SmtSetup } from "./smt-setup";
|
|
6
4
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
7
5
|
import { Context } from "./context";
|
|
6
|
+
import { L_TRUE } from "./lbool";
|
|
7
|
+
import { Mus } from "./mus";
|
|
8
|
+
import { RefVector } from "./ref-vector";
|
|
8
9
|
import type { KernelParams } from "./solver";
|
|
9
10
|
|
|
10
11
|
export class SmtKernel {
|
|
11
12
|
readonly context: Context;
|
|
12
13
|
private asserted: AssertedFormulas;
|
|
13
|
-
|
|
14
|
+
isSetUp = false;
|
|
14
15
|
private setup: SmtSetup | undefined;
|
|
16
|
+
private isCoreMinimizing: boolean;
|
|
17
|
+
private scopeCount = 0;
|
|
15
18
|
|
|
16
19
|
constructor(manager: AstManager, params: KernelParams) {
|
|
17
20
|
this.asserted = new AssertedFormulas(manager, params.isFindingMacros);
|
|
@@ -19,14 +22,23 @@ export class SmtKernel {
|
|
|
19
22
|
isMbqi: params.isMbqi,
|
|
20
23
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
21
24
|
relevancyLevel: params.relevancyLevel ?? 2,
|
|
25
|
+
randomSeed: params.randomSeed,
|
|
22
26
|
});
|
|
23
27
|
this.setup = params.setup;
|
|
28
|
+
this.isCoreMinimizing = params.isCoreMinimizing ?? false;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
// As in Z3, a kernel not yet set up reads auto_config again.
|
|
32
|
+
updateParams(params: KernelParams) {
|
|
33
|
+
if (!this.isSetUp) this.setup = params.setup;
|
|
34
|
+
this.isCoreMinimizing = params.isCoreMinimizing ?? false;
|
|
35
|
+
this.context.updateParams(params);
|
|
36
|
+
this.asserted.updateParams(this.context.config);
|
|
24
37
|
}
|
|
25
38
|
|
|
26
39
|
private setupContext(isUsingStaticFeatures: boolean) {
|
|
27
40
|
if (this.isSetUp) return;
|
|
28
|
-
this.isSetUp =
|
|
29
|
-
this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
41
|
+
this.isSetUp = this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
30
42
|
}
|
|
31
43
|
|
|
32
44
|
// context::copy sets up and internalizes a copy as soon as it makes it.
|
|
@@ -39,7 +51,9 @@ export class SmtKernel {
|
|
|
39
51
|
this.asserted.isPreprocessing = isPreprocessing;
|
|
40
52
|
}
|
|
41
53
|
|
|
54
|
+
// context::assert_expr_core counts a step, and drops the formula once the limit is spent.
|
|
42
55
|
assertExpr(expr: number) {
|
|
56
|
+
if (this.context.checkCanceled()) return;
|
|
43
57
|
this.context.popToBaseLevel();
|
|
44
58
|
this.asserted.assertExpr(expr);
|
|
45
59
|
}
|
|
@@ -48,15 +62,19 @@ export class SmtKernel {
|
|
|
48
62
|
const context = this.context;
|
|
49
63
|
context.popToBaseLevel();
|
|
50
64
|
this.setupContext(false);
|
|
65
|
+
const wasConsistent = !context.isInconsistent();
|
|
51
66
|
context.internalizeAssertions(this.asserted);
|
|
52
67
|
const limit = context.manager.limit;
|
|
53
|
-
if (!limit.inc()) throw new
|
|
68
|
+
if (!limit.inc()) throw new SmtDefaultError("push canceled");
|
|
54
69
|
const wasSuspended = limit.isSuspended;
|
|
55
70
|
limit.isSuspended = true;
|
|
56
71
|
if (!context.isInconsistent()) context.propagate();
|
|
72
|
+
if (wasConsistent && context.isInconsistent() && !this.asserted.isInconsistent)
|
|
73
|
+
context.resolveConflict();
|
|
57
74
|
limit.isSuspended = wasSuspended;
|
|
58
75
|
context.push();
|
|
59
76
|
this.asserted.push();
|
|
77
|
+
this.scopeCount++;
|
|
60
78
|
}
|
|
61
79
|
|
|
62
80
|
getAssertions() {
|
|
@@ -64,8 +82,11 @@ export class SmtKernel {
|
|
|
64
82
|
}
|
|
65
83
|
|
|
66
84
|
pop(numScopes: number) {
|
|
67
|
-
|
|
68
|
-
|
|
85
|
+
const count = Math.min(numScopes, this.scopeCount);
|
|
86
|
+
if (count === 0) return;
|
|
87
|
+
this.context.pop(count);
|
|
88
|
+
for (let index = 0; index < count; index++) this.asserted.pop();
|
|
89
|
+
this.scopeCount -= count;
|
|
69
90
|
}
|
|
70
91
|
|
|
71
92
|
initAssumptions(assumptions: number[]) {
|
|
@@ -82,4 +103,22 @@ export class SmtKernel {
|
|
|
82
103
|
this.setupContext(true);
|
|
83
104
|
return this.check();
|
|
84
105
|
}
|
|
106
|
+
|
|
107
|
+
getUnsatCore(core: RefVector) {
|
|
108
|
+
for (const expr of this.context.unsatCore) core.push(expr);
|
|
109
|
+
if (!this.isCoreMinimizing) return;
|
|
110
|
+
const manager = this.context.manager;
|
|
111
|
+
const mus = new Mus(manager, {
|
|
112
|
+
checkSat: (assumptions) => this.check(assumptions),
|
|
113
|
+
getUnsatCore: () => this.context.unsatCore,
|
|
114
|
+
});
|
|
115
|
+
for (const literal of core.items) mus.addSoft(literal);
|
|
116
|
+
const minimized = new RefVector(manager);
|
|
117
|
+
if (mus.getMus(minimized) === L_TRUE) {
|
|
118
|
+
core.reset();
|
|
119
|
+
for (const literal of minimized.items) core.push(literal);
|
|
120
|
+
}
|
|
121
|
+
minimized.reset();
|
|
122
|
+
mus.reset();
|
|
123
|
+
}
|
|
85
124
|
}
|