tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-output.ts +3 -3
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +15 -1
- package/src/dependencies.ts +23 -2
- package/src/environment.ts +10 -5
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- 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 +8 -7
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +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.ts +2 -2
- package/src/parser.ts +151 -42
- 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 +6 -16
- 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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +0 -2
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +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 +1 -0
- 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 +1 -2
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +113 -157
- 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/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +14 -18
- 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 +0 -2
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +21 -12
- package/src/prover/smt/solver/ctx-simplify.ts +0 -1
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +7 -10
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +0 -1
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -16
- 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 +1 -7
- 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 +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +0 -2
- 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 +66 -44
- package/src/prover/smt/solver/euf/euf-solver.ts +37 -35
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +6 -50
- package/src/prover/smt/solver/euf/q-ematch.ts +26 -96
- 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 -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 +0 -1
- package/src/prover/smt/solver/factor.ts +1 -12
- package/src/prover/smt/solver/fd-solver.ts +1 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- 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 +13 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -7
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +0 -1
- package/src/prover/smt/solver/goal2nlsat.ts +0 -2
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +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 +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- 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 +25 -6
- 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 +0 -2
- 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 +97 -62
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +0 -1
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +13 -14
- 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 +0 -1
- 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 +0 -1
- 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 +0 -1
- package/src/prover/smt/solver/mus.ts +0 -1
- package/src/prover/smt/solver/muz/dl-context.ts +57 -15
- 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 +76 -14
- 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 +91 -55
- 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 +14 -5
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +109 -98
- 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 +3 -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 +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -4
- package/src/prover/smt/solver/nlsat/atoms.ts +0 -2
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +5 -1
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +2 -3
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat/solver.ts +47 -44
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +0 -2
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +0 -3
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +10 -10
- package/src/prover/smt/solver/opt-nlsat.ts +68 -59
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +16 -8
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +12 -11
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -26
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +3 -5
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +5 -6
- 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 +2 -3
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +45 -55
- 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 +0 -1
- 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 +33 -20
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +5 -8
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -14
- package/src/prover/smt/solver/sat/model-converter.ts +1 -21
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -25
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +0 -1
- 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 +15 -59
- package/src/prover/smt/solver/sat/solver.ts +22 -23
- 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 +1 -4
- package/src/prover/smt/solver/seq-decl-plugin.ts +9 -13
- package/src/prover/smt/solver/seq-derive.ts +8 -10
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -8
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +0 -2
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -129
- package/src/prover/smt/solver/seq-re-util.ts +7 -26
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +4 -6
- package/src/prover/smt/solver/seq-rewriter.ts +1 -6
- package/src/prover/smt/solver/seq-skolem.ts +0 -1
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +0 -2
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +0 -2
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1204 -582
- package/src/prover/smt/solver/smtlib-script.ts +868 -730
- package/src/prover/smt/solver/solve-eqs.ts +0 -2
- 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 +66 -16
- 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 +13 -52
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -1
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -6
- package/src/prover/smt/solver/theory-pb.ts +10 -8
- 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 +5 -7
- package/src/prover/smt/solver/theory-seq-state.ts +6 -15
- 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/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 +0 -2
- package/src/prover/zenon/expr.ts +0 -2
- package/src/prover/zenon/index-table.ts +0 -2
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +0 -2
- 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 +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- 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 +1 -2
- package/src/runtime.ts +4 -0
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +160 -36
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/typed-tier.ts +6535 -0
- 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,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/sat/sat_watched.h, src/sat/sat_watched.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
|
-
|
|
4
1
|
export const WATCH_BINARY = 0;
|
|
5
2
|
export const WATCH_CLAUSE = 1;
|
|
6
3
|
export const WATCH_EXT_CONSTRAINT = 2;
|
|
@@ -66,6 +63,13 @@ export class WatchList {
|
|
|
66
63
|
: this.data[2 * index + 1] & ~4;
|
|
67
64
|
}
|
|
68
65
|
|
|
66
|
+
numNonlearnedBin() {
|
|
67
|
+
let count = 0;
|
|
68
|
+
for (let index = 0; index < this.size; index++)
|
|
69
|
+
if (this.isBinary(index) && !this.isLearned(index)) count++;
|
|
70
|
+
return count;
|
|
71
|
+
}
|
|
72
|
+
|
|
69
73
|
getClause(index: number) {
|
|
70
74
|
return this.data[2 * index];
|
|
71
75
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq/seq_axioms.cpp, src/smt/seq_axioms.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -47,7 +46,7 @@ export interface SeqAxiomsHost {
|
|
|
47
46
|
pushTrail(undo: () => void): void;
|
|
48
47
|
}
|
|
49
48
|
|
|
50
|
-
const getMinLengthOf = (manager: AstManager, seq: number): number => {
|
|
49
|
+
export const getMinLengthOf = (manager: AstManager, seq: number): number => {
|
|
51
50
|
const getLength = (expr: number) =>
|
|
52
51
|
manager.getOp(expr) === OP_SEQ_UNIT ? 1 : (manager.getString(expr)?.length ?? 0);
|
|
53
52
|
let result = 0;
|
|
@@ -90,8 +89,6 @@ export const getMaxLengthOf = (manager: AstManager, seq: number): number => {
|
|
|
90
89
|
return add(getLength(current), result);
|
|
91
90
|
};
|
|
92
91
|
|
|
93
|
-
export { getMinLengthOf };
|
|
94
|
-
|
|
95
92
|
export class SeqAxioms {
|
|
96
93
|
readonly skolem: SeqSkolem;
|
|
97
94
|
private purified = new Map<number, number>();
|
|
@@ -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,
|
|
@@ -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,
|
|
@@ -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;
|
|
@@ -1247,6 +1246,7 @@ export class Derive {
|
|
|
1247
1246
|
const elementSort = manager.getSeqElementSort(manager.getReSeqSort(manager.sorts[regex]));
|
|
1248
1247
|
const element = manager.mkVar(0, elementSort);
|
|
1249
1248
|
const derivative = this.derive(DERIVATIVE_BRZOZOWSKI, element, regex);
|
|
1249
|
+
// Deviation from Z3: a cached derivative leaves m_ele null there, which stops the pruning.
|
|
1250
1250
|
this.getCofactors(element, derivative, result);
|
|
1251
1251
|
}
|
|
1252
1252
|
|
|
@@ -1270,8 +1270,7 @@ export class Derive {
|
|
|
1270
1270
|
for (let pair = 0; pair < brzozowski.size; pair += 2) {
|
|
1271
1271
|
const guard = brzozowski.items[pair];
|
|
1272
1272
|
const pending = [brzozowski.items[pair + 1]];
|
|
1273
|
-
|
|
1274
|
-
const target = pending.pop()!;
|
|
1273
|
+
for (let target = pending.pop(); target !== undefined; target = pending.pop()) {
|
|
1275
1274
|
if (isReBinary(manager, target, OP_RE_UNION)) {
|
|
1276
1275
|
pending.push(manager.getArg(target, 1), manager.getArg(target, 0));
|
|
1277
1276
|
continue;
|
|
@@ -1285,8 +1284,7 @@ export class Derive {
|
|
|
1285
1284
|
}
|
|
1286
1285
|
const tail = manager.getArg(target, 1);
|
|
1287
1286
|
const heads = [manager.getArg(target, 0)];
|
|
1288
|
-
|
|
1289
|
-
const current = heads.pop()!;
|
|
1287
|
+
for (let current = heads.pop(); current !== undefined; current = heads.pop()) {
|
|
1290
1288
|
if (isReBinary(manager, current, OP_RE_UNION))
|
|
1291
1289
|
heads.push(manager.getArg(current, 1), manager.getArg(current, 0));
|
|
1292
1290
|
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,
|
|
@@ -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,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 = (
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
5
4
|
FAMILY_SEQ,
|
|
6
5
|
OP_AND,
|
|
7
|
-
OP_CHAR_LE,
|
|
8
|
-
OP_EQ,
|
|
9
6
|
OP_GE,
|
|
10
7
|
OP_ITE,
|
|
11
8
|
OP_LT,
|
|
12
|
-
OP_NOT,
|
|
13
9
|
OP_OR,
|
|
14
10
|
OP_RE_COMPLEMENT,
|
|
15
11
|
OP_RE_CONCAT,
|
|
@@ -39,8 +35,6 @@ import {
|
|
|
39
35
|
OP_STRING_LE,
|
|
40
36
|
SORT_BOOL,
|
|
41
37
|
} from "./ast";
|
|
42
|
-
import { flattenAndVector } from "./ast-util";
|
|
43
|
-
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
44
38
|
import { L_FALSE, L_TRUE } from "./lbool";
|
|
45
39
|
import { RefVector } from "./ref-vector";
|
|
46
40
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
@@ -55,11 +49,9 @@ import {
|
|
|
55
49
|
uniteRanges,
|
|
56
50
|
} from "./seq-range-predicate";
|
|
57
51
|
import { RegexBisim } from "./seq-regex-bisim";
|
|
58
|
-
import { RegexWitness } from "./seq-regex-witness";
|
|
59
52
|
import {
|
|
60
53
|
UINT_MAX,
|
|
61
54
|
canBeMember,
|
|
62
|
-
getCharConstRange,
|
|
63
55
|
getLoopBounds,
|
|
64
56
|
getLoopLower,
|
|
65
57
|
getRangeChars,
|
|
@@ -408,7 +400,7 @@ export class ReRewriter {
|
|
|
408
400
|
return this.mkReAppend(tailReverse, headReverse);
|
|
409
401
|
}
|
|
410
402
|
|
|
411
|
-
mkRegexUnionNormalize(first: number, second: number) {
|
|
403
|
+
private mkRegexUnionNormalize(first: number, second: number) {
|
|
412
404
|
const manager = this.manager;
|
|
413
405
|
if (first === second || isReEmpty(manager, second) || isFullSeq(manager, first)) return first;
|
|
414
406
|
if (isReEmpty(manager, first) || isFullSeq(manager, second)) return second;
|
|
@@ -442,7 +434,7 @@ export class ReRewriter {
|
|
|
442
434
|
);
|
|
443
435
|
}
|
|
444
436
|
|
|
445
|
-
mkRegexInterNormalize(inputFirst: number, inputSecond: number) {
|
|
437
|
+
private mkRegexInterNormalize(inputFirst: number, inputSecond: number) {
|
|
446
438
|
const manager = this.manager;
|
|
447
439
|
const isSwapped = isEpsilon(manager, inputSecond);
|
|
448
440
|
const first = isSwapped ? inputSecond : inputFirst;
|
|
@@ -777,8 +769,7 @@ export class ReRewriter {
|
|
|
777
769
|
};
|
|
778
770
|
const isEveryInterArmEndingWithFullSeq = (regex: number) => {
|
|
779
771
|
const todo = [regex];
|
|
780
|
-
|
|
781
|
-
const current = todo.pop()!;
|
|
772
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
782
773
|
const split = this.getSplit(current, OP_RE_INTERSECT);
|
|
783
774
|
if (split !== undefined) todo.push(split.head, split.tail);
|
|
784
775
|
else if (!isEndingWithFullSeq(current)) return false;
|
|
@@ -1107,116 +1098,6 @@ export class ReRewriter {
|
|
|
1107
1098
|
return this.mkUnion(this.mkToRe(mkEmptySeq(this.manager, this.getSeqSort(regex))), regex);
|
|
1108
1099
|
}
|
|
1109
1100
|
|
|
1110
|
-
elimCondition(element: number, inputCondition: number) {
|
|
1111
|
-
const manager = this.manager;
|
|
1112
|
-
const maxChar = this.manager.maxChar;
|
|
1113
|
-
const conds = new RefVector(manager);
|
|
1114
|
-
const rangeConds = new RefVector(manager);
|
|
1115
|
-
conds.push(inputCondition);
|
|
1116
|
-
flattenAndVector(manager, conds);
|
|
1117
|
-
let isAllRanges = false;
|
|
1118
|
-
if (manager.isCharSort(manager.sorts[element])) {
|
|
1119
|
-
isAllRanges = true;
|
|
1120
|
-
let ranges = [0, maxChar];
|
|
1121
|
-
const intersect = (lo: number, hi: number, current: number[]) => {
|
|
1122
|
-
const result: number[] = [];
|
|
1123
|
-
for (let index = 0; index < current.length; index += 2) {
|
|
1124
|
-
if (hi < current[index]) break;
|
|
1125
|
-
if (current[index + 1] >= lo)
|
|
1126
|
-
result.push(Math.max(current[index], lo), Math.min(current[index + 1], hi));
|
|
1127
|
-
}
|
|
1128
|
-
return result;
|
|
1129
|
-
};
|
|
1130
|
-
const excludeRange = (lower: number, upper: number) => {
|
|
1131
|
-
if (lower === 0) ranges = upper === maxChar ? [] : intersect(upper + 1, maxChar, ranges);
|
|
1132
|
-
else if (upper === maxChar) ranges = intersect(0, lower - 1, ranges);
|
|
1133
|
-
else
|
|
1134
|
-
ranges = [...intersect(0, lower - 1, ranges), ...intersect(upper + 1, maxChar, ranges)];
|
|
1135
|
-
};
|
|
1136
|
-
const getConstChars = (expr: number, op: number) => {
|
|
1137
|
-
if (manager.getOp(expr) !== op || manager.getNumArgs(expr) !== 2) return undefined;
|
|
1138
|
-
const first = manager.getChar(manager.getArg(expr, 0));
|
|
1139
|
-
const second = manager.getChar(manager.getArg(expr, 1));
|
|
1140
|
-
return first !== -1 && second !== -1 ? [first, second] : undefined;
|
|
1141
|
-
};
|
|
1142
|
-
const isSelfEq = (expr: number) =>
|
|
1143
|
-
manager.getOp(expr) === OP_EQ && manager.getArg(expr, 0) === manager.getArg(expr, 1);
|
|
1144
|
-
for (const cond of conds.items) {
|
|
1145
|
-
const range = getCharConstRange(manager, element, cond);
|
|
1146
|
-
const negated = manager.getOp(cond) === OP_NOT ? manager.getArg(cond, 0) : -1;
|
|
1147
|
-
const charsEq = negated === -1 ? undefined : getConstChars(negated, OP_EQ);
|
|
1148
|
-
const charsLe = getConstChars(cond, OP_CHAR_LE);
|
|
1149
|
-
const negatedCharsLe = negated === -1 ? undefined : getConstChars(negated, OP_CHAR_LE);
|
|
1150
|
-
if (range !== undefined) {
|
|
1151
|
-
if (range.lo > range.hi) {
|
|
1152
|
-
if (range.isNegated) continue;
|
|
1153
|
-
ranges = [];
|
|
1154
|
-
} else if (range.isNegated) excludeRange(range.lo, range.hi);
|
|
1155
|
-
else ranges = intersect(range.lo, range.hi, ranges);
|
|
1156
|
-
rangeConds.push(cond);
|
|
1157
|
-
} else if (manager.isTrue(cond) || isSelfEq(cond)) continue;
|
|
1158
|
-
else if (charsEq !== undefined && charsEq[0] !== charsEq[1]) continue;
|
|
1159
|
-
else if (charsLe !== undefined && charsLe[0] <= charsLe[1]) continue;
|
|
1160
|
-
else if (negatedCharsLe !== undefined && negatedCharsLe[0] > negatedCharsLe[1]) continue;
|
|
1161
|
-
else if (
|
|
1162
|
-
manager.isFalse(cond) ||
|
|
1163
|
-
(negated !== -1 && isSelfEq(negated)) ||
|
|
1164
|
-
charsLe !== undefined ||
|
|
1165
|
-
negatedCharsLe !== undefined
|
|
1166
|
-
)
|
|
1167
|
-
ranges = [];
|
|
1168
|
-
else {
|
|
1169
|
-
isAllRanges = false;
|
|
1170
|
-
break;
|
|
1171
|
-
}
|
|
1172
|
-
if (ranges.length === 0) break;
|
|
1173
|
-
}
|
|
1174
|
-
if (isAllRanges) {
|
|
1175
|
-
const trivial =
|
|
1176
|
-
ranges.length === 0
|
|
1177
|
-
? manager.falseExpr
|
|
1178
|
-
: manager.isUninterpretedConst(element)
|
|
1179
|
-
? manager.trueExpr
|
|
1180
|
-
: -1;
|
|
1181
|
-
if (trivial !== -1) {
|
|
1182
|
-
rangeConds.reset();
|
|
1183
|
-
conds.reset();
|
|
1184
|
-
return trivial;
|
|
1185
|
-
}
|
|
1186
|
-
conds.reset();
|
|
1187
|
-
for (const cond of rangeConds.items) conds.push(cond);
|
|
1188
|
-
}
|
|
1189
|
-
}
|
|
1190
|
-
let solution = -1;
|
|
1191
|
-
for (const cond of conds.items) {
|
|
1192
|
-
if (manager.getOp(cond) !== OP_EQ) continue;
|
|
1193
|
-
const lhs = manager.getArg(cond, 0);
|
|
1194
|
-
const rhs = manager.getArg(cond, 1);
|
|
1195
|
-
if (lhs !== element && rhs !== element) continue;
|
|
1196
|
-
solution = rhs === element ? lhs : rhs;
|
|
1197
|
-
break;
|
|
1198
|
-
}
|
|
1199
|
-
let result = inputCondition;
|
|
1200
|
-
if (solution !== -1) {
|
|
1201
|
-
const replace = new ExprSafeReplace(manager);
|
|
1202
|
-
replace.insert(element, solution);
|
|
1203
|
-
result = replace.apply(inputCondition);
|
|
1204
|
-
replace.release();
|
|
1205
|
-
manager.releaseLater(result);
|
|
1206
|
-
if (!manager.isUninterpretedConst(element))
|
|
1207
|
-
result = this.mkBool(OP_AND, [manager.mkEq(element, solution), result]);
|
|
1208
|
-
} else if (isAllRanges)
|
|
1209
|
-
result =
|
|
1210
|
-
conds.size === 0
|
|
1211
|
-
? manager.trueExpr
|
|
1212
|
-
: conds.size === 1
|
|
1213
|
-
? conds.items[0]
|
|
1214
|
-
: this.mkBool(OP_AND, [...conds.items]);
|
|
1215
|
-
rangeConds.reset();
|
|
1216
|
-
conds.reset();
|
|
1217
|
-
return result;
|
|
1218
|
-
}
|
|
1219
|
-
|
|
1220
1101
|
private reduceReIsEmpty(regex: number): Result {
|
|
1221
1102
|
const manager = this.manager;
|
|
1222
1103
|
const union = this.getSplit(regex, OP_RE_UNION);
|
|
@@ -1286,11 +1167,4 @@ export class ReRewriter {
|
|
|
1286
1167
|
? manager.falseExpr
|
|
1287
1168
|
: undefined;
|
|
1288
1169
|
}
|
|
1289
|
-
|
|
1290
|
-
someStringInRe(regex: number) {
|
|
1291
|
-
const witness = new RegexWitness(this.manager, this);
|
|
1292
|
-
const result = witness.getWitness(regex);
|
|
1293
|
-
witness.release();
|
|
1294
|
-
return result;
|
|
1295
|
-
}
|
|
1296
1170
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/seq_decl_plugin.cpp, src/ast/char_decl_plugin.cpp,
|
|
2
|
-
// src/util/len_abs.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -42,7 +40,7 @@ const MAX_PERIOD = 64;
|
|
|
42
40
|
export const addTruncate = (first: number, second: number) =>
|
|
43
41
|
first + second > UINT_MAX ? UINT_MAX : first + second;
|
|
44
42
|
|
|
45
|
-
|
|
43
|
+
const mulTruncate = (first: number, second: number) =>
|
|
46
44
|
first * second > UINT_MAX ? UINT_MAX : first * second;
|
|
47
45
|
|
|
48
46
|
const getGcd = (first: number, second: number): number => {
|
|
@@ -93,7 +91,7 @@ const getCommonPeriod = (first: number, second: number) => {
|
|
|
93
91
|
|
|
94
92
|
const getEffectivePeriod = (abs: LenAbs) => (abs.lo === abs.hi ? 0 : abs.period);
|
|
95
93
|
|
|
96
|
-
|
|
94
|
+
const isLenAbsEmpty = (abs: LenAbs) => {
|
|
97
95
|
if (abs.lo > abs.hi || abs.residues === 0n) return true;
|
|
98
96
|
if (abs.period <= 1) return false;
|
|
99
97
|
if (abs.hi === UINT_MAX || abs.hi - abs.lo >= abs.period - 1) return false;
|
|
@@ -211,12 +209,7 @@ const loopLenAbs = (abs: LenAbs, lower: number, upper: number) => {
|
|
|
211
209
|
return result;
|
|
212
210
|
};
|
|
213
211
|
|
|
214
|
-
|
|
215
|
-
period: number,
|
|
216
|
-
residues: bigint,
|
|
217
|
-
constant: number,
|
|
218
|
-
stride: number,
|
|
219
|
-
) => {
|
|
212
|
+
const isResidueReachable = (period: number, residues: bigint, constant: number, stride: number) => {
|
|
220
213
|
if (period === 0) return true;
|
|
221
214
|
const offset = constant % period;
|
|
222
215
|
const gcd = stride === 0 ? period : getGcd(stride, period);
|
|
@@ -250,8 +243,6 @@ const mkInfo = (
|
|
|
250
243
|
...(abs ?? mkLenAbs(minLength, maxLength)),
|
|
251
244
|
});
|
|
252
245
|
|
|
253
|
-
const negateLbool = (value: number) => -value;
|
|
254
|
-
|
|
255
246
|
const starInfo = (info: ReInfo) =>
|
|
256
247
|
mkInfo(info.isInterpreted, L_TRUE, 0, 0, info.isClassical, starLenAbs(info, 0));
|
|
257
248
|
|
|
@@ -272,7 +263,7 @@ const optInfo = (info: ReInfo) =>
|
|
|
272
263
|
|
|
273
264
|
const complementInfo = (info: ReInfo) => {
|
|
274
265
|
if (!info.isKnown) return info;
|
|
275
|
-
const nullable =
|
|
266
|
+
const nullable = -info.nullable;
|
|
276
267
|
return mkInfo(info.isInterpreted, nullable, nullable === L_FALSE ? 1 : 0, UINT_MAX, false);
|
|
277
268
|
};
|
|
278
269
|
|
|
@@ -519,14 +510,8 @@ export class ReInfoCache {
|
|
|
519
510
|
}
|
|
520
511
|
}
|
|
521
512
|
|
|
522
|
-
export const getReMinLength = (info: ReInfoCache, expr: number) => info.getInfo(expr).lo;
|
|
523
|
-
|
|
524
|
-
export const getReMaxLength = (info: ReInfoCache, expr: number) => info.getInfo(expr).hi;
|
|
525
|
-
|
|
526
513
|
export const isReGround = (info: ReInfoCache, expr: number) => info.getInfo(expr).isInterpreted;
|
|
527
514
|
|
|
528
|
-
export const isLengthEmpty = (info: ReInfo) => info.isKnown && isLenAbsEmpty(info);
|
|
529
|
-
|
|
530
515
|
const getUnsigned = (manager: AstManager, expr: number) => {
|
|
531
516
|
const value = manager.getNumeral(expr);
|
|
532
517
|
return value !== undefined && value >= 0n && value <= BigInt(UINT_MAX)
|
|
@@ -638,7 +623,7 @@ export const getStrMinLength = (manager: AstManager, seq: number): number => {
|
|
|
638
623
|
return result + getLength(current);
|
|
639
624
|
};
|
|
640
625
|
|
|
641
|
-
|
|
626
|
+
const getStrMaxLength = (manager: AstManager, seq: number): number => {
|
|
642
627
|
const getLength = (part: number) => {
|
|
643
628
|
if (isEmptySeq(manager, part)) return 0;
|
|
644
629
|
const op = manager.getOp(part);
|
|
@@ -659,13 +644,12 @@ export const getStrMaxLength = (manager: AstManager, seq: number): number => {
|
|
|
659
644
|
return addTruncate(getLength(current), result);
|
|
660
645
|
};
|
|
661
646
|
|
|
662
|
-
|
|
647
|
+
const getLengthShape = (manager: AstManager, seq: number) => {
|
|
663
648
|
let constant = 0;
|
|
664
649
|
let stride = 0;
|
|
665
650
|
const multiplicities = new Map<number, number>();
|
|
666
651
|
const todo = [seq];
|
|
667
|
-
|
|
668
|
-
const expr = todo.pop()!;
|
|
652
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
669
653
|
if (isBinaryApp(manager, expr, OP_SEQ_CONCAT)) {
|
|
670
654
|
todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
671
655
|
continue;
|
|
@@ -772,6 +756,3 @@ export const getUnitStringChar = (manager: AstManager, seq: number) => {
|
|
|
772
756
|
if (chars !== undefined) return chars.length === 1 ? manager.mkChar(chars[0]) : -1;
|
|
773
757
|
return manager.getOp(seq) === OP_SEQ_UNIT ? manager.getArg(seq, 0) : -1;
|
|
774
758
|
};
|
|
775
|
-
|
|
776
|
-
export const isReSortOf = (manager: AstManager, expr: number) =>
|
|
777
|
-
manager.isReSort(manager.sorts[expr]);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/seq_regex_bisim.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_RE_XOR } from "./ast";
|
|
3
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
@@ -59,7 +58,7 @@ export class RegexBisim {
|
|
|
59
58
|
return (
|
|
60
59
|
manager.isReSort(manager.sorts[regex]) &&
|
|
61
60
|
this.info.getInfo(regex).isKnown &&
|
|
62
|
-
manager.
|
|
61
|
+
manager.isGroundApp(regex)
|
|
63
62
|
);
|
|
64
63
|
}
|
|
65
64
|
|