tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.d618a2d79
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/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -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 +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +47 -44
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +44 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +474 -718
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +244 -238
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +31 -106
- package/src/exit-codes.ts +2 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +616 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +50 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- 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 +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- 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 +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- 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 +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- 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 +14 -13
- 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 +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- 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 +18 -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 +1 -10
- 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 +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- 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 +59 -10
- 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 +67 -16
- 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 +9 -5
- 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 +220 -0
- 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 +324 -0
- 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 +122 -64
- 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 +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- 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 +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +15 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +206 -44
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +22 -47
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +54 -26
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type AstManager,
|
|
3
|
+
KIND_APP,
|
|
4
|
+
KIND_QUANTIFIER,
|
|
5
|
+
OP_AND,
|
|
6
|
+
OP_EQ,
|
|
7
|
+
OP_IMPLIES,
|
|
8
|
+
OP_ITE,
|
|
9
|
+
OP_OR,
|
|
10
|
+
SORT_BOOL,
|
|
11
|
+
QUANTIFIER_FORALL,
|
|
12
|
+
QUANTIFIER_LAMBDA,
|
|
13
|
+
} from "./ast";
|
|
14
|
+
import { isAppOf } from "./ast-util";
|
|
15
|
+
import { RefVector } from "./ref-vector";
|
|
16
|
+
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
17
|
+
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
18
|
+
import { InvVarShifter } from "./rewriter-tpl";
|
|
19
|
+
import { VarSubst } from "./var-subst";
|
|
20
|
+
|
|
21
|
+
const Q_FORALL_POS = 0x10;
|
|
22
|
+
const Q_EXISTS_POS = 0x20;
|
|
23
|
+
const Q_NONE_POS = 0x40;
|
|
24
|
+
const Q_FORALL_NEG = 0x11;
|
|
25
|
+
const Q_EXISTS_NEG = 0x21;
|
|
26
|
+
const Q_NONE_NEG = 0x41;
|
|
27
|
+
|
|
28
|
+
interface QuantifierType {
|
|
29
|
+
value: number;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const negate = (type: QuantifierType) => {
|
|
33
|
+
type.value ^= 0x1;
|
|
34
|
+
return type;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
const isCompatible = (type: number, isForall: boolean) =>
|
|
38
|
+
type === Q_FORALL_POS || type === Q_EXISTS_NEG
|
|
39
|
+
? isForall
|
|
40
|
+
: type === Q_EXISTS_POS || type === Q_FORALL_NEG
|
|
41
|
+
? !isForall
|
|
42
|
+
: true;
|
|
43
|
+
|
|
44
|
+
const setQuantifierType = (type: QuantifierType, isForall: boolean) => {
|
|
45
|
+
if (type.value === Q_NONE_POS) type.value = isForall ? Q_FORALL_POS : Q_EXISTS_POS;
|
|
46
|
+
else if (type.value === Q_NONE_NEG) type.value = isForall ? Q_EXISTS_NEG : Q_FORALL_NEG;
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
// Brings the quantifiers of one kind into prenex form, with fresh constants for their variables.
|
|
50
|
+
export class QuantifierHoister {
|
|
51
|
+
private rewriter: Rewriter;
|
|
52
|
+
private trail: RefVector;
|
|
53
|
+
|
|
54
|
+
constructor(private manager: AstManager) {
|
|
55
|
+
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
56
|
+
this.trail = new RefVector(manager);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
release() {
|
|
60
|
+
this.rewriter.release();
|
|
61
|
+
this.trail.reset();
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// The result comes with a reference, which the caller releases.
|
|
65
|
+
pullQuantifier(isForall: boolean, formula: number, vars: RefVector) {
|
|
66
|
+
const result = this.pull(formula, { value: isForall ? Q_FORALL_POS : Q_EXISTS_POS }, vars);
|
|
67
|
+
this.manager.incRef(result);
|
|
68
|
+
this.trail.reset();
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// The overload with sorts and names: the variables of the pulled quantifiers stay bound, numbered
|
|
73
|
+
// after the free ones, and their sorts and names go in front of those of the prefix. The result
|
|
74
|
+
// comes with a reference, which the caller releases.
|
|
75
|
+
pullQuantifierBound(isForall: boolean, formula: number, sorts: number[], names: string[]) {
|
|
76
|
+
const manager = this.manager;
|
|
77
|
+
let index = manager.freeVarBounds[formula];
|
|
78
|
+
let current = formula;
|
|
79
|
+
while (
|
|
80
|
+
manager.kinds[current] === KIND_QUANTIFIER &&
|
|
81
|
+
(manager.getQuantifier(current).kind === QUANTIFIER_FORALL) === isForall
|
|
82
|
+
) {
|
|
83
|
+
const data = manager.getQuantifier(current);
|
|
84
|
+
index += data.sorts.length;
|
|
85
|
+
names.push(...data.names.map(String));
|
|
86
|
+
sorts.push(...data.sorts);
|
|
87
|
+
current = data.body;
|
|
88
|
+
}
|
|
89
|
+
if (!manager.hasQuantifierFlags[current]) {
|
|
90
|
+
manager.incRef(current);
|
|
91
|
+
return current;
|
|
92
|
+
}
|
|
93
|
+
const vars = new RefVector(manager);
|
|
94
|
+
const pulled = this.pullQuantifier(isForall, current, vars);
|
|
95
|
+
if (vars.size === 0) {
|
|
96
|
+
vars.reset();
|
|
97
|
+
return pulled;
|
|
98
|
+
}
|
|
99
|
+
const replace = new ExprSafeReplace(manager);
|
|
100
|
+
for (const variable of vars.items)
|
|
101
|
+
replace.insert(variable, manager.mkVar(index++, manager.sorts[variable]));
|
|
102
|
+
const result = replace.apply(pulled);
|
|
103
|
+
replace.release();
|
|
104
|
+
manager.decRef(pulled);
|
|
105
|
+
names.unshift(...vars.items.map((variable) => manager.getDeclName(variable)).reverse());
|
|
106
|
+
sorts.unshift(...vars.items.map((variable) => manager.sorts[variable]).reverse());
|
|
107
|
+
vars.reset();
|
|
108
|
+
return result;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private pin(expr: number) {
|
|
112
|
+
this.trail.push(expr);
|
|
113
|
+
return expr;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
private pinOwned(expr: number) {
|
|
117
|
+
this.trail.pushOwned(expr);
|
|
118
|
+
return expr;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
private extractQuantifier(quantifier: number, vars: RefVector) {
|
|
122
|
+
const manager = this.manager;
|
|
123
|
+
const data = manager.getQuantifier(quantifier);
|
|
124
|
+
const fresh = data.sorts.map((sort, index) =>
|
|
125
|
+
this.pin(manager.mkFreshConst(String(data.names[index]), sort)),
|
|
126
|
+
);
|
|
127
|
+
for (const expr of fresh) vars.push(expr);
|
|
128
|
+
const subst = new VarSubst(manager, true);
|
|
129
|
+
const substituted = this.pinOwned(subst.apply(data.body, fresh));
|
|
130
|
+
subst.release();
|
|
131
|
+
const shifter = new InvVarShifter(manager);
|
|
132
|
+
const result = this.pinOwned(shifter.shift(substituted, fresh.length));
|
|
133
|
+
shifter.release();
|
|
134
|
+
return result;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
private pull(formula: number, type: QuantifierType, vars: RefVector): number {
|
|
138
|
+
const manager = this.manager;
|
|
139
|
+
if (!manager.hasQuantifierFlags[formula]) return formula;
|
|
140
|
+
const kind = manager.kinds[formula];
|
|
141
|
+
if (kind === KIND_QUANTIFIER) {
|
|
142
|
+
const data = manager.getQuantifier(formula);
|
|
143
|
+
if (data.kind === QUANTIFIER_LAMBDA) return formula;
|
|
144
|
+
if (!isCompatible(type.value, data.kind === QUANTIFIER_FORALL)) return formula;
|
|
145
|
+
setQuantifierType(type, data.kind === QUANTIFIER_FORALL);
|
|
146
|
+
return this.pull(this.extractQuantifier(formula, vars), type, vars);
|
|
147
|
+
}
|
|
148
|
+
if (kind !== KIND_APP) return formula;
|
|
149
|
+
const args = manager.getArgs(formula);
|
|
150
|
+
const mkNot = (expr: number) => this.pin(manager.mkNot(expr));
|
|
151
|
+
const mkOr = (first: number, second: number) => this.pin(manager.mkOr([first, second]));
|
|
152
|
+
if (isAppOf(manager, formula, OP_AND) || isAppOf(manager, formula, OP_OR)) {
|
|
153
|
+
const pulled = args.map((arg) => this.pull(arg, type, vars));
|
|
154
|
+
const isAnd = isAppOf(manager, formula, OP_AND);
|
|
155
|
+
return this.pinOwned(
|
|
156
|
+
manager.withTemporaries(() =>
|
|
157
|
+
isAnd ? this.rewriter.mkAnd(pulled) : this.rewriter.mkOr(pulled),
|
|
158
|
+
),
|
|
159
|
+
);
|
|
160
|
+
}
|
|
161
|
+
if (manager.isNot(formula)) {
|
|
162
|
+
const pulled = this.pull(args[0], negate(type), vars);
|
|
163
|
+
negate(type);
|
|
164
|
+
return mkNot(pulled);
|
|
165
|
+
}
|
|
166
|
+
if (isAppOf(manager, formula, OP_IMPLIES)) {
|
|
167
|
+
const premise = this.pull(args[0], negate(type), vars);
|
|
168
|
+
negate(type);
|
|
169
|
+
const conclusion = this.pull(args[1], type, vars);
|
|
170
|
+
return this.pin(manager.mkApp(OP_IMPLIES, [premise, conclusion], SORT_BOOL));
|
|
171
|
+
}
|
|
172
|
+
if (isAppOf(manager, formula, OP_ITE)) {
|
|
173
|
+
const [condition, thenExpr, elseExpr] = args;
|
|
174
|
+
const pulledThen = this.pull(thenExpr, type, vars);
|
|
175
|
+
const pulledElse = this.pull(elseExpr, type, vars);
|
|
176
|
+
if (!manager.hasQuantifierFlags[condition])
|
|
177
|
+
return this.pin(
|
|
178
|
+
manager.mkApp(OP_ITE, [condition, pulledThen, pulledElse], manager.sorts[formula]),
|
|
179
|
+
);
|
|
180
|
+
const pulledCondition = this.pull(condition, type, vars);
|
|
181
|
+
const pulledNegated = this.pull(mkNot(condition), type, vars);
|
|
182
|
+
return this.pin(
|
|
183
|
+
manager.mkAnd([mkOr(pulledNegated, pulledThen), mkOr(pulledCondition, pulledElse)]),
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
if (isAppOf(manager, formula, OP_EQ) && manager.sorts[args[0]] === SORT_BOOL) {
|
|
187
|
+
const pulled1 = this.pull(args[0], type, vars);
|
|
188
|
+
const pulled2 = this.pull(args[1], type, vars);
|
|
189
|
+
const negated1 = this.pull(mkNot(args[0]), type, vars);
|
|
190
|
+
const negated2 = this.pull(mkNot(args[1]), type, vars);
|
|
191
|
+
return this.pin(manager.mkAnd([mkOr(negated1, pulled2), mkOr(negated2, pulled1)]));
|
|
192
|
+
}
|
|
193
|
+
// The formula has a quantifier, but out of reach.
|
|
194
|
+
return formula;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
@@ -1,51 +1,36 @@
|
|
|
1
|
-
//
|
|
2
|
-
|
|
1
|
+
// This strategy skips elim-uncnstr's elimination and the simplifier's local_ctx option, as they
|
|
2
|
+
// change almost none of tlapm's obligations.
|
|
3
|
+
import type { AstManager } from "./ast";
|
|
3
4
|
import { ctxSimplify } from "./ctx-simplify";
|
|
5
|
+
import { collectUnconstrained, disableQuantified } from "./elim-uncnstr";
|
|
4
6
|
import { Goal } from "./goal";
|
|
5
7
|
import { propagateValues } from "./propagate-values";
|
|
6
8
|
import { applyQeLite } from "./qe-lite";
|
|
7
|
-
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
9
|
+
import { Rewriter, type RewriterOptions, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
10
|
+
import { RefVector } from "./ref-vector";
|
|
8
11
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
9
12
|
|
|
10
|
-
const
|
|
13
|
+
export const simplifyGoal = (manager: AstManager, goal: Goal, options: RewriterOptions) => {
|
|
14
|
+
goal.depth++;
|
|
11
15
|
if (goal.isInconsistent) return;
|
|
12
|
-
const rewriter = new Rewriter(manager,
|
|
16
|
+
const rewriter = new Rewriter(manager, options);
|
|
13
17
|
const size = goal.forms.size;
|
|
14
18
|
let rewritten = -1;
|
|
15
19
|
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
16
20
|
const result = rewriter.rewrite(goal.forms.items[index]);
|
|
17
21
|
if (rewritten !== -1) manager.decRef(rewritten);
|
|
18
22
|
rewritten = result;
|
|
19
|
-
goal.update(index, rewritten);
|
|
23
|
+
goal.update(index, rewritten, goal.getDependency(index));
|
|
20
24
|
}
|
|
21
25
|
if (rewritten !== -1) manager.decRef(rewritten);
|
|
22
26
|
goal.elimRedundancies();
|
|
23
27
|
rewriter.release();
|
|
24
28
|
};
|
|
25
29
|
|
|
26
|
-
const hasUnconstrainedConst = (manager: AstManager, goal: Goal) => {
|
|
27
|
-
const visited = new Set<number>();
|
|
28
|
-
const consts: number[] = [];
|
|
29
|
-
const repeated = new Set<number>();
|
|
30
|
-
const todo = [...goal.forms.items];
|
|
31
|
-
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
32
|
-
const isConst = manager.isUninterpretedConst(expr);
|
|
33
|
-
if (visited.has(expr)) {
|
|
34
|
-
if (isConst) repeated.add(expr);
|
|
35
|
-
continue;
|
|
36
|
-
}
|
|
37
|
-
visited.add(expr);
|
|
38
|
-
if (isConst) consts.push(expr);
|
|
39
|
-
else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
40
|
-
else if (manager.kinds[expr] === KIND_QUANTIFIER) todo.push(manager.getQuantifier(expr).body);
|
|
41
|
-
}
|
|
42
|
-
return consts.some((expr) => !repeated.has(expr));
|
|
43
|
-
};
|
|
44
|
-
|
|
45
30
|
// Z3's elim_uncnstr rewriter runs twice over the formulas and counts its steps, though the elimination is not ported.
|
|
46
31
|
const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
47
|
-
const isRewriting =
|
|
48
|
-
|
|
32
|
+
const isRewriting = collectUnconstrained(manager, goal).size > 0;
|
|
33
|
+
disableQuantified(manager, goal, new RefVector(manager));
|
|
49
34
|
if (!isRewriting) return;
|
|
50
35
|
const rewriter = new RewriterTpl(manager);
|
|
51
36
|
for (let round = 0; round < 2; round++) {
|
|
@@ -55,41 +40,16 @@ const elimUncnstr = (manager: AstManager, goal: Goal) => {
|
|
|
55
40
|
rewriter.release();
|
|
56
41
|
};
|
|
57
42
|
|
|
58
|
-
const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
|
|
59
|
-
const visited = new Set<number>();
|
|
60
|
-
const disabled = new Set<number>();
|
|
61
|
-
const disable = (body: number) => {
|
|
62
|
-
if (disabled.has(body)) return;
|
|
63
|
-
manager.incRef(body);
|
|
64
|
-
const todo = [body];
|
|
65
|
-
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
66
|
-
if (disabled.has(expr)) continue;
|
|
67
|
-
disabled.add(expr);
|
|
68
|
-
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
const todo = [...goal.forms.items];
|
|
72
|
-
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
73
|
-
if (visited.has(expr)) continue;
|
|
74
|
-
visited.add(expr);
|
|
75
|
-
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
76
|
-
const body = manager.getQuantifier(expr).body;
|
|
77
|
-
disable(body);
|
|
78
|
-
todo.push(body);
|
|
79
|
-
} else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
|
|
80
|
-
}
|
|
81
|
-
};
|
|
82
|
-
|
|
83
43
|
export const applyUfniaTactic = (manager: AstManager, assertions: number[]) => {
|
|
84
44
|
const goal = new Goal(manager);
|
|
85
45
|
for (const assertion of assertions) goal.assert(assertion);
|
|
86
|
-
|
|
46
|
+
simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS);
|
|
87
47
|
const steps = [
|
|
88
48
|
() => propagateValues(manager, goal),
|
|
89
|
-
() => ctxSimplify(manager, goal),
|
|
90
|
-
() =>
|
|
49
|
+
() => ctxSimplify(manager, goal, 30, 5000000),
|
|
50
|
+
() => simplifyGoal(manager, goal, { ...TACTIC_REWRITER_OPTIONS, isPullingCheapIte: true }),
|
|
91
51
|
() => elimUncnstr(manager, goal),
|
|
92
|
-
() =>
|
|
52
|
+
() => simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS),
|
|
93
53
|
() => applyQeLite(manager, goal),
|
|
94
54
|
];
|
|
95
55
|
for (const step of steps) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
KIND_APP,
|
|
4
3
|
KIND_VAR,
|
|
@@ -23,8 +22,6 @@ import { Rational } from "./rational";
|
|
|
23
22
|
import { Rewriter } from "./rewriter";
|
|
24
23
|
import { AufSolver, type Evaluate, InstantiationSet, Node } from "./auf-solver";
|
|
25
24
|
|
|
26
|
-
export const MBQI_FORCE_TEMPLATE = 10;
|
|
27
|
-
|
|
28
25
|
type QInfo =
|
|
29
26
|
| { kind: "f_var"; decl: number; argIndex: number; varIndex: number }
|
|
30
27
|
| { kind: "f_var_plus_offset"; decl: number; argIndex: number; varIndex: number; offset: number }
|
|
@@ -38,6 +35,7 @@ const mkVarPair = (kind: "x_eq_y" | "x_neq_y" | "x_leq_y", first: number, second
|
|
|
38
35
|
first > second ? { kind, first: second, second: first } : { kind, first, second };
|
|
39
36
|
|
|
40
37
|
export class QuantifierInfo {
|
|
38
|
+
private manager: AstManager;
|
|
41
39
|
readonly flatQ: number;
|
|
42
40
|
qinfos: QInfo[] = [];
|
|
43
41
|
isAuf = true;
|
|
@@ -47,11 +45,12 @@ export class QuantifierInfo {
|
|
|
47
45
|
readonly condMacros;
|
|
48
46
|
|
|
49
47
|
constructor(
|
|
50
|
-
private manager: AstManager,
|
|
51
48
|
private context: Context,
|
|
52
49
|
readonly quantifier: number,
|
|
53
50
|
macroRewriter: Rewriter,
|
|
54
51
|
) {
|
|
52
|
+
const manager = context.manager;
|
|
53
|
+
this.manager = manager;
|
|
55
54
|
const isNested = manager.hasQuantifierFlags[manager.getQuantifier(quantifier).body];
|
|
56
55
|
this.flatQ = isNested ? pullQuant(manager, quantifier) : quantifier;
|
|
57
56
|
if (!isNested) manager.incRef(quantifier);
|
|
@@ -232,7 +231,7 @@ export class QuantifierAnalyzer {
|
|
|
232
231
|
|
|
233
232
|
private isVarPlusGround(expr: number) {
|
|
234
233
|
const manager = this.manager;
|
|
235
|
-
if (manager.getOp(expr) !== OP_ADD || manager.
|
|
234
|
+
if (manager.getOp(expr) !== OP_ADD || manager.isGroundApp(expr)) return undefined;
|
|
236
235
|
const args: number[] = [];
|
|
237
236
|
let variable: number | undefined;
|
|
238
237
|
let isInverted = false;
|
|
@@ -247,7 +246,7 @@ export class QuantifierAnalyzer {
|
|
|
247
246
|
isStopped = true;
|
|
248
247
|
}
|
|
249
248
|
const negated = this.manager.getTimesMinusOneArg(arg);
|
|
250
|
-
if (this.manager.
|
|
249
|
+
if (this.manager.isGroundApp(arg)) args.push(arg);
|
|
251
250
|
else if (this.isVar(arg)) {
|
|
252
251
|
if (variable !== undefined) return undefined;
|
|
253
252
|
variable = arg;
|
|
@@ -262,31 +261,31 @@ export class QuantifierAnalyzer {
|
|
|
262
261
|
return { variable, term, isInverted };
|
|
263
262
|
}
|
|
264
263
|
|
|
265
|
-
private mkSub(first: number, second: number) {
|
|
266
|
-
return this.rewriter.mkSub(first, second);
|
|
267
|
-
}
|
|
268
|
-
|
|
269
264
|
private mkAdd(first: number, second: number) {
|
|
270
265
|
return this.rewriter.mkAdd([first, second]);
|
|
271
266
|
}
|
|
272
267
|
|
|
273
268
|
private isVarAndGround(lhs: number, rhs: number) {
|
|
274
|
-
if (this.isVar(lhs) && this.manager.
|
|
269
|
+
if (this.isVar(lhs) && this.manager.isGroundApp(rhs))
|
|
275
270
|
return { variable: lhs, term: rhs, isInverted: false };
|
|
276
|
-
if (this.isVar(rhs) && this.manager.
|
|
271
|
+
if (this.isVar(rhs) && this.manager.isGroundApp(lhs))
|
|
277
272
|
return { variable: rhs, term: lhs, isInverted: false };
|
|
278
273
|
const left = this.isVarPlusGround(lhs);
|
|
279
|
-
if (left !== undefined && this.manager.
|
|
274
|
+
if (left !== undefined && this.manager.isGroundApp(rhs))
|
|
280
275
|
return {
|
|
281
276
|
variable: left.variable,
|
|
282
|
-
term: left.isInverted
|
|
277
|
+
term: left.isInverted
|
|
278
|
+
? this.rewriter.mkSub(left.term, rhs)
|
|
279
|
+
: this.rewriter.mkSub(rhs, left.term),
|
|
283
280
|
isInverted: left.isInverted,
|
|
284
281
|
};
|
|
285
282
|
const right = this.isVarPlusGround(rhs);
|
|
286
|
-
if (right !== undefined && this.manager.
|
|
283
|
+
if (right !== undefined && this.manager.isGroundApp(lhs))
|
|
287
284
|
return {
|
|
288
285
|
variable: right.variable,
|
|
289
|
-
term: right.isInverted
|
|
286
|
+
term: right.isInverted
|
|
287
|
+
? this.rewriter.mkSub(right.term, lhs)
|
|
288
|
+
: this.rewriter.mkSub(lhs, right.term),
|
|
290
289
|
isInverted: right.isInverted,
|
|
291
290
|
};
|
|
292
291
|
return undefined;
|
|
@@ -332,12 +331,12 @@ export class QuantifierAnalyzer {
|
|
|
332
331
|
const one = manager.mkNumeralOfSort(Rational.one, manager.sorts[found.term]);
|
|
333
332
|
return {
|
|
334
333
|
variable: found.variable,
|
|
335
|
-
term: isLe ? this.mkAdd(found.term, one) : this.mkSub(found.term, one),
|
|
334
|
+
term: isLe ? this.mkAdd(found.term, one) : this.rewriter.mkSub(found.term, one),
|
|
336
335
|
};
|
|
337
336
|
}
|
|
338
337
|
|
|
339
338
|
private visitFormula(expr: number, polarity: Polarity) {
|
|
340
|
-
if (this.manager.
|
|
339
|
+
if (this.manager.isGroundApp(expr)) return;
|
|
341
340
|
const cache = polarity === "pos" ? this.posCache : this.negCache;
|
|
342
341
|
if (cache.has(expr)) return;
|
|
343
342
|
this.ftodo.push([expr, polarity]);
|
|
@@ -345,7 +344,7 @@ export class QuantifierAnalyzer {
|
|
|
345
344
|
}
|
|
346
345
|
|
|
347
346
|
private visitTerm(expr: number) {
|
|
348
|
-
if (this.manager.
|
|
347
|
+
if (this.manager.isGroundApp(expr) || this.posCache.has(expr)) return;
|
|
349
348
|
this.ttodo.push(expr);
|
|
350
349
|
this.posCache.add(expr);
|
|
351
350
|
}
|
|
@@ -531,7 +530,7 @@ export class QuantifierAnalyzer {
|
|
|
531
530
|
for (const literal of literals) {
|
|
532
531
|
const isNegated = manager.isNot(literal);
|
|
533
532
|
const atom = isNegated ? manager.getArg(literal, 0) : literal;
|
|
534
|
-
if (!this.manager.
|
|
533
|
+
if (!this.manager.isGroundApp(atom)) this.processLiteral(atom, isNegated);
|
|
535
534
|
}
|
|
536
535
|
} else this.visitFormula(body, "pos");
|
|
537
536
|
while (this.ftodo.length > 0 || this.ttodo.length > 0) {
|
|
@@ -1,15 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
CHECK_MODEL_RESTART,
|
|
4
|
-
CHECK_MODEL_SAT,
|
|
5
|
-
CHECK_MODEL_UNKNOWN,
|
|
6
|
-
FC_CONTINUE,
|
|
7
|
-
FC_DONE,
|
|
8
|
-
type Context,
|
|
9
|
-
} from "./context";
|
|
1
|
+
import { CHECK_MODEL_RESTART, CHECK_MODEL_SAT, CHECK_MODEL_UNKNOWN, type Context } from "./context";
|
|
2
|
+
import { FC_CONTINUE, FC_DONE } from "./theory";
|
|
10
3
|
import { Mam } from "./e-matching";
|
|
11
4
|
import type { Enode } from "./enode";
|
|
12
|
-
import { FingerprintSet } from "./fingerprints";
|
|
13
5
|
import { ModelChecker } from "./model-checker";
|
|
14
6
|
import { ModelFinder } from "./model-finder";
|
|
15
7
|
import type { ProtoModel } from "./proto-model";
|
|
@@ -29,7 +21,6 @@ export class DefaultQuantifierManager {
|
|
|
29
21
|
private qiQueue: QiQueue;
|
|
30
22
|
private mam: Mam;
|
|
31
23
|
private lazyMam: Mam;
|
|
32
|
-
private fingerprints: FingerprintSet;
|
|
33
24
|
private isActive = false;
|
|
34
25
|
private lazyMatchingIndex = 0;
|
|
35
26
|
private mbqi: Mbqi | null = null;
|
|
@@ -39,13 +30,12 @@ export class DefaultQuantifierManager {
|
|
|
39
30
|
isMbqi: boolean,
|
|
40
31
|
) {
|
|
41
32
|
this.qiQueue = new QiQueue(context);
|
|
42
|
-
this.fingerprints = new FingerprintSet(context.manager);
|
|
43
33
|
const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
|
|
44
34
|
this.addInstance(quantifier, bindings, maxGeneration);
|
|
45
35
|
this.mam = new Mam(context, onMatch);
|
|
46
36
|
this.lazyMam = new Mam(context, onMatch);
|
|
47
37
|
if (!isMbqi) return;
|
|
48
|
-
const finder = new ModelFinder(context
|
|
38
|
+
const finder = new ModelFinder(context);
|
|
49
39
|
this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
|
|
50
40
|
}
|
|
51
41
|
|
|
@@ -109,7 +99,6 @@ export class DefaultQuantifierManager {
|
|
|
109
99
|
this.lazyMam.pushScope();
|
|
110
100
|
this.mbqi?.finder.pushScope();
|
|
111
101
|
this.qiQueue.push();
|
|
112
|
-
this.fingerprints.push();
|
|
113
102
|
}
|
|
114
103
|
|
|
115
104
|
pop(numScopes: number) {
|
|
@@ -117,7 +106,6 @@ export class DefaultQuantifierManager {
|
|
|
117
106
|
this.lazyMam.popScope(numScopes);
|
|
118
107
|
this.mbqi?.finder.popScope(numScopes);
|
|
119
108
|
this.qiQueue.pop(numScopes);
|
|
120
|
-
this.fingerprints.pop(numScopes);
|
|
121
109
|
}
|
|
122
110
|
|
|
123
111
|
canPropagate() {
|
|
@@ -131,7 +119,11 @@ export class DefaultQuantifierManager {
|
|
|
131
119
|
|
|
132
120
|
addInstance(quantifier: number, bindings: Enode[], maxGeneration: number) {
|
|
133
121
|
const generation = Math.max(maxGeneration, this.getGeneration(quantifier));
|
|
134
|
-
const roots = this.fingerprints.insert(
|
|
122
|
+
const roots = this.context.fingerprints.insert(
|
|
123
|
+
quantifier,
|
|
124
|
+
this.context.manager.ids[quantifier],
|
|
125
|
+
bindings,
|
|
126
|
+
);
|
|
135
127
|
if (roots !== null) this.qiQueue.insert(quantifier, roots, generation);
|
|
136
128
|
}
|
|
137
129
|
|