tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,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;
|
|
@@ -47,7 +44,7 @@ export interface SeqAxiomsHost {
|
|
|
47
44
|
pushTrail(undo: () => void): void;
|
|
48
45
|
}
|
|
49
46
|
|
|
50
|
-
const getMinLengthOf = (manager: AstManager, seq: number): number => {
|
|
47
|
+
export const getMinLengthOf = (manager: AstManager, seq: number): number => {
|
|
51
48
|
const getLength = (expr: number) =>
|
|
52
49
|
manager.getOp(expr) === OP_SEQ_UNIT ? 1 : (manager.getString(expr)?.length ?? 0);
|
|
53
50
|
let result = 0;
|
|
@@ -63,7 +60,7 @@ 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);
|
|
@@ -90,8 +87,6 @@ export const getMaxLengthOf = (manager: AstManager, seq: number): number => {
|
|
|
90
87
|
return add(getLength(current), result);
|
|
91
88
|
};
|
|
92
89
|
|
|
93
|
-
export { getMinLengthOf };
|
|
94
|
-
|
|
95
90
|
export class SeqAxioms {
|
|
96
91
|
readonly skolem: SeqSkolem;
|
|
97
92
|
private purified = new Map<number, number>();
|
|
@@ -183,13 +178,8 @@ export class SeqAxioms {
|
|
|
183
178
|
return result;
|
|
184
179
|
}
|
|
185
180
|
|
|
186
|
-
|
|
187
|
-
return this.host.rewrite(this.mkSeq(OP_SEQ_LENGTH, [seq]));
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
private purify(expr: number | undefined) {
|
|
181
|
+
private purify(expr: number) {
|
|
191
182
|
const manager = this.manager;
|
|
192
|
-
if (expr === undefined) return undefined;
|
|
193
183
|
if (manager.depths[expr] === 1 || manager.isValue(expr)) return expr;
|
|
194
184
|
if (this.host.rewrite(expr) === expr) return expr;
|
|
195
185
|
let result = this.purified.get(expr);
|
|
@@ -259,9 +249,9 @@ export class SeqAxioms {
|
|
|
259
249
|
extractAxiom(expr: number) {
|
|
260
250
|
const manager = this.manager;
|
|
261
251
|
const [seqArg, indexArg, lengthArg] = manager.getArgs(expr);
|
|
262
|
-
const seq = this.purify(seqArg)
|
|
263
|
-
const index = this.purify(indexArg)
|
|
264
|
-
const length = this.purify(lengthArg)
|
|
252
|
+
const seq = this.purify(seqArg);
|
|
253
|
+
const index = this.purify(indexArg);
|
|
254
|
+
const length = this.purify(lengthArg);
|
|
265
255
|
if (this.smallSegmentAxiom(expr, seqArg, indexArg, lengthArg)) return;
|
|
266
256
|
if (this.isTail(seq, indexArg, lengthArg)) {
|
|
267
257
|
this.tailAxiom(expr, seq);
|
|
@@ -439,9 +429,9 @@ export class SeqAxioms {
|
|
|
439
429
|
const args = manager.getArgs(index);
|
|
440
430
|
const minusOne = this.mkInt(-1);
|
|
441
431
|
const zero = this.mkInt(0);
|
|
442
|
-
const offset = this.purify(args[2]);
|
|
443
|
-
const pattern = this.purify(args[1])
|
|
444
|
-
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]);
|
|
445
435
|
const contains = this.mkSeq(OP_SEQ_CONTAINS, [text, pattern]);
|
|
446
436
|
const isMinusOne = this.mkEq(index, minusOne);
|
|
447
437
|
const isZero = this.mkEq(index, zero);
|
|
@@ -514,8 +504,8 @@ export class SeqAxioms {
|
|
|
514
504
|
lastIndexofAxiom(index: number) {
|
|
515
505
|
const manager = this.manager;
|
|
516
506
|
const [textArg, patternArg] = manager.getArgs(index);
|
|
517
|
-
const text = this.purify(textArg)
|
|
518
|
-
const pattern = this.purify(patternArg)
|
|
507
|
+
const text = this.purify(textArg);
|
|
508
|
+
const pattern = this.purify(patternArg);
|
|
519
509
|
const minusOne = this.mkInt(-1);
|
|
520
510
|
const zero = this.mkInt(0);
|
|
521
511
|
const skolem = this.skolem;
|
|
@@ -542,9 +532,9 @@ export class SeqAxioms {
|
|
|
542
532
|
replaceAxiom(replace: number) {
|
|
543
533
|
const manager = this.manager;
|
|
544
534
|
const [source, patternArg, targetArg] = manager.getArgs(replace);
|
|
545
|
-
const text = this.purify(source)
|
|
546
|
-
const pattern = this.purify(patternArg)
|
|
547
|
-
const target = this.purify(targetArg)
|
|
535
|
+
const text = this.purify(source);
|
|
536
|
+
const pattern = this.purify(patternArg);
|
|
537
|
+
const target = this.purify(targetArg);
|
|
548
538
|
const skolem = this.skolem;
|
|
549
539
|
const left = skolem.mkIndexofLeft(text, pattern);
|
|
550
540
|
const right = skolem.mkIndexofRight(text, pattern);
|
|
@@ -568,8 +558,8 @@ export class SeqAxioms {
|
|
|
568
558
|
atAxiom(expr: number) {
|
|
569
559
|
const manager = this.manager;
|
|
570
560
|
const [seqArg, indexArg] = manager.getArgs(expr);
|
|
571
|
-
const seq = this.purify(seqArg)
|
|
572
|
-
const index = this.purify(indexArg)
|
|
561
|
+
const seq = this.purify(seqArg);
|
|
562
|
+
const index = this.purify(indexArg);
|
|
573
563
|
this.mkInt(0);
|
|
574
564
|
const one = this.mkInt(1);
|
|
575
565
|
const empty = this.mkEmpty(manager.sorts[expr]);
|
|
@@ -750,8 +740,8 @@ export class SeqAxioms {
|
|
|
750
740
|
ltAxiom(expr: number) {
|
|
751
741
|
const manager = this.manager;
|
|
752
742
|
const [firstArg, secondArg] = manager.getArgs(expr);
|
|
753
|
-
const first = this.purify(firstArg)
|
|
754
|
-
const second = this.purify(secondArg)
|
|
743
|
+
const first = this.purify(firstArg);
|
|
744
|
+
const second = this.purify(secondArg);
|
|
755
745
|
const charSort = manager.getSeqElementSort(manager.sorts[first]);
|
|
756
746
|
const lt = expr;
|
|
757
747
|
const gt = this.mkSeq(OP_STRING_LT, [second, first]);
|
|
@@ -898,8 +888,8 @@ export class SeqAxioms {
|
|
|
898
888
|
private affixAxiom(expr: number, name: string, isPrefix: boolean) {
|
|
899
889
|
const manager = this.manager;
|
|
900
890
|
const [firstArg, secondArg] = manager.getArgs(expr);
|
|
901
|
-
const first = this.purify(firstArg)
|
|
902
|
-
const second = this.purify(secondArg)
|
|
891
|
+
const first = this.purify(firstArg);
|
|
892
|
+
const second = this.purify(secondArg);
|
|
903
893
|
const firstLength = this.mkLenAxiom(first);
|
|
904
894
|
const secondLength = this.mkLenAxiom(second);
|
|
905
895
|
const isLonger = this.mkGe(this.mkSub(firstLength, secondLength), 1);
|
|
@@ -1002,12 +992,4 @@ export class SeqAxioms {
|
|
|
1002
992
|
this.addClause([this.mkNot(tracker), this.mkLe(this.mkLenAxiom(target), limit)]);
|
|
1003
993
|
return tracker;
|
|
1004
994
|
}
|
|
1005
|
-
|
|
1006
|
-
ubvAxiom(): never {
|
|
1007
|
-
throw new SmtUnsupportedError("str.from_ubv in the theory of sequences");
|
|
1008
|
-
}
|
|
1009
|
-
|
|
1010
|
-
isItos(expr: number) {
|
|
1011
|
-
return this.manager.getOp(expr) === OP_STRING_ITOS;
|
|
1012
|
-
}
|
|
1013
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);
|
|
@@ -444,13 +443,14 @@ const getEmptyReSignature = (
|
|
|
444
443
|
kind: number,
|
|
445
444
|
op: number,
|
|
446
445
|
reglanName: string,
|
|
446
|
+
domain: readonly number[],
|
|
447
447
|
range: number | undefined,
|
|
448
448
|
) => {
|
|
449
449
|
const reglan = manager.mkReSort(manager.mkStringSort());
|
|
450
450
|
const rng = range ?? reglan;
|
|
451
|
-
if (rng !== reglan) return mkSignature(op, getPsig(op).name,
|
|
452
|
-
const matched = match(manager, getPsig(kind),
|
|
453
|
-
return typeof matched === "string" ? matched : mkSignature(op, reglanName,
|
|
451
|
+
if (kind === op && rng !== reglan) return mkSignature(op, getPsig(op).name, domain, rng);
|
|
452
|
+
const matched = match(manager, getPsig(kind), domain, rng);
|
|
453
|
+
return typeof matched === "string" ? matched : mkSignature(op, reglanName, domain, matched);
|
|
454
454
|
};
|
|
455
455
|
|
|
456
456
|
const getCharSignature = (
|
|
@@ -569,13 +569,11 @@ export const getSeqSignature = (
|
|
|
569
569
|
return mkSignature(kind, name, domain, manager.mkStringSort());
|
|
570
570
|
}
|
|
571
571
|
case OP_INTERNAL_REGEXP_FULL_CHAR:
|
|
572
|
-
return getEmptyReSignature(manager, kind, OP_RE_FULL_CHAR_SET, "re.allchar", range);
|
|
573
572
|
case OP_RE_FULL_CHAR_SET:
|
|
574
|
-
return getEmptyReSignature(manager, kind, OP_RE_FULL_CHAR_SET, "re.allchar", range);
|
|
573
|
+
return getEmptyReSignature(manager, kind, OP_RE_FULL_CHAR_SET, "re.allchar", domain, range);
|
|
575
574
|
case OP_INTERNAL_REGEXP_EMPTY:
|
|
576
|
-
return getEmptyReSignature(manager, kind, OP_RE_EMPTY_SET, "re.none", range);
|
|
577
575
|
case OP_RE_EMPTY_SET:
|
|
578
|
-
return getEmptyReSignature(manager, kind, OP_RE_EMPTY_SET, "re.none", range);
|
|
576
|
+
return getEmptyReSignature(manager, kind, OP_RE_EMPTY_SET, "re.none", domain, range);
|
|
579
577
|
case OP_RE_FULL_SEQ_SET:
|
|
580
578
|
return mkSignature(kind, "re.all", domain, range ?? manager.mkReSort(manager.mkStringSort()));
|
|
581
579
|
case OP_RE_LOOP: {
|
|
@@ -617,7 +615,6 @@ export const getSeqSignature = (
|
|
|
617
615
|
return typeof rng === "string" ? rng : mkSignature(kind, getPsig(kind).name, domain, rng);
|
|
618
616
|
}
|
|
619
617
|
case OP_SEQ_CONCAT:
|
|
620
|
-
return getAssocFun(manager, kind, OP_SEQ_CONCAT, domain, range, 1);
|
|
621
618
|
case OP_INTERNAL_STRING_CONCAT:
|
|
622
619
|
return getAssocFun(manager, kind, OP_SEQ_CONCAT, domain, range, 1);
|
|
623
620
|
case OP_INTERNAL_STRING_FROM_CHAR:
|
|
@@ -633,7 +630,7 @@ export const getSeqSignature = (
|
|
|
633
630
|
}
|
|
634
631
|
};
|
|
635
632
|
|
|
636
|
-
|
|
633
|
+
const getStringConstSignature = (manager: AstManager, chars: readonly number[]) => {
|
|
637
634
|
const id = manager.mkStringValueId(chars);
|
|
638
635
|
return mkSignature(
|
|
639
636
|
OP_STRING_CONST,
|
|
@@ -765,7 +762,7 @@ export const mkConcatOf = (manager: AstManager, args: readonly number[], sort: n
|
|
|
765
762
|
? args[0]
|
|
766
763
|
: mkSeqApp(manager, OP_SEQ_CONCAT, [...args]);
|
|
767
764
|
|
|
768
|
-
|
|
765
|
+
const mkUnitChar = (manager: AstManager, code: number) =>
|
|
769
766
|
mkSeqApp(manager, OP_SEQ_UNIT, [manager.mkChar(code)]);
|
|
770
767
|
|
|
771
768
|
export const isEmptySeq = (manager: AstManager, expr: number) =>
|
|
@@ -776,8 +773,7 @@ export const isBinaryApp = (manager: AstManager, expr: number, op: number) =>
|
|
|
776
773
|
|
|
777
774
|
export const getConcat = (manager: AstManager, expr: number, result: number[]) => {
|
|
778
775
|
const todo = [expr];
|
|
779
|
-
|
|
780
|
-
const current = todo.pop()!;
|
|
776
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
781
777
|
if (isBinaryApp(manager, current, OP_SEQ_CONCAT)) {
|
|
782
778
|
todo.push(manager.getArg(current, 1), manager.getArg(current, 0));
|
|
783
779
|
continue;
|
|
@@ -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
|
|
|
@@ -177,7 +175,8 @@ export class Derive {
|
|
|
177
175
|
}
|
|
178
176
|
|
|
179
177
|
private reset() {
|
|
180
|
-
|
|
178
|
+
// Deviation from Z3: the xor caches go too, as the trail was all that kept their results alive.
|
|
179
|
+
for (const cache of [...this.caches, ...this.topCaches, ...this.xorCaches]) cache.clear();
|
|
181
180
|
this.resetOpCaches();
|
|
182
181
|
this.trail.reset();
|
|
183
182
|
this.element = assign(this.manager, this.element, -1);
|
|
@@ -261,7 +260,8 @@ export class Derive {
|
|
|
261
260
|
}
|
|
262
261
|
if (isReBinary(manager, regex, OP_RE_XOR)) {
|
|
263
262
|
const firstNullable = this.isNullable(first);
|
|
264
|
-
|
|
263
|
+
const secondNullable = this.isNullable(second);
|
|
264
|
+
return bool.mkEq(bool.mkNot(firstNullable), secondNullable);
|
|
265
265
|
}
|
|
266
266
|
const loop = getLoopLower(manager, regex) ?? getLoopBounds(manager, regex);
|
|
267
267
|
if (
|
|
@@ -638,8 +638,7 @@ export class Derive {
|
|
|
638
638
|
if (isFullSeq(manager, first) || isFullSeq(manager, second)) return mkFullSeq(manager, sort);
|
|
639
639
|
const elements: number[] = [];
|
|
640
640
|
const todo = [second, first];
|
|
641
|
-
|
|
642
|
-
const expr = todo.pop()!;
|
|
641
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
643
642
|
if (isReBinary(manager, expr, OP_RE_UNION)) {
|
|
644
643
|
todo.push(manager.getArg(expr, 1), manager.getArg(expr, 0));
|
|
645
644
|
continue;
|
|
@@ -1243,11 +1242,9 @@ export class Derive {
|
|
|
1243
1242
|
}
|
|
1244
1243
|
|
|
1245
1244
|
derivativeCofactors(regex: number, result: RefVector) {
|
|
1246
|
-
const
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
const derivative = this.derive(DERIVATIVE_BRZOZOWSKI, element, regex);
|
|
1250
|
-
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);
|
|
1251
1248
|
}
|
|
1252
1249
|
|
|
1253
1250
|
lightAntDerivativeCofactors(regex: number, result: RefVector) {
|
|
@@ -1270,8 +1267,7 @@ export class Derive {
|
|
|
1270
1267
|
for (let pair = 0; pair < brzozowski.size; pair += 2) {
|
|
1271
1268
|
const guard = brzozowski.items[pair];
|
|
1272
1269
|
const pending = [brzozowski.items[pair + 1]];
|
|
1273
|
-
|
|
1274
|
-
const target = pending.pop()!;
|
|
1270
|
+
for (let target = pending.pop(); target !== undefined; target = pending.pop()) {
|
|
1275
1271
|
if (isReBinary(manager, target, OP_RE_UNION)) {
|
|
1276
1272
|
pending.push(manager.getArg(target, 1), manager.getArg(target, 0));
|
|
1277
1273
|
continue;
|
|
@@ -1285,8 +1281,7 @@ export class Derive {
|
|
|
1285
1281
|
}
|
|
1286
1282
|
const tail = manager.getArg(target, 1);
|
|
1287
1283
|
const heads = [manager.getArg(target, 0)];
|
|
1288
|
-
|
|
1289
|
-
const current = heads.pop()!;
|
|
1284
|
+
for (let current = heads.pop(); current !== undefined; current = heads.pop()) {
|
|
1290
1285
|
if (isReBinary(manager, current, OP_RE_UNION))
|
|
1291
1286
|
heads.push(manager.getArg(current, 1), manager.getArg(current, 0));
|
|
1292
1287
|
else add(guard, this.re.mkReAppend(current, tail));
|
|
@@ -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;
|
|
@@ -311,7 +310,7 @@ export class SeqEqSolver {
|
|
|
311
310
|
}
|
|
312
311
|
|
|
313
312
|
private matchTernaryEqR(ls: readonly number[], rs: readonly number[]): TernaryEq | undefined {
|
|
314
|
-
if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs.
|
|
313
|
+
if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs[rs.length - 1]))
|
|
315
314
|
return undefined;
|
|
316
315
|
const numLsUnits = this.countUnitsR2l(ls, ls.length - 1);
|
|
317
316
|
if (numLsUnits === 0 || numLsUnits === ls.length) return undefined;
|
|
@@ -334,7 +333,7 @@ export class SeqEqSolver {
|
|
|
334
333
|
}
|
|
335
334
|
|
|
336
335
|
private matchTernaryEqL(ls: readonly number[], rs: readonly number[]): TernaryEq | undefined {
|
|
337
|
-
if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs.
|
|
336
|
+
if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs[rs.length - 1]))
|
|
338
337
|
return undefined;
|
|
339
338
|
const numLsUnits = this.countUnitsL2r(ls, 0);
|
|
340
339
|
if (numLsUnits === 0 || numLsUnits === ls.length) return undefined;
|
|
@@ -360,11 +359,11 @@ export class SeqEqSolver {
|
|
|
360
359
|
ls.length > 1 &&
|
|
361
360
|
this.isVar(ls[0]) &&
|
|
362
361
|
rs.length > 1 &&
|
|
363
|
-
this.isVar(rs.
|
|
362
|
+
this.isVar(rs[rs.length - 1]) &&
|
|
364
363
|
ls.slice(1).every((expr) => this.isUnit(expr)) &&
|
|
365
364
|
rs.slice(0, -1).every((expr) => this.isUnit(expr))
|
|
366
365
|
)
|
|
367
|
-
return { x: ls[0], y: rs.
|
|
366
|
+
return { x: ls[0], y: rs[rs.length - 1], xs: ls.slice(1), ys: rs.slice(0, -1) };
|
|
368
367
|
return undefined;
|
|
369
368
|
}
|
|
370
369
|
|
|
@@ -380,10 +379,10 @@ export class SeqEqSolver {
|
|
|
380
379
|
if (
|
|
381
380
|
ls.length <= 1 ||
|
|
382
381
|
!this.isVar(ls[0]) ||
|
|
383
|
-
!this.isVar(ls.
|
|
382
|
+
!this.isVar(ls[ls.length - 1]) ||
|
|
384
383
|
rs.length <= 1 ||
|
|
385
384
|
!this.isVar(rs[0]) ||
|
|
386
|
-
!this.isVar(rs.
|
|
385
|
+
!this.isVar(rs[rs.length - 1])
|
|
387
386
|
)
|
|
388
387
|
return undefined;
|
|
389
388
|
const lsNonUnit = this.countNonUnitsL2r(ls, 0);
|
|
@@ -404,7 +403,7 @@ export class SeqEqSolver {
|
|
|
404
403
|
|
|
405
404
|
canAlignFromLhs(ls: readonly number[], rs: readonly number[]) {
|
|
406
405
|
const manager = this.manager;
|
|
407
|
-
const last = rs.
|
|
406
|
+
const last = rs[rs.length - 1];
|
|
408
407
|
for (let index = 0; index < ls.length; index++) {
|
|
409
408
|
if (manager.areDistinct(ls[index], last)) continue;
|
|
410
409
|
if (index === 0) return true;
|
|
@@ -1,15 +1,13 @@
|
|
|
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
|
-
import type
|
|
2
|
+
import { type AstManager, OP_SEQ_TO_RE, OP_SEQ_UNIT } from "./ast";
|
|
4
3
|
import { mkConcatOf, mkSeqApp } from "./seq-decl-plugin";
|
|
5
|
-
import { OP_SEQ_TO_RE, OP_SEQ_UNIT } from "./ast";
|
|
6
4
|
|
|
7
5
|
interface ElementModel {
|
|
8
6
|
getFreshValue(sort: number): number | null;
|
|
9
7
|
getSomeValue(sort: number): number;
|
|
10
8
|
}
|
|
11
9
|
|
|
12
|
-
|
|
10
|
+
const encodeZstring = (chars: readonly number[]) =>
|
|
13
11
|
chars
|
|
14
12
|
.map((char, index) =>
|
|
15
13
|
char < 32 || char >= 127 || (char === 92 && chars[index + 1] === 117)
|
|
@@ -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,7 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_range_predicate.cpp,
|
|
2
|
-
// src/ast/rewriter/seq_range_collapse.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
3
|
+
FAMILY_CHAR,
|
|
5
4
|
OP_AND,
|
|
6
5
|
OP_CHAR_LE,
|
|
7
6
|
OP_EQ,
|
|
@@ -10,6 +9,7 @@ import {
|
|
|
10
9
|
OP_RE_COMPLEMENT,
|
|
11
10
|
OP_RE_DIFF,
|
|
12
11
|
OP_RE_INTERSECT,
|
|
12
|
+
OP_RE_OF_PRED,
|
|
13
13
|
OP_SEQ_UNIT,
|
|
14
14
|
OP_RE_RANGE,
|
|
15
15
|
OP_RE_UNION,
|
|
@@ -28,11 +28,10 @@ export type RangePredicate = number[];
|
|
|
28
28
|
|
|
29
29
|
export const mkTopRange = (manager: AstManager): RangePredicate => [0, manager.maxChar];
|
|
30
30
|
|
|
31
|
-
|
|
31
|
+
const mkSingletonRange = (code: number): RangePredicate => [code, code];
|
|
32
32
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
};
|
|
33
|
+
const mkRangeOf = (lo: number, hi: number, maxChar: number): RangePredicate =>
|
|
34
|
+
lo <= hi && lo <= maxChar ? [lo, Math.min(hi, maxChar)] : [];
|
|
36
35
|
|
|
37
36
|
const appendMerged = (result: RangePredicate, lo: number, hi: number) => {
|
|
38
37
|
if (result.length > 0 && result[result.length - 1] + 1 >= lo) {
|
|
@@ -78,7 +77,7 @@ export const intersectRanges = (first: RangePredicate, second: RangePredicate) =
|
|
|
78
77
|
return result;
|
|
79
78
|
};
|
|
80
79
|
|
|
81
|
-
|
|
80
|
+
const complementRanges = (ranges: RangePredicate, maxChar: number) => {
|
|
82
81
|
const result: RangePredicate = [];
|
|
83
82
|
let cursor = 0;
|
|
84
83
|
for (let index = 0; index < ranges.length; index += 2) {
|
|
@@ -203,7 +202,18 @@ export const regexToRangePredicate = (
|
|
|
203
202
|
const pair = getPair(first, second);
|
|
204
203
|
return pair === undefined ? undefined : intersectRanges(pair[0], pair[1]);
|
|
205
204
|
}
|
|
206
|
-
|
|
205
|
+
if (!isReUnary(manager, regex, OP_RE_OF_PRED) || !manager.isLambda(manager.getArg(regex, 0)))
|
|
206
|
+
return undefined;
|
|
207
|
+
const lambda = manager.getQuantifier(manager.getArg(regex, 0));
|
|
208
|
+
if (lambda.sorts.length !== 1) return undefined;
|
|
209
|
+
const variable = manager.mkVar(0, lambda.sorts[0]);
|
|
210
|
+
manager.incRef(variable);
|
|
211
|
+
const ranges =
|
|
212
|
+
manager.getSortFamily(lambda.sorts[0]) === FAMILY_CHAR
|
|
213
|
+
? guardToRangePredicate(manager, variable, lambda.body)
|
|
214
|
+
: undefined;
|
|
215
|
+
manager.decRef(variable);
|
|
216
|
+
return ranges;
|
|
207
217
|
};
|
|
208
218
|
|
|
209
219
|
export const rangePredicateToRegex = (
|