tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- 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 -16
- 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 +626 -56
- 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 +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -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 +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -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 +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- 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 +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -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 +219 -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 +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +2107 -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 +995 -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 +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -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 +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +1210 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -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 +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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
|
@@ -1,19 +1,31 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt. The
|
|
2
|
-
// preprocessing that the SMT kernel runs on its assertions before search.
|
|
3
1
|
import { SmtInvariantError } from "../../../errors";
|
|
4
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
AstManager,
|
|
4
|
+
KIND_APP,
|
|
5
|
+
KIND_QUANTIFIER,
|
|
6
|
+
OP_AND,
|
|
7
|
+
OP_EQ,
|
|
8
|
+
OP_ITE,
|
|
9
|
+
OP_NOT,
|
|
10
|
+
OP_OR,
|
|
11
|
+
SORT_BOOL,
|
|
12
|
+
QUANTIFIER_FORALL,
|
|
13
|
+
} from "./ast";
|
|
5
14
|
import { mkNot } from "./ast-util";
|
|
15
|
+
import { simplifyInjAxiom } from "./inj-axiom";
|
|
16
|
+
import { MacroManager } from "./macro-finder";
|
|
17
|
+
import { ElimBoundsRw } from "./elim-bounds";
|
|
6
18
|
import { DefinedNames, Nnf } from "./nnf";
|
|
7
19
|
import { PatternInference } from "./pattern-inference";
|
|
8
20
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
9
21
|
import { PullQuant } from "./pull-quant";
|
|
22
|
+
import { NgPushAppIteRw } from "./push-app-ite";
|
|
10
23
|
import { RefVector } from "./ref-vector";
|
|
11
24
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
12
25
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
26
|
+
import type { SmtConfig } from "./smt-setup";
|
|
13
27
|
|
|
14
|
-
|
|
15
|
-
// cache lives as long as the assertions, like Z3's.
|
|
16
|
-
class PatternInferenceRw extends RewriterTpl {
|
|
28
|
+
export class PatternInferenceRw extends RewriterTpl {
|
|
17
29
|
constructor(
|
|
18
30
|
manager: AstManager,
|
|
19
31
|
private inference: PatternInference,
|
|
@@ -24,9 +36,9 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
24
36
|
reduceQuantifier(expr: number, body: number) {
|
|
25
37
|
const manager = this.manager;
|
|
26
38
|
const data = manager.getQuantifier(expr);
|
|
27
|
-
if (
|
|
39
|
+
if (data.kind !== QUANTIFIER_FORALL || data.patterns.length > 0) return -1;
|
|
28
40
|
const quantifier = manager.withTemporaries(() => {
|
|
29
|
-
const inferred = this.inference.infer(data.sorts.length, body, data.weight);
|
|
41
|
+
const inferred = this.inference.infer(data.sorts.length, body, data.weight, data.noPatterns);
|
|
30
42
|
const withPatterns = manager.mkQuantifier({ ...data, body, patterns: inferred.patterns });
|
|
31
43
|
return inferred.weight === data.weight
|
|
32
44
|
? withPatterns
|
|
@@ -38,9 +50,6 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
38
50
|
});
|
|
39
51
|
});
|
|
40
52
|
if (manager.getQuantifier(quantifier).patterns.length > 0) return quantifier;
|
|
41
|
-
// pi_pull_quantifiers: pulling the nested quantifiers out may give the body a pattern. The
|
|
42
|
-
// quantifier with the new patterns replaces new_q at once, and the pulled quantifier and
|
|
43
|
-
// pull_quant's cache go when reduce_quantifier returns.
|
|
44
53
|
const pull = new PullQuant(manager);
|
|
45
54
|
const pulled = pull.rewrite(quantifier);
|
|
46
55
|
const pulledData = manager.getQuantifier(pulled);
|
|
@@ -61,12 +70,47 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
61
70
|
}
|
|
62
71
|
}
|
|
63
72
|
|
|
64
|
-
// Z3's
|
|
65
|
-
|
|
73
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
74
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
75
|
+
readonly definitions: RefVector;
|
|
76
|
+
private lims: number[] = [];
|
|
77
|
+
|
|
78
|
+
constructor(
|
|
79
|
+
manager: AstManager,
|
|
80
|
+
private names: DefinedNames,
|
|
81
|
+
) {
|
|
82
|
+
super(manager);
|
|
83
|
+
this.definitions = new RefVector(manager);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
87
|
+
const manager = this.manager;
|
|
88
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
89
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
90
|
+
manager.incRef(ite);
|
|
91
|
+
const named = this.names.mkName(ite);
|
|
92
|
+
manager.decRef(ite);
|
|
93
|
+
if (named.definition === -1) return -1;
|
|
94
|
+
this.definitions.push(named.definition);
|
|
95
|
+
manager.decRef(named.definition);
|
|
96
|
+
manager.incRef(named.name);
|
|
97
|
+
return named.name;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
push() {
|
|
101
|
+
this.lims.push(this.definitions.size);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pop() {
|
|
105
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
106
|
+
this.lims.pop();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
66
110
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
67
111
|
if (left === right) return false;
|
|
68
|
-
const isLeftValue = manager.
|
|
69
|
-
const isRightValue = manager.
|
|
112
|
+
const isLeftValue = manager.isValue(left);
|
|
113
|
+
const isRightValue = manager.isValue(right);
|
|
70
114
|
if (!isLeftValue && isRightValue) return true;
|
|
71
115
|
if (isLeftValue && !isRightValue) return false;
|
|
72
116
|
if (manager.depths[left] !== manager.depths[right])
|
|
@@ -83,8 +127,6 @@ const isGreater = (manager: AstManager, left: number, right: number): boolean =>
|
|
|
83
127
|
return false;
|
|
84
128
|
};
|
|
85
129
|
|
|
86
|
-
// expr_substitution under scoped_expr_substitution: the first entry for a key wins, and pop removes
|
|
87
|
-
// the entries since the matching push. The map and the trail hold their keys and values.
|
|
88
130
|
class Substitution {
|
|
89
131
|
readonly map = new Map<number, number>();
|
|
90
132
|
private trail: RefVector;
|
|
@@ -119,11 +161,9 @@ class Substitution {
|
|
|
119
161
|
this.trail.shrink(size);
|
|
120
162
|
}
|
|
121
163
|
|
|
122
|
-
// update_substitution: a ground equality is oriented by the order, and any other formula maps to
|
|
123
|
-
// true, or its atom to false.
|
|
124
164
|
update(expr: number) {
|
|
125
165
|
const manager = this.manager;
|
|
126
|
-
if (manager.
|
|
166
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
127
167
|
const left = manager.getArg(expr, 0);
|
|
128
168
|
const right = manager.getArg(expr, 1);
|
|
129
169
|
if (isGreater(manager, left, right)) {
|
|
@@ -140,15 +180,12 @@ class Substitution {
|
|
|
140
180
|
}
|
|
141
181
|
}
|
|
142
182
|
|
|
143
|
-
// asserted_formulas: the assertions of a context. Each assertion is rewritten when it is asserted,
|
|
144
|
-
// and reduce preprocesses the new ones. Their units and oriented equalities then rewrite the later
|
|
145
|
-
// assertions. Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
146
|
-
// A pushed scope: the number of formulas when it began, and m_inconsistent_old.
|
|
147
183
|
interface AssertedScope {
|
|
148
184
|
numFormulas: number;
|
|
149
185
|
isInconsistent: boolean;
|
|
150
186
|
}
|
|
151
187
|
|
|
188
|
+
// Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
152
189
|
export class AssertedFormulas {
|
|
153
190
|
private formulas: RefVector;
|
|
154
191
|
private qhead = 0;
|
|
@@ -156,31 +193,46 @@ export class AssertedFormulas {
|
|
|
156
193
|
private rewriter: Rewriter;
|
|
157
194
|
private isEliminatingAnd = false;
|
|
158
195
|
private isReducePending = true;
|
|
196
|
+
private isNnfCnf = true;
|
|
197
|
+
private isEq2Ineq = false;
|
|
198
|
+
private isEliminatingTermIte = false;
|
|
199
|
+
private isLiftingNonGroundIte = false;
|
|
200
|
+
private isEliminatingBounds = false;
|
|
159
201
|
private names: DefinedNames;
|
|
202
|
+
private termIteElim: ElimTermIteRw;
|
|
160
203
|
private patternInference: PatternInferenceRw;
|
|
161
204
|
private bvSharing: MaxBvSharing;
|
|
162
|
-
private
|
|
163
|
-
|
|
205
|
+
private ngLiftIte: NgPushAppIteRw;
|
|
206
|
+
private boundsElim: ElimBoundsRw;
|
|
207
|
+
hasQuantifiers = false;
|
|
208
|
+
readonly macros: MacroManager;
|
|
164
209
|
isInconsistent = false;
|
|
165
|
-
|
|
210
|
+
isPreprocessing = true;
|
|
166
211
|
private numLazyScopes = 0;
|
|
167
212
|
private scopes: AssertedScope[] = [];
|
|
168
213
|
|
|
169
|
-
constructor(
|
|
214
|
+
constructor(
|
|
215
|
+
private manager: AstManager,
|
|
216
|
+
private isFindingMacros = false,
|
|
217
|
+
) {
|
|
170
218
|
this.formulas = new RefVector(manager);
|
|
219
|
+
this.macros = new MacroManager(manager);
|
|
171
220
|
this.substitution = new Substitution(manager);
|
|
172
|
-
|
|
221
|
+
// set_eliminate_and turns coalesce_chars off when smt.string_solver is seq, its default, so
|
|
222
|
+
// string literals reach the seq theory as concatenations of units.
|
|
223
|
+
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
173
224
|
this.names = new DefinedNames(manager);
|
|
225
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
174
226
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
175
227
|
this.bvSharing = new MaxBvSharing(manager);
|
|
228
|
+
this.ngLiftIte = new NgPushAppIteRw(manager);
|
|
229
|
+
this.boundsElim = new ElimBoundsRw(manager);
|
|
176
230
|
}
|
|
177
231
|
|
|
178
|
-
// push_scope: the scope is pushed when a formula is asserted in it.
|
|
179
232
|
push() {
|
|
180
233
|
this.numLazyScopes++;
|
|
181
234
|
}
|
|
182
235
|
|
|
183
|
-
// pop_scope: removes the formulas, names and substitutions since the matching push.
|
|
184
236
|
pop() {
|
|
185
237
|
if (this.numLazyScopes > 0) {
|
|
186
238
|
this.numLazyScopes--;
|
|
@@ -190,19 +242,24 @@ export class AssertedFormulas {
|
|
|
190
242
|
this.scopes.pop();
|
|
191
243
|
this.isInconsistent = scope.isInconsistent;
|
|
192
244
|
this.bvSharing.popScope();
|
|
245
|
+
this.macros.popScope();
|
|
193
246
|
this.names.pop();
|
|
247
|
+
this.termIteElim.pop();
|
|
194
248
|
this.substitution.pop();
|
|
195
249
|
this.formulas.shrink(scope.numFormulas);
|
|
196
250
|
this.qhead = scope.numFormulas;
|
|
197
251
|
this.flushCache();
|
|
198
252
|
}
|
|
199
253
|
|
|
200
|
-
// force_push: the pushed formulas are already reduced and committed.
|
|
201
254
|
private forcePush() {
|
|
202
255
|
for (; this.numLazyScopes > 0; this.numLazyScopes--) {
|
|
256
|
+
this.reduce();
|
|
257
|
+
this.commit();
|
|
203
258
|
this.substitution.push();
|
|
204
259
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
205
260
|
this.names.push();
|
|
261
|
+
this.termIteElim.push();
|
|
262
|
+
this.macros.pushScope();
|
|
206
263
|
this.bvSharing.pushScope();
|
|
207
264
|
}
|
|
208
265
|
}
|
|
@@ -211,11 +268,35 @@ export class AssertedFormulas {
|
|
|
211
268
|
this.forcePush();
|
|
212
269
|
const manager = this.manager;
|
|
213
270
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
271
|
+
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
272
|
+
this.isReducePending = true;
|
|
273
|
+
if (!this.isPreprocessing) {
|
|
274
|
+
this.pushAssertion(expr, this.formulas);
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
214
277
|
this.setEliminateAnd(false);
|
|
215
278
|
const rewritten = this.rewriter.rewrite(expr);
|
|
216
|
-
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
217
279
|
this.pushAssertion(rewritten, this.formulas);
|
|
218
280
|
manager.decRef(rewritten);
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
// The setup's parameters, which set_eliminate_and gives the rewriter.
|
|
284
|
+
setup(config: SmtConfig) {
|
|
285
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
286
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
287
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
288
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
289
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
290
|
+
this.isFindingMacros ||= config.isFindingMacros;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
updateParams(config: SmtConfig) {
|
|
294
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
295
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
296
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
297
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
298
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
299
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
219
300
|
this.isReducePending = true;
|
|
220
301
|
}
|
|
221
302
|
|
|
@@ -223,50 +304,55 @@ export class AssertedFormulas {
|
|
|
223
304
|
return this.formulas.size;
|
|
224
305
|
}
|
|
225
306
|
|
|
226
|
-
|
|
227
|
-
|
|
307
|
+
getFormulas() {
|
|
308
|
+
return this.formulas.items;
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
getQhead() {
|
|
312
|
+
return this.qhead;
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
commit(qhead = this.formulas.size) {
|
|
316
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
317
|
+
this.macros.markForbidden(committed);
|
|
318
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
319
|
+
this.qhead = qhead;
|
|
320
|
+
}
|
|
321
|
+
|
|
228
322
|
reduce() {
|
|
229
|
-
if (this.qhead === this.formulas.size) return
|
|
230
|
-
if (!this.
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
for (const formula of result) this.substitution.update(formula);
|
|
234
|
-
this.qhead = this.formulas.size;
|
|
235
|
-
return result;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
// asserted_formulas::reduce: each step but the last stops the preprocessing when a formula is
|
|
239
|
-
// false.
|
|
240
|
-
private reduceCore() {
|
|
323
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
324
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
325
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
326
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
241
327
|
this.setEliminateAnd(false);
|
|
242
|
-
this.propagateValues();
|
|
243
|
-
if (this.
|
|
244
|
-
this.
|
|
245
|
-
this.nnfCnf();
|
|
246
|
-
if (this.isInconsistent) return;
|
|
328
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
329
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
330
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
247
331
|
this.setEliminateAnd(true);
|
|
248
|
-
this.reduceAsserted();
|
|
249
|
-
if (this.
|
|
250
|
-
if (
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
)
|
|
254
|
-
|
|
255
|
-
if (this.
|
|
256
|
-
|
|
257
|
-
if (this.
|
|
258
|
-
|
|
259
|
-
if (this.isInconsistent) return;
|
|
260
|
-
this.reduceAsserted();
|
|
261
|
-
if (this.isInconsistent) return;
|
|
262
|
-
this.isReducePending = true;
|
|
263
|
-
this.flattenClauses();
|
|
264
|
-
if (this.isInconsistent) return;
|
|
332
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
333
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
334
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
335
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
336
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
337
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
338
|
+
return;
|
|
339
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
341
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
342
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
265
343
|
this.flushCache();
|
|
266
344
|
}
|
|
267
345
|
|
|
268
|
-
|
|
269
|
-
|
|
346
|
+
private isCanceled() {
|
|
347
|
+
return !this.manager.limit.inc();
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
351
|
+
if (!isApplying) return true;
|
|
352
|
+
step();
|
|
353
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
354
|
+
}
|
|
355
|
+
|
|
270
356
|
private pushAssertion(expr: number, result: RefVector) {
|
|
271
357
|
const manager = this.manager;
|
|
272
358
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -286,7 +372,6 @@ export class AssertedFormulas {
|
|
|
286
372
|
if (op === OP_NOT && manager.getOp(manager.getArg(expr, 0)) === OP_OR) {
|
|
287
373
|
const disjunction = manager.getArg(expr, 0);
|
|
288
374
|
for (let index = 0; index < manager.getNumArgs(disjunction); index++) {
|
|
289
|
-
// narg holds the negation while it is pushed.
|
|
290
375
|
const negation = mkNot(manager, manager.getArg(disjunction, index));
|
|
291
376
|
manager.incRef(negation);
|
|
292
377
|
this.pushAssertion(negation, result);
|
|
@@ -297,7 +382,58 @@ export class AssertedFormulas {
|
|
|
297
382
|
result.push(expr);
|
|
298
383
|
}
|
|
299
384
|
|
|
300
|
-
|
|
385
|
+
private refineInjAxiom(formula: number) {
|
|
386
|
+
const manager = this.manager;
|
|
387
|
+
const refined =
|
|
388
|
+
manager.kinds[formula] === KIND_QUANTIFIER ? simplifyInjAxiom(manager, formula) : undefined;
|
|
389
|
+
if (refined !== undefined) return refined;
|
|
390
|
+
manager.incRef(formula);
|
|
391
|
+
return formula;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private elimTermIte() {
|
|
395
|
+
const elim = this.termIteElim;
|
|
396
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
397
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
398
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
399
|
+
this.flushCache();
|
|
400
|
+
this.reduceAsserted();
|
|
401
|
+
elim.reset();
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
405
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
406
|
+
this.flushCache();
|
|
407
|
+
this.reduceAsserted();
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
private liftNonGroundIte() {
|
|
411
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
private refineInjAxioms() {
|
|
415
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
private elimBounds() {
|
|
419
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
420
|
+
}
|
|
421
|
+
|
|
422
|
+
private inferPatterns() {
|
|
423
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
private maximizeBvSharing() {
|
|
427
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
private findMacros() {
|
|
431
|
+
this.isReducePending = true;
|
|
432
|
+
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
433
|
+
this.flushCache();
|
|
434
|
+
this.reduceAsserted();
|
|
435
|
+
}
|
|
436
|
+
|
|
301
437
|
private flushCache() {
|
|
302
438
|
this.rewriter.setSubstitution(this.substitution.map);
|
|
303
439
|
}
|
|
@@ -307,47 +443,43 @@ export class AssertedFormulas {
|
|
|
307
443
|
this.isEliminatingAnd = isEliminatingAnd;
|
|
308
444
|
this.isReducePending = true;
|
|
309
445
|
this.rewriter.setEliminatingAnd(isEliminatingAnd);
|
|
446
|
+
this.rewriter.setEq2Ineq(this.isEq2Ineq);
|
|
310
447
|
this.flushCache();
|
|
311
448
|
}
|
|
312
449
|
|
|
313
|
-
// swap_asserted_formulas: the new formulas replace those from qhead on.
|
|
314
450
|
private swapFormulas(formulas: RefVector) {
|
|
315
451
|
this.formulas.shrink(this.qhead);
|
|
316
452
|
for (const formula of formulas.items) this.formulas.push(formula);
|
|
317
453
|
formulas.reset();
|
|
318
454
|
}
|
|
319
455
|
|
|
320
|
-
// simplify_fmls: a formula that simplify changes is split again. simplify returns its result with
|
|
321
|
-
// a reference. Whether a formula changed.
|
|
322
456
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
323
457
|
const manager = this.manager;
|
|
324
458
|
const formulas = new RefVector(manager);
|
|
325
|
-
let isChanged = false;
|
|
326
459
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
327
460
|
const formula = this.formulas.items[index];
|
|
328
461
|
const result = simplify(formula);
|
|
329
462
|
if (result === formula) formulas.push(formula);
|
|
330
463
|
else {
|
|
331
464
|
this.pushAssertion(result, formulas);
|
|
332
|
-
|
|
465
|
+
this.isReducePending = true;
|
|
333
466
|
}
|
|
334
467
|
manager.decRef(result);
|
|
468
|
+
if (this.isCanceled()) {
|
|
469
|
+
formulas.reset();
|
|
470
|
+
return false;
|
|
471
|
+
}
|
|
335
472
|
}
|
|
336
473
|
this.swapFormulas(formulas);
|
|
337
|
-
return
|
|
474
|
+
return true;
|
|
338
475
|
}
|
|
339
476
|
|
|
340
|
-
// reduce_asserted_formulas: the rewriter rewrites the formulas, unless they are already in its
|
|
341
|
-
// normal form.
|
|
342
477
|
private reduceAsserted() {
|
|
343
478
|
if (!this.isReducePending) return;
|
|
344
479
|
this.simplifyFormulas((formula) => this.rewriter.rewrite(formula));
|
|
345
480
|
this.isReducePending = false;
|
|
346
481
|
}
|
|
347
482
|
|
|
348
|
-
// asserted_formulas::propagate_values: a forward and a backward pass that rewrite each formula with
|
|
349
|
-
// the committed substitution and the units of the formulas before it. Z3 stops after one round,
|
|
350
|
-
// since the passes add no formula. When a formula changed, reduce-asserted rewrites them all.
|
|
351
483
|
private propagateValues() {
|
|
352
484
|
const manager = this.manager;
|
|
353
485
|
const substitution = this.substitution;
|
|
@@ -376,33 +508,43 @@ export class AssertedFormulas {
|
|
|
376
508
|
if (numPropagated > 0) this.reduceAsserted();
|
|
377
509
|
}
|
|
378
510
|
|
|
379
|
-
// asserted_formulas::nnf_cnf: one NNF object normalizes every formula, and the rewriter, which does
|
|
380
|
-
// not eliminate and yet, rewrites each normal form and the definitions of the names it introduced.
|
|
381
511
|
private nnfCnf() {
|
|
512
|
+
this.isReducePending = true;
|
|
382
513
|
const manager = this.manager;
|
|
383
514
|
const nnf = new Nnf(manager, this.names);
|
|
384
515
|
const formulas = new RefVector(manager);
|
|
385
516
|
const todo = new RefVector(manager);
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
517
|
+
const isFinished = (() => {
|
|
518
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
519
|
+
todo.reset();
|
|
520
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
521
|
+
todo.push(result);
|
|
522
|
+
if (this.isCanceled()) {
|
|
523
|
+
manager.decRef(result);
|
|
524
|
+
return false;
|
|
525
|
+
}
|
|
526
|
+
for (let position = 0; position < todo.size; position++) {
|
|
527
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
528
|
+
manager.decRef(result);
|
|
529
|
+
result = rewritten;
|
|
530
|
+
if (this.isCanceled()) {
|
|
531
|
+
manager.decRef(result);
|
|
532
|
+
return false;
|
|
533
|
+
}
|
|
534
|
+
this.pushAssertion(result, formulas);
|
|
535
|
+
}
|
|
392
536
|
manager.decRef(result);
|
|
393
|
-
result = rewritten;
|
|
394
|
-
this.pushAssertion(result, formulas);
|
|
395
537
|
}
|
|
396
|
-
|
|
397
|
-
}
|
|
398
|
-
this.swapFormulas(formulas);
|
|
538
|
+
return true;
|
|
539
|
+
})();
|
|
540
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
399
541
|
todo.reset();
|
|
542
|
+
formulas.reset();
|
|
400
543
|
nnf.release();
|
|
401
544
|
}
|
|
402
545
|
|
|
403
|
-
// asserted_formulas::flatten_clauses: an ite at the top becomes two clauses, and a conjunction
|
|
404
|
-
// that occurs in one binary clause is distributed.
|
|
405
546
|
private flattenClauses() {
|
|
547
|
+
this.isReducePending = true;
|
|
406
548
|
const manager = this.manager;
|
|
407
549
|
const mkNegation = (expr: number) =>
|
|
408
550
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
|