tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +143 -55
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/transfer.cjs +29 -26
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +261 -68
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +1 -1
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +134 -86
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +5 -3
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +0 -2
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +0 -2
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +224 -82
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -49
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -9
- package/src/prover/isabelle/isar/method.ts +5 -9
- package/src/prover/isabelle/isar/proof.ts +33 -18
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +0 -2
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +3 -6
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +0 -1
- package/src/prover/smt/solver/asserted-formulas.ts +9 -3
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +3 -3
- package/src/prover/smt/solver/ast.ts +112 -156
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +0 -2
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +1 -4
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +41 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +15 -2
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +68 -43
- package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +2 -2
- package/src/prover/smt/solver/euf/th-solver.ts +1 -10
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +19 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +3 -2
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +0 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +0 -4
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +0 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +26 -7
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +5 -14
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +0 -1
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +1 -3
- package/src/prover/smt/solver/muz/dl-context.ts +67 -9
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +4 -4
- package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +112 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
- package/src/prover/smt/solver/nnf.ts +0 -1
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +15 -10
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +0 -1
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +14 -20
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +2 -3
- package/src/prover/smt/solver/probes.ts +4 -7
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +6 -7
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +0 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +70 -91
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +13 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +1 -6
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +4 -7
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
- package/src/prover/smt/solver/sat/model-converter.ts +2 -18
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +45 -68
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
- package/src/prover/smt/solver/seq-derive.ts +9 -15
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
- package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
- package/src/prover/smt/solver/seq-re-util.ts +2 -5
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +31 -34
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +8 -3
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +18 -14
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
- package/src/prover/smt/solver/smtlib-script.ts +957 -750
- package/src/prover/smt/solver/solve-eqs.ts +11 -19
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +77 -18
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -2
- package/src/prover/smt/solver/theory-pb.ts +12 -11
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -26
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +2 -3
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +264 -77
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +2 -1
- package/src/sany/generator-expressions.ts +30 -27
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +6 -5
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +165 -78
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp, src/smt/theory_seq.h, src/smt/smt_arith_value.cpp,
|
|
2
|
-
// src/util/scoped_vector.h), MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
type AstManager,
|
|
5
|
-
OP_ADD,
|
|
6
3
|
OP_GE,
|
|
7
4
|
OP_LE,
|
|
8
5
|
OP_SEQ_CONCAT,
|
|
@@ -55,7 +52,7 @@ export interface Ne {
|
|
|
55
52
|
dep: Dependency;
|
|
56
53
|
}
|
|
57
54
|
|
|
58
|
-
|
|
55
|
+
interface Nc {
|
|
59
56
|
contains: number;
|
|
60
57
|
lengthGreater: Literal;
|
|
61
58
|
dep: Dependency;
|
|
@@ -66,7 +63,7 @@ interface ExprDep {
|
|
|
66
63
|
dep: Dependency;
|
|
67
64
|
}
|
|
68
65
|
|
|
69
|
-
|
|
66
|
+
class ScopedVector<T> {
|
|
70
67
|
items: T[] = [];
|
|
71
68
|
private undoIndexes: number[] = [];
|
|
72
69
|
private undoValues: T[] = [];
|
|
@@ -148,10 +145,6 @@ class SolutionMap {
|
|
|
148
145
|
private deps: Dependency[] = [];
|
|
149
146
|
private limits: number[] = [];
|
|
150
147
|
|
|
151
|
-
get isEmpty() {
|
|
152
|
-
return this.map.size === 0;
|
|
153
|
-
}
|
|
154
|
-
|
|
155
148
|
private reducesTo(input: number, expr: number) {
|
|
156
149
|
let current = input;
|
|
157
150
|
while (current !== expr) {
|
|
@@ -239,10 +232,6 @@ class ExclusionTable {
|
|
|
239
232
|
|
|
240
233
|
constructor(private manager: AstManager) {}
|
|
241
234
|
|
|
242
|
-
get isEmpty() {
|
|
243
|
-
return this.table.size === 0;
|
|
244
|
-
}
|
|
245
|
-
|
|
246
235
|
private getKey(first: number, second: number) {
|
|
247
236
|
return this.manager.ids[first] > this.manager.ids[second]
|
|
248
237
|
? `${second},${first}`
|
|
@@ -348,7 +337,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
348
337
|
protected intStrings: number[] = [];
|
|
349
338
|
protected hasLengthSet = new Set<number>();
|
|
350
339
|
protected lengths: number[] = [];
|
|
351
|
-
protected lengthLimitMap = new Map<number, number>();
|
|
352
340
|
protected lengthLimits: number[] = [];
|
|
353
341
|
protected replay: (() => void)[] = [];
|
|
354
342
|
protected strRewriter: Rewriter;
|
|
@@ -475,10 +463,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
475
463
|
return this.rewrite(this.mkArith(OP_SUB, [first, second]));
|
|
476
464
|
}
|
|
477
465
|
|
|
478
|
-
protected mkAdd(first: number, second: number) {
|
|
479
|
-
return this.rewrite(this.mkArith(OP_ADD, [first, second]));
|
|
480
|
-
}
|
|
481
|
-
|
|
482
466
|
protected mkLength(seq: number) {
|
|
483
467
|
return mkSeqApp(this.manager, OP_SEQ_LENGTH, [seq]);
|
|
484
468
|
}
|
|
@@ -521,12 +505,6 @@ export abstract class TheorySeqState extends Theory {
|
|
|
521
505
|
return dep;
|
|
522
506
|
}
|
|
523
507
|
|
|
524
|
-
protected addDependency(dep: Dependency, first: Enode, second: Enode) {
|
|
525
|
-
return first === second
|
|
526
|
-
? dep
|
|
527
|
-
: mkJoin(dep, this.mkAssumption({ first, second, literal: undefined }));
|
|
528
|
-
}
|
|
529
|
-
|
|
530
508
|
protected linearizeOf(dep: Dependency, eqs: Enode[], literals: Literal[]) {
|
|
531
509
|
for (const index of linearize([dep])) {
|
|
532
510
|
const assumption = this.assumptions[index];
|
|
@@ -600,8 +578,7 @@ export abstract class TheorySeqState extends Theory {
|
|
|
600
578
|
const manager = this.manager;
|
|
601
579
|
let value = Rational.zero;
|
|
602
580
|
const todo = [input];
|
|
603
|
-
|
|
604
|
-
const expr = todo.pop()!;
|
|
581
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
605
582
|
const op = manager.getOp(expr);
|
|
606
583
|
const chars = manager.getString(expr);
|
|
607
584
|
if (this.isConcat(expr)) todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
|
|
@@ -748,8 +725,13 @@ export abstract class TheorySeqState extends Theory {
|
|
|
748
725
|
isAddingToEqs = true,
|
|
749
726
|
) {
|
|
750
727
|
const context = this.context;
|
|
728
|
+
const manager = this.manager;
|
|
729
|
+
manager.incRef(firstExpr);
|
|
730
|
+
manager.incRef(secondExpr);
|
|
751
731
|
const first = this.ensureEnodeOf(firstExpr);
|
|
752
732
|
const second = this.ensureEnodeOf(secondExpr);
|
|
733
|
+
manager.decRef(secondExpr);
|
|
734
|
+
manager.decRef(firstExpr);
|
|
753
735
|
if (first.root === second.root) return false;
|
|
754
736
|
context.markAsRelevant(first.owner);
|
|
755
737
|
context.markAsRelevant(second.owner);
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_seq.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_SEQ,
|
|
5
4
|
OP_EQ,
|
|
6
|
-
OP_ITE,
|
|
7
5
|
OP_SEQ_AT,
|
|
8
6
|
OP_SEQ_CONTAINS,
|
|
9
7
|
OP_SEQ_EXTRACT,
|
|
@@ -79,29 +77,26 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
79
77
|
finalCheckEh() {
|
|
80
78
|
if (!this.hasSeq) return FC_DONE;
|
|
81
79
|
this.isNewPropagation = false;
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
() => this.finalCheckRegex(),
|
|
103
|
-
];
|
|
104
|
-
if (checks.some((check) => check())) return FC_CONTINUE;
|
|
80
|
+
if (this.simplifyAndSolveEqs()) return FC_CONTINUE;
|
|
81
|
+
if (this.checkEquationConflict()) return FC_CONTINUE;
|
|
82
|
+
if (this.checkLts()) return FC_CONTINUE;
|
|
83
|
+
if (this.solveNqs(0)) return FC_CONTINUE;
|
|
84
|
+
if (this.checkFixedLength(true, false)) return FC_CONTINUE;
|
|
85
|
+
if (this.checkFixedLength(false, false)) return FC_CONTINUE;
|
|
86
|
+
if (this.checkFixedLength(false, true)) return FC_CONTINUE;
|
|
87
|
+
if (this.checkContains()) return FC_CONTINUE;
|
|
88
|
+
if (this.checkIntString()) return FC_CONTINUE;
|
|
89
|
+
if (this.reduceLengthEq()) return FC_CONTINUE;
|
|
90
|
+
if (this.branchUnitVariable()) return FC_CONTINUE;
|
|
91
|
+
if (this.branchBinaryVariable()) return FC_CONTINUE;
|
|
92
|
+
if (this.branchVariable()) return FC_CONTINUE;
|
|
93
|
+
if (this.checkLengthCoherence()) return FC_CONTINUE;
|
|
94
|
+
if (!this.checkExtensionality()) return FC_CONTINUE;
|
|
95
|
+
if (this.branchNqs()) return FC_CONTINUE;
|
|
96
|
+
if (this.branchItos()) return FC_CONTINUE;
|
|
97
|
+
if (this.checkFixedLength(false, true)) return FC_CONTINUE;
|
|
98
|
+
if (this.solveRecfuns()) return FC_CONTINUE;
|
|
99
|
+
if (this.finalCheckRegex()) return FC_CONTINUE;
|
|
105
100
|
if (this.unhandledExpr !== undefined) return FC_GIVEUP;
|
|
106
101
|
return this.eqs.size === 0 && this.ncs.size === 0 ? FC_DONE : FC_GIVEUP;
|
|
107
102
|
}
|
|
@@ -140,8 +135,9 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
140
135
|
if (op === OP_STRING_UBVTOS || op === OP_STRING_SBVTOS)
|
|
141
136
|
throw new SmtUnsupportedError("str.from_ubv in the theory of sequences");
|
|
142
137
|
if (op === OP_SEQ_LENGTH) this.mkVar(this.ensureEnodeOf(manager.getArg(term, 0)));
|
|
143
|
-
|
|
144
|
-
|
|
138
|
+
const existing = context.getEnode(term);
|
|
139
|
+
if (existing !== undefined) {
|
|
140
|
+
this.mkVar(existing);
|
|
145
141
|
return true;
|
|
146
142
|
}
|
|
147
143
|
const isBool = manager.isBool(term);
|
|
@@ -155,10 +151,7 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
155
151
|
context.setVarTheory(context.mkBoolVar(term), this.id);
|
|
156
152
|
context.markAsRelevant(term);
|
|
157
153
|
}
|
|
158
|
-
|
|
159
|
-
? context.getEnode(term)!
|
|
160
|
-
: context.mkEnode(term, false, isBool, true);
|
|
161
|
-
this.mkVar(node);
|
|
154
|
+
this.mkVar(context.getEnode(term) ?? context.mkEnode(term, false, isBool, true));
|
|
162
155
|
if (!context.relevancy.isEnabled) this.relevantEh(term);
|
|
163
156
|
return true;
|
|
164
157
|
}
|
|
@@ -389,8 +382,7 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
389
382
|
private addLengthLimit(input: number, limit: number, isSearching: boolean) {
|
|
390
383
|
const manager = this.manager;
|
|
391
384
|
const todo = [input];
|
|
392
|
-
|
|
393
|
-
const expr = todo.pop()!;
|
|
385
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
394
386
|
if (this.isConcat(expr)) {
|
|
395
387
|
todo.push(...manager.getArgs(expr));
|
|
396
388
|
continue;
|
|
@@ -810,16 +802,16 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
810
802
|
minSeq = limit.seq;
|
|
811
803
|
}
|
|
812
804
|
}
|
|
813
|
-
if (minLimit < MAX_UNFOLDING) {
|
|
805
|
+
if (minSeq !== undefined && minLimit < MAX_UNFOLDING) {
|
|
814
806
|
this.maxUnfoldingDepth++;
|
|
815
807
|
let limit = minLimit * 2;
|
|
816
|
-
if (this.isSeq(minSeq
|
|
817
|
-
limit = Math.max(this.getMinLength(minSeq
|
|
818
|
-
const lower = this.lowerBound2(minSeq
|
|
808
|
+
if (this.isSeq(minSeq)) {
|
|
809
|
+
limit = Math.max(this.getMinLength(minSeq), limit);
|
|
810
|
+
const lower = this.lowerBound2(minSeq);
|
|
819
811
|
if (lower !== undefined && !lower.isNegative() && lower.num <= 0xffffffffn)
|
|
820
812
|
limit = Math.max(Number(lower.num), limit);
|
|
821
813
|
}
|
|
822
|
-
this.addLengthLimit(minSeq
|
|
814
|
+
this.addLengthLimit(minSeq, limit, false);
|
|
823
815
|
return true;
|
|
824
816
|
}
|
|
825
817
|
if (hasMaxUnfolding) {
|
|
@@ -860,21 +852,6 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
860
852
|
this.rep.popScope(1);
|
|
861
853
|
}
|
|
862
854
|
|
|
863
|
-
private getIteValue(input: number) {
|
|
864
|
-
const context = this.context;
|
|
865
|
-
const manager = this.manager;
|
|
866
|
-
let expr = input;
|
|
867
|
-
while (this.isOp(expr, OP_ITE) && context.isEInternalized(expr)) {
|
|
868
|
-
const root = context.getEnode(expr)!.root;
|
|
869
|
-
const thenExpr = manager.getArg(expr, 1);
|
|
870
|
-
const elseExpr = manager.getArg(expr, 2);
|
|
871
|
-
if (context.getEnode(thenExpr)!.root === root) expr = thenExpr;
|
|
872
|
-
else if (context.getEnode(elseExpr)!.root === root) expr = elseExpr;
|
|
873
|
-
else break;
|
|
874
|
-
}
|
|
875
|
-
return expr;
|
|
876
|
-
}
|
|
877
|
-
|
|
878
855
|
mkValue(node: Enode): number | DependentValue {
|
|
879
856
|
const manager = this.manager;
|
|
880
857
|
const context = this.context;
|
|
@@ -882,8 +859,8 @@ export class TheorySeq extends TheorySeqRegex {
|
|
|
882
859
|
if (!this.isSeq(expr)) return this.mkValueOf(expr);
|
|
883
860
|
const concats: number[] = [];
|
|
884
861
|
const todo = [expr];
|
|
885
|
-
|
|
886
|
-
const current = this.rep.find(this.getIteValue(this.rep.find(
|
|
862
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
863
|
+
const current = this.rep.find(this.getIteValue(this.rep.find(next)));
|
|
887
864
|
if (this.isConcat(current)) todo.push(manager.getArg(current, 1), manager.getArg(current, 0));
|
|
888
865
|
else concats.push(current);
|
|
889
866
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_theory.h, src/smt/smt_theory.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "./array";
|
|
3
|
-
import type
|
|
2
|
+
import { type AstManager, OP_ITE } from "./ast";
|
|
4
3
|
import type { Context } from "./context";
|
|
5
4
|
import type { Enode } from "./enode";
|
|
6
5
|
import { type BoolVar, FALSE_LITERAL, type Literal, negate, TRUE_LITERAL } from "./literal";
|
|
@@ -86,6 +85,21 @@ export abstract class Theory {
|
|
|
86
85
|
return node;
|
|
87
86
|
}
|
|
88
87
|
|
|
88
|
+
protected getIteValue(expr: number) {
|
|
89
|
+
const context = this.context;
|
|
90
|
+
const manager = this.manager;
|
|
91
|
+
let current = expr;
|
|
92
|
+
while (manager.getOp(current) === OP_ITE && context.isEInternalized(current)) {
|
|
93
|
+
const root = context.getEnode(current)?.root;
|
|
94
|
+
const thenExpr = manager.getArg(current, 1);
|
|
95
|
+
const elseExpr = manager.getArg(current, 2);
|
|
96
|
+
if (context.getEnode(thenExpr)?.root === root) current = thenExpr;
|
|
97
|
+
else if (context.getEnode(elseExpr)?.root === root) current = elseExpr;
|
|
98
|
+
else break;
|
|
99
|
+
}
|
|
100
|
+
return current;
|
|
101
|
+
}
|
|
102
|
+
|
|
89
103
|
abstract internalizeAtom(atom: number, isGateContext: boolean): boolean;
|
|
90
104
|
|
|
91
105
|
abstract internalizeTerm(term: number): boolean;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/tseitin_cnf_tactic.cpp, src/ast/shared_occs.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -47,8 +45,8 @@ const getSharedApps = (manager: AstManager, forms: readonly number[]) => {
|
|
|
47
45
|
return shared;
|
|
48
46
|
};
|
|
49
47
|
|
|
50
|
-
const getOrderedById = (first: number, second: number) =>
|
|
51
|
-
first > second ? [second, first] : [first, second];
|
|
48
|
+
const getOrderedById = (manager: AstManager, first: number, second: number) =>
|
|
49
|
+
manager.ids[first] > manager.ids[second] ? [second, first] : [first, second];
|
|
52
50
|
|
|
53
51
|
const getProductNext = (sizes: readonly number[], iterator: number[]) => {
|
|
54
52
|
for (let index = 0; index < sizes.length; index++) {
|
|
@@ -168,7 +166,7 @@ export const tseitinCnf = (manager: AstManager, goal: Goal) => {
|
|
|
168
166
|
if (!manager.isNot(arg)) return null;
|
|
169
167
|
const inner = manager.getArg(arg, 0);
|
|
170
168
|
if (isShared(inner) || !isOrOf(inner, 2)) return null;
|
|
171
|
-
ors.push(getOrderedById(manager.getArg(inner, 0), manager.getArg(inner, 1)));
|
|
169
|
+
ors.push(getOrderedById(manager, manager.getArg(inner, 0), manager.getArg(inner, 1)));
|
|
172
170
|
}
|
|
173
171
|
const [[a1, a2], [b1, b2], [c1, c2]] = ors;
|
|
174
172
|
if (
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/var_subst.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, type AstManager, type SmtSymbol } from "./ast";
|
|
3
2
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
4
3
|
import { BetaReducer } from "./rewriter-tpl";
|
|
@@ -118,7 +117,7 @@ export const replaceFreeVars = (
|
|
|
118
117
|
...data,
|
|
119
118
|
body: children[0],
|
|
120
119
|
patterns: children.slice(1, 1 + data.patterns.length),
|
|
121
|
-
noPatterns:
|
|
120
|
+
noPatterns: children.slice(1 + data.patterns.length),
|
|
122
121
|
});
|
|
123
122
|
frames.pop();
|
|
124
123
|
cache.set(frame.shift * numNodes + current, result);
|
|
@@ -177,7 +176,7 @@ export class UnusedVarsEliminator {
|
|
|
177
176
|
manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)
|
|
178
177
|
? manager.getQuantifier(expr)
|
|
179
178
|
: null;
|
|
180
|
-
const kept = data === null ? expr : manager.
|
|
179
|
+
const kept = data === null ? expr : manager.isGroundApp(data.body) ? data.body : -1;
|
|
181
180
|
if (kept !== -1 || data === null) {
|
|
182
181
|
manager.incRef(kept);
|
|
183
182
|
return kept;
|
package/src/prover/smt/table.ts
CHANGED
|
@@ -130,7 +130,7 @@ export const TYPED_SYMBOLS = [
|
|
|
130
130
|
"TIntLteq",
|
|
131
131
|
];
|
|
132
132
|
|
|
133
|
-
export type AxiomArgument = number | string | AxiomArgument[];
|
|
133
|
+
export type AxiomArgument = number | bigint | string | AxiomArgument[];
|
|
134
134
|
|
|
135
135
|
export interface Axiom {
|
|
136
136
|
name: string;
|
|
@@ -151,7 +151,8 @@ export const axiom = (
|
|
|
151
151
|
formula,
|
|
152
152
|
});
|
|
153
153
|
|
|
154
|
-
export const getAxiomKey = (entry: Axiom) =>
|
|
154
|
+
export const getAxiomKey = (entry: Axiom) =>
|
|
155
|
+
`${entry.name} ${JSON.stringify(entry.args, (_key, value: unknown) => (typeof value === "bigint" ? `${value}n` : value))}`;
|
|
155
156
|
|
|
156
157
|
const getAxiomRank = (entry: Axiom) => {
|
|
157
158
|
const constant = CONSTANT_AXIOMS.indexOf(entry.name);
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Zenon's main.ml, as shipped in tlapm. Copyright 1997 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
|
-
import type { DecideOptions } from "../verdict";
|
|
2
|
+
import type { DecideOptions, Decision } from "../verdict";
|
|
5
3
|
import { checkProof } from "./check/check";
|
|
6
4
|
import { createRelations } from "./eqrel";
|
|
7
5
|
import { createExpressions } from "./expr";
|
|
@@ -87,16 +85,14 @@ export const runZenon = (text: string, options: DecideOptions): ZenonRun => {
|
|
|
87
85
|
};
|
|
88
86
|
};
|
|
89
87
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
"memory limit": "Zenon error: could not find a proof within the memory size limit\n",
|
|
95
|
-
};
|
|
88
|
+
const FAILURE_ERRORS = new Map<ZenonRun["failure"], string>([
|
|
89
|
+
["exhausted", "Zenon error: exhausted search space without finding a proof\n"],
|
|
90
|
+
["memory limit", "Zenon error: could not find a proof within the memory size limit\n"],
|
|
91
|
+
]);
|
|
96
92
|
|
|
97
|
-
export const decideZenon = (text: string, options: DecideOptions):
|
|
93
|
+
export const decideZenon = (text: string, options: DecideOptions): Omit<Decision, "timeUsedMs"> => {
|
|
98
94
|
const run = runZenon(text, options);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
return run.isar === undefined
|
|
96
|
+
? { verdict: "unknown", errorOutput: FAILURE_ERRORS.get(run.failure) }
|
|
97
|
+
: { verdict: "unsat", output: run.isar };
|
|
102
98
|
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Backend.Zenon.
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
|
|
4
2
|
import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
|
|
5
3
|
import type { Bound, Builtin, Expr, Hyp, Sequent } from "../../obligations/expression";
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import {
|
|
5
3
|
isApp,
|
|
6
4
|
isNegatedRelation,
|
|
7
5
|
isRelation,
|
|
8
6
|
isMeta,
|
|
7
|
+
preunify,
|
|
9
8
|
type Expr,
|
|
10
9
|
type NegatedRelationExpr,
|
|
11
10
|
type NotExpr,
|
|
@@ -206,6 +205,29 @@ export const addReflexivity: SearchRule = (context, queue, formula, goalness) =>
|
|
|
206
205
|
return [queue, false];
|
|
207
206
|
};
|
|
208
207
|
|
|
208
|
+
export const addPreunification: SearchRule = (context, queue, formula, goalness) => {
|
|
209
|
+
const matches =
|
|
210
|
+
formula.kind === "not" && formula.args[0].kind === "app"
|
|
211
|
+
? context.index.getPositive(formula.args[0].symbol)
|
|
212
|
+
: formula.kind === "app"
|
|
213
|
+
? context.index.getNegative(formula.symbol)
|
|
214
|
+
: undefined;
|
|
215
|
+
if (matches === undefined) return [queue, false];
|
|
216
|
+
let current = queue;
|
|
217
|
+
for (let matchIndex = matches.length - 1; matchIndex >= 0; matchIndex--) {
|
|
218
|
+
const pairs = preunify(matches[matchIndex], formula);
|
|
219
|
+
for (let pairIndex = 0; pairIndex < pairs.length; pairIndex++)
|
|
220
|
+
current = makeInstance(
|
|
221
|
+
context.exprs,
|
|
222
|
+
current,
|
|
223
|
+
pairs[pairIndex][0],
|
|
224
|
+
pairs[pairIndex][1],
|
|
225
|
+
Math.min(goalness, context.index.getGoalness(matches[matchIndex])),
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
return [current, false];
|
|
229
|
+
};
|
|
230
|
+
|
|
209
231
|
export const addCongruence: SearchRule = (context, queue, formula, goalness) => {
|
|
210
232
|
const exprs = context.exprs;
|
|
211
233
|
if (formula.kind !== "not" || !isApp(formula.args[0], "=", 2)) return [queue, false];
|
package/src/prover/zenon/expr.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's expr.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import { combine, createHasher, toInt63, type Int63 } from "./ocaml";
|
|
5
3
|
|
|
@@ -243,6 +241,27 @@ export const compareExprs = (left: Expr, right: Expr): number => {
|
|
|
243
241
|
return 0;
|
|
244
242
|
};
|
|
245
243
|
|
|
244
|
+
const NO_PAIRS: readonly [Expr, Expr][] = [];
|
|
245
|
+
|
|
246
|
+
const xpreunify = (
|
|
247
|
+
accu: readonly [Expr, Expr][],
|
|
248
|
+
left: Expr,
|
|
249
|
+
right: Expr,
|
|
250
|
+
): readonly [Expr, Expr][] | undefined => {
|
|
251
|
+
if (left === right) return accu;
|
|
252
|
+
if (left.kind === "app" && right.kind === "app" && left.symbol === right.symbol) {
|
|
253
|
+
let current: readonly [Expr, Expr][] | undefined = accu;
|
|
254
|
+
for (let index = 0; index < left.args.length && current !== undefined; index++)
|
|
255
|
+
current = xpreunify(current, left.args[index], right.args[index]);
|
|
256
|
+
return current;
|
|
257
|
+
}
|
|
258
|
+
if (left.kind === "meta") return [[left.args[0], right], ...accu];
|
|
259
|
+
if (right.kind === "meta") return [[right.args[0], left], ...accu];
|
|
260
|
+
return undefined;
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
export const preunify = (left: Expr, right: Expr) => xpreunify(NO_PAIRS, left, right) ?? NO_PAIRS;
|
|
264
|
+
|
|
246
265
|
type Substitution = [Expr, Expr][];
|
|
247
266
|
|
|
248
267
|
const lookup = (map: Substitution, variable: Expr) => map.find((pair) => pair[0] === variable)?.[1];
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's index.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
getStringName,
|
|
5
3
|
isApp,
|
|
@@ -264,8 +262,11 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
264
262
|
const suspect = group[0];
|
|
265
263
|
const count = suspect.records.length;
|
|
266
264
|
const missing = [
|
|
267
|
-
...Array.from(
|
|
268
|
-
|
|
265
|
+
...Array.from(
|
|
266
|
+
{ length: count - suspect.cursor },
|
|
267
|
+
(_value, offset) => suspect.cursor + offset,
|
|
268
|
+
),
|
|
269
|
+
...Array.from({ length: suspect.cursor }, (_value, offset) => offset),
|
|
269
270
|
].find((index) => !suspect.records[index].isPresent);
|
|
270
271
|
if (missing === undefined) return suspect.proof;
|
|
271
272
|
suspects = [group.slice(1), ...suspects.slice(1)];
|
|
@@ -282,6 +283,8 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
282
283
|
getGoalness,
|
|
283
284
|
findPositive: (symbol: string) => withGoalness(getLatestFirst(positive, symbol)),
|
|
284
285
|
findNegative: (symbol: string) => withGoalness(getLatestFirst(negative, symbol)),
|
|
286
|
+
getPositive: (symbol: string) => positive.get(symbol),
|
|
287
|
+
getNegative: (symbol: string) => negative.get(symbol),
|
|
285
288
|
findEqualRight: (term: Expr) => getLatestFirst(equalLeftRight, term),
|
|
286
289
|
findEqualLeft: (term: Expr) => getLatestFirst(equalRightLeft, term),
|
|
287
290
|
findDisequalities: (term: Expr) => [
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's isar_case.ml and enum.ml, as shipped in tlapm. Copyright 2009 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
|
|
5
3
|
interface Lexeme {
|
|
@@ -131,7 +129,7 @@ const getInstance = (pieces: Piece[], getValue: (piece: Progression) => number)
|
|
|
131
129
|
const expandPattern = (count: number, text: string, isReversed: boolean) => {
|
|
132
130
|
const pattern = parsePattern(text);
|
|
133
131
|
if (pattern === undefined) return undefined;
|
|
134
|
-
const positions = Array.from({ length: count }, (
|
|
132
|
+
const positions = Array.from({ length: count }, (_value, position) =>
|
|
135
133
|
isReversed ? count - 1 - position : position,
|
|
136
134
|
);
|
|
137
135
|
return positions
|
package/src/prover/zenon/isar.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's lltoisar.ml and the -oisar path of main.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import { FALSE, GOAL_NAME, TRUE, type BinderExpr, type Expr, type Expressions } from "./expr";
|
|
5
3
|
import type { Relations } from "./eqrel";
|
|
@@ -58,7 +56,7 @@ const toBase26 = (number: number): string =>
|
|
|
58
56
|
: `${toBase26(Math.floor(number / 26))}${String.fromCharCode(97 + (number % 26))}`;
|
|
59
57
|
|
|
60
58
|
const getPairs = <Item>(items: Item[]): [Item, Item][] =>
|
|
61
|
-
Array.from({ length: Math.floor(items.length / 2) }, (
|
|
59
|
+
Array.from({ length: Math.floor(items.length / 2) }, (_value, position) => [
|
|
62
60
|
items[2 * position],
|
|
63
61
|
items[2 * position + 1],
|
|
64
62
|
]);
|
|
@@ -369,7 +367,7 @@ export const printIsar = (proof: MlProof, context: IsarContext): string | undefi
|
|
|
369
367
|
dict,
|
|
370
368
|
formulas,
|
|
371
369
|
subproof,
|
|
372
|
-
(
|
|
370
|
+
(_value, position) => `by (rule zenon_${lemma}_${position} [OF ${conclusionName}])\n`,
|
|
373
371
|
);
|
|
374
372
|
};
|
|
375
373
|
|
package/src/prover/zenon/node.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's node.ml and heap.ml, as shipped in tlapm. Copyright 2001-2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Expr } from "./expr";
|
|
4
2
|
import type { Rule } from "./proof";
|
|
5
3
|
|
|
@@ -158,18 +156,19 @@ const canInstantiate = (meta: Expr, expression: Expr): boolean => {
|
|
|
158
156
|
};
|
|
159
157
|
|
|
160
158
|
// A list cell and a node record take 3 and 6 words, and each block has a header word.
|
|
161
|
-
const getNodeWords = (node: Node) =>
|
|
162
|
-
|
|
163
|
-
(words, branch) => words + 3 * branch.length,
|
|
159
|
+
const getNodeWords = (node: Node) => {
|
|
160
|
+
let words =
|
|
164
161
|
3 +
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
);
|
|
162
|
+
6 +
|
|
163
|
+
3 * node.conclusions.length +
|
|
164
|
+
1 +
|
|
165
|
+
node.rule.args.length +
|
|
166
|
+
(typeof node.priority === "object" ? 2 : 0) +
|
|
167
|
+
1 +
|
|
168
|
+
node.branches.length;
|
|
169
|
+
for (const branch of node.branches) words += 3 * branch.length;
|
|
170
|
+
return words;
|
|
171
|
+
};
|
|
173
172
|
|
|
174
173
|
export const insertNode = (previous: Queue, node: Node): Queue => {
|
|
175
174
|
const queue = { ...previous, nodeWords: previous.nodeWords + getNodeWords(node) };
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's phrase.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Expr } from "./expr";
|
|
4
2
|
import type { Definition, Phrase } from "./parse";
|
|
5
3
|
|
|
@@ -169,7 +167,7 @@ export const separate = (predefined: string[], phrases: Phrase[]) => {
|
|
|
169
167
|
...definitions.slice(previous + 1),
|
|
170
168
|
];
|
|
171
169
|
const dependencyIndex = dependencies.findIndex((candidate) => candidate[0] === symbol);
|
|
172
|
-
dependencies = dependencies.filter((
|
|
170
|
+
dependencies = dependencies.filter((_value, position) => position !== dependencyIndex);
|
|
173
171
|
multiple.unshift(symbol);
|
|
174
172
|
hypotheses.unshift(hypothesis, { formula: removed.origin, goalness: removed.goalness });
|
|
175
173
|
} else {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Relations } from "./eqrel";
|
|
4
2
|
import {
|
|
5
3
|
addCongruence,
|
|
6
4
|
addMatches,
|
|
5
|
+
addPreunification,
|
|
7
6
|
addReflexivity,
|
|
8
7
|
addStringEqualities,
|
|
9
8
|
addSymmetricMatches,
|
|
@@ -59,7 +58,6 @@ const addExtensions: SearchRule = (context, queue, formula, goalness) => {
|
|
|
59
58
|
return [insertAll(queue, result.nodes), result.isStopped];
|
|
60
59
|
};
|
|
61
60
|
|
|
62
|
-
// Deviation from Zenon: newnodes_preunif is left out because it never adds a node.
|
|
63
61
|
const RULES: SearchRule[] = [
|
|
64
62
|
addAbsurd,
|
|
65
63
|
addClosure,
|
|
@@ -72,6 +70,7 @@ const RULES: SearchRule[] = [
|
|
|
72
70
|
addGamma,
|
|
73
71
|
addUnfold,
|
|
74
72
|
addReflexivity,
|
|
73
|
+
addPreunification,
|
|
75
74
|
addCongruence,
|
|
76
75
|
addTransitivity,
|
|
77
76
|
addSymmetricMatches,
|