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,7 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt. The eq_der of qe-lite: destructive equality resolution, which removes the
|
|
3
|
-
// variables of a quantifier that its body defines by an equality, with the solve plugins for
|
|
4
|
-
// Booleans and integer arithmetic.
|
|
5
1
|
import {
|
|
6
2
|
KIND_VAR,
|
|
7
3
|
OP_ADD,
|
|
@@ -24,7 +20,6 @@ import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
|
24
20
|
import { BetaReducer } from "./rewriter-tpl";
|
|
25
21
|
import { assign, assignOwned, release } from "./expr-ref";
|
|
26
22
|
|
|
27
|
-
// A summand of a linear equation and whether it is on the left-hand side.
|
|
28
23
|
interface SignedExpr {
|
|
29
24
|
isLeft: boolean;
|
|
30
25
|
expr: number;
|
|
@@ -32,11 +27,9 @@ interface SignedExpr {
|
|
|
32
27
|
|
|
33
28
|
interface SolvedVar {
|
|
34
29
|
variable: number;
|
|
35
|
-
// Held by a reference that the receiver releases.
|
|
36
30
|
term: number;
|
|
37
31
|
}
|
|
38
32
|
|
|
39
|
-
// eq_der: destructive equality resolution on a conjunction.
|
|
40
33
|
export class EqDer {
|
|
41
34
|
private subst: BetaReducer;
|
|
42
35
|
private substMap: RefVector;
|
|
@@ -47,8 +40,7 @@ export class EqDer {
|
|
|
47
40
|
private var2pos: number[] = [];
|
|
48
41
|
private inx2var: number[] = [];
|
|
49
42
|
private order: number[] = [];
|
|
50
|
-
|
|
51
|
-
numVars = 0;
|
|
43
|
+
isVariableIndex: (index: number) => boolean = () => false;
|
|
52
44
|
|
|
53
45
|
constructor(private manager: AstManager) {
|
|
54
46
|
this.subst = new BetaReducer(manager);
|
|
@@ -59,16 +51,14 @@ export class EqDer {
|
|
|
59
51
|
|
|
60
52
|
private isVariable(expr: number) {
|
|
61
53
|
const manager = this.manager;
|
|
62
|
-
return manager.kinds[expr] === KIND_VAR && manager.values[expr]
|
|
54
|
+
return manager.kinds[expr] === KIND_VAR && this.isVariableIndex(manager.values[expr]);
|
|
63
55
|
}
|
|
64
56
|
|
|
65
|
-
// operator(): reduce_var_set until nothing changes.
|
|
66
57
|
apply(conjs: RefVector) {
|
|
67
58
|
while (this.reduceVarSet(conjs));
|
|
68
59
|
this.newExprs.reset();
|
|
69
60
|
}
|
|
70
61
|
|
|
71
|
-
// ~eq_der.
|
|
72
62
|
release() {
|
|
73
63
|
this.rewriter.release();
|
|
74
64
|
this.newExprs.reset();
|
|
@@ -78,7 +68,6 @@ export class EqDer {
|
|
|
78
68
|
|
|
79
69
|
private reduceVarSet(conjs: RefVector) {
|
|
80
70
|
const manager = this.manager;
|
|
81
|
-
// flatten_definitions: a false conjunct is the whole conjunction.
|
|
82
71
|
const falseConj = conjs.items.find((conj) => manager.isFalse(conj));
|
|
83
72
|
if (falseConj !== undefined) {
|
|
84
73
|
conjs.set(0, falseConj);
|
|
@@ -105,8 +94,6 @@ export class EqDer {
|
|
|
105
94
|
return this.removeUnconstrained(conjs) || isReduced;
|
|
106
95
|
}
|
|
107
96
|
|
|
108
|
-
// find_definitions: one definition per variable, preferring values, then ground terms, then
|
|
109
|
-
// constants.
|
|
110
97
|
private findDefinitions(args: number[]) {
|
|
111
98
|
const manager = this.manager;
|
|
112
99
|
let numDefs = 0;
|
|
@@ -158,7 +145,6 @@ export class EqDer {
|
|
|
158
145
|
return { numDefs, largestIndex };
|
|
159
146
|
}
|
|
160
147
|
|
|
161
|
-
// is_var_eq: a variable and its definition from a literal, through the solve plugin of the sort.
|
|
162
148
|
private getVarEq(expr: number, vars: number[], terms: RefVector) {
|
|
163
149
|
const manager = this.manager;
|
|
164
150
|
const isEq = manager.getOp(expr) === OP_EQ;
|
|
@@ -174,7 +160,6 @@ export class EqDer {
|
|
|
174
160
|
}
|
|
175
161
|
const sort = isEq ? manager.sorts[manager.getArg(expr, 0)] : manager.sorts[expr];
|
|
176
162
|
if (sort !== SORT_BOOL && sort !== SORT_INT) return false;
|
|
177
|
-
// solve_plugin::operator(): the arithmetic plugin only sees positive equalities.
|
|
178
163
|
const isNegated = manager.isNot(expr);
|
|
179
164
|
const solved =
|
|
180
165
|
sort === SORT_INT
|
|
@@ -192,7 +177,6 @@ export class EqDer {
|
|
|
192
177
|
return isFound;
|
|
193
178
|
}
|
|
194
179
|
|
|
195
|
-
// arith_solve_plugin::is_invertible_const: a numeral that a variable's coefficient may be.
|
|
196
180
|
private getInvertibleConst(expr: number): bigint | undefined {
|
|
197
181
|
const manager = this.manager;
|
|
198
182
|
if (manager.getOp(expr) === OP_UMINUS) {
|
|
@@ -203,7 +187,6 @@ export class EqDer {
|
|
|
203
187
|
return value === 1n || value === -1n ? value : undefined;
|
|
204
188
|
}
|
|
205
189
|
|
|
206
|
-
// arith_solve_plugin::is_invertible_mul: a variable times an invertible coefficient.
|
|
207
190
|
private getInvertibleMul(expr: number) {
|
|
208
191
|
const manager = this.manager;
|
|
209
192
|
if (this.isVariable(expr)) return { variable: expr, coefficient: 1n };
|
|
@@ -219,7 +202,6 @@ export class EqDer {
|
|
|
219
202
|
return undefined;
|
|
220
203
|
}
|
|
221
204
|
|
|
222
|
-
// arith_solve_plugin::solve: lhs = rhs as variable = term.
|
|
223
205
|
private solveLinear(lhs: number, rhs: number): SolvedVar | undefined {
|
|
224
206
|
const manager = this.manager;
|
|
225
207
|
if (manager.sorts[lhs] !== SORT_INT) return undefined;
|
|
@@ -246,8 +228,6 @@ export class EqDer {
|
|
|
246
228
|
continue;
|
|
247
229
|
}
|
|
248
230
|
done.push(...todo);
|
|
249
|
-
// mk_term: the other summands times the inverse of the coefficient, negated on the
|
|
250
|
-
// variable's side.
|
|
251
231
|
const coefficient = 1n / mul.coefficient;
|
|
252
232
|
const isLeft = item.isLeft;
|
|
253
233
|
const terms = new RefVector(manager);
|
|
@@ -273,7 +253,6 @@ export class EqDer {
|
|
|
273
253
|
return undefined;
|
|
274
254
|
}
|
|
275
255
|
|
|
276
|
-
// arith_solve_plugin::mk_eq_core.
|
|
277
256
|
private mkArithEqCore(inputLeft: number, inputRight: number) {
|
|
278
257
|
const manager = this.manager;
|
|
279
258
|
const solved = this.solveLinear(inputLeft, inputRight);
|
|
@@ -306,8 +285,6 @@ export class EqDer {
|
|
|
306
285
|
return result;
|
|
307
286
|
}
|
|
308
287
|
|
|
309
|
-
// arith_solve_plugin::try_int_mul_solve: k*y = x becomes y = x div k and x mod k = 0, or x = 0
|
|
310
|
-
// when k is zero.
|
|
311
288
|
private tryIntMulSolve(atom: number) {
|
|
312
289
|
const manager = this.manager;
|
|
313
290
|
if (manager.sorts[manager.getArg(atom, 0)] !== SORT_INT) return -1;
|
|
@@ -341,7 +318,6 @@ export class EqDer {
|
|
|
341
318
|
return result;
|
|
342
319
|
}
|
|
343
320
|
|
|
344
|
-
// arith_solve_plugin::solve on a positive equality.
|
|
345
321
|
private solveArithEq(atom: number) {
|
|
346
322
|
const manager = this.manager;
|
|
347
323
|
const mulSolved = this.tryIntMulSolve(atom);
|
|
@@ -361,7 +337,6 @@ export class EqDer {
|
|
|
361
337
|
return result;
|
|
362
338
|
}
|
|
363
339
|
|
|
364
|
-
// basic_solve_plugin::solve.
|
|
365
340
|
private solveBasic(atom: number, isPositive: boolean): number {
|
|
366
341
|
const manager = this.manager;
|
|
367
342
|
let result = assign(manager, -1, atom);
|
|
@@ -409,8 +384,6 @@ export class EqDer {
|
|
|
409
384
|
return negated;
|
|
410
385
|
}
|
|
411
386
|
|
|
412
|
-
// der_sort_vars: the definitions in an order where each only uses the ones before it, dropping
|
|
413
|
-
// the definitions on a cycle.
|
|
414
387
|
private sortVars() {
|
|
415
388
|
const manager = this.manager;
|
|
416
389
|
const definitions = this.map;
|
|
@@ -489,7 +462,6 @@ export class EqDer {
|
|
|
489
462
|
}
|
|
490
463
|
}
|
|
491
464
|
|
|
492
|
-
// is_unconstrained: an integer variable that no other conjunct mentions.
|
|
493
465
|
private isUnconstrained(variable: number, term: number, position: number, conjs: number[]) {
|
|
494
466
|
const manager = this.manager;
|
|
495
467
|
const index = manager.values[variable];
|
|
@@ -500,7 +472,6 @@ export class EqDer {
|
|
|
500
472
|
);
|
|
501
473
|
}
|
|
502
474
|
|
|
503
|
-
// remove_unconstrained: a disequality on an unconstrained integer variable holds.
|
|
504
475
|
private removeUnconstrained(conjs: RefVector) {
|
|
505
476
|
const manager = this.manager;
|
|
506
477
|
let isReduced = false;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp), MIT license, see z3-license.txt. The fm of
|
|
2
|
-
// qe-lite: Fourier-Motzkin elimination of the integer variables of a quantifier that only occur in
|
|
3
|
-
// clauses with one linear inequality.
|
|
4
1
|
import {
|
|
5
2
|
KIND_QUANTIFIER,
|
|
6
3
|
KIND_VAR,
|
|
@@ -17,14 +14,11 @@ import {
|
|
|
17
14
|
import { getGcd } from "./rational";
|
|
18
15
|
import { RefVector } from "./ref-vector";
|
|
19
16
|
|
|
20
|
-
// fm's parameters.
|
|
21
17
|
const FM_LIMIT = 5000000;
|
|
22
18
|
const FM_CUTOFF1 = 8;
|
|
23
19
|
const FM_CUTOFF2 = 256;
|
|
24
20
|
const FM_EXTRA = 0;
|
|
25
21
|
|
|
26
|
-
// A clause of Boolean literals and one linear inequality, a1*x1 + ... + an*xn <= c, or < c when
|
|
27
|
-
// strict. A literal is the index of a Boolean constant, negative when negated.
|
|
28
22
|
interface Constraint {
|
|
29
23
|
lits: number[];
|
|
30
24
|
xs: number[];
|
|
@@ -34,8 +28,6 @@ interface Constraint {
|
|
|
34
28
|
isDead: boolean;
|
|
35
29
|
}
|
|
36
30
|
|
|
37
|
-
// fm: Fourier-Motzkin elimination of the integer variables that only occur in clauses with one
|
|
38
|
-
// linear inequality.
|
|
39
31
|
export class Fm {
|
|
40
32
|
private constraints: Constraint[] = [];
|
|
41
33
|
private bvar2expr: RefVector;
|
|
@@ -52,9 +44,8 @@ export class Fm {
|
|
|
52
44
|
private newFmls: RefVector;
|
|
53
45
|
private counter = 0;
|
|
54
46
|
private isInconsistent = false;
|
|
55
|
-
// m_sub_todo: the constraints to check for backward subsumption.
|
|
56
47
|
private subTodo: Constraint[] = [];
|
|
57
|
-
|
|
48
|
+
isVariableIndex: (index: number) => boolean = () => false;
|
|
58
49
|
|
|
59
50
|
constructor(private manager: AstManager) {
|
|
60
51
|
this.bvar2expr = new RefVector(manager);
|
|
@@ -62,7 +53,6 @@ export class Fm {
|
|
|
62
53
|
this.newFmls = new RefVector(manager);
|
|
63
54
|
}
|
|
64
55
|
|
|
65
|
-
// ~fm.
|
|
66
56
|
release() {
|
|
67
57
|
this.resetConstraints();
|
|
68
58
|
this.newFmls.reset();
|
|
@@ -100,14 +90,13 @@ export class Fm {
|
|
|
100
90
|
this.newFmls.push(this.manager.falseExpr);
|
|
101
91
|
}
|
|
102
92
|
|
|
103
|
-
// Z3 keeps m_expr2bvar from the previous run, whose indices then point into the new, shorter
|
|
104
|
-
// m_bvar2expr. This port clears it.
|
|
105
93
|
private init(fmls: number[]) {
|
|
106
94
|
this.subTodo = [];
|
|
107
95
|
this.resetConstraints();
|
|
108
96
|
this.bvar2expr.reset();
|
|
109
97
|
this.bvar2sign = [0];
|
|
110
98
|
this.bvar2expr.push(-1);
|
|
99
|
+
// Z3 keeps m_expr2bvar from the previous run, whose indices then point into the new m_bvar2expr.
|
|
111
100
|
this.expr2bvar.clear();
|
|
112
101
|
this.expr2var.clear();
|
|
113
102
|
this.isInt = [];
|
|
@@ -124,7 +113,7 @@ export class Fm {
|
|
|
124
113
|
|
|
125
114
|
private isVariable(expr: number) {
|
|
126
115
|
const manager = this.manager;
|
|
127
|
-
return manager.kinds[expr] === KIND_VAR && manager.values[expr]
|
|
116
|
+
return manager.kinds[expr] === KIND_VAR && this.isVariableIndex(manager.values[expr]);
|
|
128
117
|
}
|
|
129
118
|
|
|
130
119
|
private isLiteral(expr: number) {
|
|
@@ -135,7 +124,6 @@ export class Fm {
|
|
|
135
124
|
);
|
|
136
125
|
}
|
|
137
126
|
|
|
138
|
-
// is_linear_mon_core: the variable of x or c*x.
|
|
139
127
|
private getMonomialVar(expr: number) {
|
|
140
128
|
const manager = this.manager;
|
|
141
129
|
if (manager.getOp(expr) === OP_MUL && manager.getNumArgs(expr) === 2) {
|
|
@@ -173,7 +161,6 @@ export class Fm {
|
|
|
173
161
|
return manager.isInt(lhs) && manager.isNumeral(rhs) && this.isLinearPol(lhs);
|
|
174
162
|
}
|
|
175
163
|
|
|
176
|
-
// is_occ: a clause of literals with one linear inequality.
|
|
177
164
|
private isOcc(expr: number) {
|
|
178
165
|
const manager = this.manager;
|
|
179
166
|
if (manager.getOp(expr) !== OP_OR) return this.isLinearIneq(expr);
|
|
@@ -187,7 +174,6 @@ export class Fm {
|
|
|
187
174
|
return isFound;
|
|
188
175
|
}
|
|
189
176
|
|
|
190
|
-
// init_forbidden_set: the integer variables that occur outside the clauses are not eliminated.
|
|
191
177
|
private initForbiddenSet(fmls: number[]) {
|
|
192
178
|
const manager = this.manager;
|
|
193
179
|
this.forbiddenSet.clear();
|
|
@@ -204,7 +190,7 @@ export class Fm {
|
|
|
204
190
|
this.forbiddenSet.add(manager.values[expr]);
|
|
205
191
|
} else if (kind === KIND_QUANTIFIER) {
|
|
206
192
|
const data = manager.getQuantifier(expr);
|
|
207
|
-
todo.push(data.body, ...data.patterns);
|
|
193
|
+
todo.push(data.body, ...data.patterns, ...data.noPatterns);
|
|
208
194
|
} else manager.pushArgs(expr, todo);
|
|
209
195
|
}
|
|
210
196
|
}
|
|
@@ -289,7 +275,6 @@ export class Fm {
|
|
|
289
275
|
this.registerConstraint({ lits, xs, as, c, isStrict, isDead: false });
|
|
290
276
|
}
|
|
291
277
|
|
|
292
|
-
// normalize_coeffs: divides by the gcd of the coefficients and the constant.
|
|
293
278
|
private normalizeCoeffs(constraint: Constraint) {
|
|
294
279
|
if (constraint.xs.length === 0) return;
|
|
295
280
|
let divisor = constraint.c < 0n ? -constraint.c : constraint.c;
|
|
@@ -344,7 +329,6 @@ export class Fm {
|
|
|
344
329
|
this.constraints = [];
|
|
345
330
|
}
|
|
346
331
|
|
|
347
|
-
// to_expr: the constraint as a formula, with a raw reference like Z3's.
|
|
348
332
|
private toExpr(constraint: Constraint) {
|
|
349
333
|
const manager = this.manager;
|
|
350
334
|
let ineq = -1;
|
|
@@ -375,8 +359,6 @@ export class Fm {
|
|
|
375
359
|
return lits.length === 1 ? lits[0] : manager.mkApp(OP_OR, lits, SORT_BOOL);
|
|
376
360
|
}
|
|
377
361
|
|
|
378
|
-
// subsumes: c1's literals are among c2's, the polynomials are the same, and c1's bound is at most
|
|
379
|
-
// c2's.
|
|
380
362
|
private isSubsuming(first: Constraint, second: Constraint) {
|
|
381
363
|
if (first === second) return false;
|
|
382
364
|
if (first.lits.length > second.lits.length || first.xs.length !== second.xs.length)
|
|
@@ -436,8 +418,6 @@ export class Fm {
|
|
|
436
418
|
if (!constraint.isDead) this.backwardSubsumption(constraint);
|
|
437
419
|
}
|
|
438
420
|
|
|
439
|
-
// sort_candidates: the variables without a lower or upper bound first, then by the number of
|
|
440
|
-
// constraints they would create.
|
|
441
421
|
private sortCandidates() {
|
|
442
422
|
const costs: [number, number][] = [];
|
|
443
423
|
this.forbidden.forEach((isForbidden, variable) => {
|
|
@@ -455,7 +435,6 @@ export class Fm {
|
|
|
455
435
|
return costs.map((cost) => cost[0]);
|
|
456
436
|
}
|
|
457
437
|
|
|
458
|
-
// analyze: whether every variable is an integer, and whether x's coefficients are all 1 or -1.
|
|
459
438
|
private analyze(constraints: Constraint[], variable: number) {
|
|
460
439
|
let isUnit = true;
|
|
461
440
|
for (const constraint of constraints)
|
|
@@ -481,8 +460,6 @@ export class Fm {
|
|
|
481
460
|
for (const constraint of this.uppers[variable]) constraint.isDead = true;
|
|
482
461
|
}
|
|
483
462
|
|
|
484
|
-
// resolve: the combination of a lower and an upper bound of x without x, or undefined when it
|
|
485
|
-
// holds.
|
|
486
463
|
private resolve(lower: Constraint, upper: Constraint, variable: number) {
|
|
487
464
|
this.counter += lower.xs.length + upper.xs.length + lower.lits.length + upper.lits.length;
|
|
488
465
|
const a = -lower.as[lower.xs.indexOf(variable)];
|
|
@@ -561,7 +538,6 @@ export class Fm {
|
|
|
561
538
|
}
|
|
562
539
|
}
|
|
563
540
|
|
|
564
|
-
// copy_remaining: the live constraints of the upper bounds, then of the lower bounds.
|
|
565
541
|
private copyRemaining() {
|
|
566
542
|
for (const lists of [this.uppers, this.lowers])
|
|
567
543
|
for (const constraints of lists)
|
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. The qe-lite tactic of Z3's ufnia strategy: each quantifier, innermost first, loses
|
|
3
|
-
// the variables that its body defines by an equality, Fourier-Motzkin elimination removes integer
|
|
4
|
-
// variables that only occur in bounds, and a quantifier over a small integer range becomes a finite
|
|
5
|
-
// disjunction. Like Z3, the port counts references, so that expressions are created and deleted in
|
|
6
|
-
// Z3's order. Arrays, bit-vectors and datatypes are not ported, as tlapm's encoding does not produce
|
|
7
|
-
// them.
|
|
8
1
|
import {
|
|
9
2
|
KIND_QUANTIFIER,
|
|
10
3
|
KIND_VAR,
|
|
@@ -19,8 +12,11 @@ import {
|
|
|
19
12
|
SORT_BOOL,
|
|
20
13
|
SORT_INT,
|
|
21
14
|
type AstManager,
|
|
15
|
+
QUANTIFIER_FORALL,
|
|
16
|
+
QUANTIFIER_LAMBDA,
|
|
22
17
|
} from "./ast";
|
|
23
18
|
import { flattenAndVector, flattenOrVector, pushNotOwned } from "./ast-util";
|
|
19
|
+
import { finishSimplifier } from "./dependent-expr-state";
|
|
24
20
|
import { isOccurring } from "./der";
|
|
25
21
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
26
22
|
import type { Goal } from "./goal";
|
|
@@ -33,10 +29,8 @@ import { assign, assignOwned, release } from "./expr-ref";
|
|
|
33
29
|
import { EqDer } from "./qe-lite-der";
|
|
34
30
|
import { Fm } from "./qe-lite-fm";
|
|
35
31
|
|
|
36
|
-
// qe_lite's EXPAND_BOUND_LIMIT: the largest integer range that is expanded.
|
|
37
32
|
const EXPAND_BOUND_LIMIT = 10000;
|
|
38
33
|
|
|
39
|
-
// rewriter_tpl with elim_cfg: rewrites the quantifiers bottom-up.
|
|
40
34
|
class ElimStar extends RewriterTpl {
|
|
41
35
|
constructor(
|
|
42
36
|
manager: AstManager,
|
|
@@ -50,7 +44,6 @@ class ElimStar extends RewriterTpl {
|
|
|
50
44
|
}
|
|
51
45
|
}
|
|
52
46
|
|
|
53
|
-
// qe_lite::impl.
|
|
54
47
|
class QeLite {
|
|
55
48
|
private der: EqDer;
|
|
56
49
|
private fm: Fm;
|
|
@@ -66,12 +59,10 @@ class QeLite {
|
|
|
66
59
|
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
67
60
|
}
|
|
68
61
|
|
|
69
|
-
// operator()(expr_ref&): the result comes with a reference, which the caller releases.
|
|
70
62
|
apply(formula: number) {
|
|
71
63
|
return this.elimStar.rewrite(formula);
|
|
72
64
|
}
|
|
73
65
|
|
|
74
|
-
// ~impl.
|
|
75
66
|
release() {
|
|
76
67
|
this.rewriter.release();
|
|
77
68
|
this.elimStar.release();
|
|
@@ -79,7 +70,6 @@ class QeLite {
|
|
|
79
70
|
this.der.release();
|
|
80
71
|
}
|
|
81
72
|
|
|
82
|
-
// bool_rewriter's mk_and and mk_or, with a reference to the result.
|
|
83
73
|
private mkAnd(args: number[]) {
|
|
84
74
|
return this.manager.withTemporaries(() => this.rewriter.mkAnd(args));
|
|
85
75
|
}
|
|
@@ -88,31 +78,35 @@ class QeLite {
|
|
|
88
78
|
return this.manager.withTemporaries(() => this.rewriter.mkOr(args));
|
|
89
79
|
}
|
|
90
80
|
|
|
91
|
-
// elim_cfg::reduce_quantifier.
|
|
92
81
|
private reduceQuantifier(expr: number, body: number, patterns: number[]) {
|
|
93
82
|
const manager = this.manager;
|
|
94
83
|
const data = manager.getQuantifier(expr);
|
|
95
84
|
let result = assign(manager, -1, body);
|
|
96
|
-
if (data.
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
85
|
+
if (data.kind === QUANTIFIER_FORALL)
|
|
86
|
+
result = assign(manager, result, manager.mkApp(OP_NOT, [result], SORT_BOOL));
|
|
87
|
+
const numVars = data.sorts.length;
|
|
88
|
+
if (data.kind !== QUANTIFIER_LAMBDA) {
|
|
89
|
+
result = this.reduceFormula((index) => index < numVars, result);
|
|
90
|
+
result = this.eliminateDiseqVars(data.sorts, result);
|
|
91
|
+
let expanded = this.tryExpandBoundedQuantifier(data.sorts, result);
|
|
92
|
+
if (expanded !== -1) {
|
|
93
|
+
if (data.kind === QUANTIFIER_FORALL)
|
|
94
|
+
expanded = assignOwned(manager, expanded, pushNotOwned(manager, expanded));
|
|
95
|
+
result = assignOwned(manager, result, this.rewriter.rewrite(expanded));
|
|
96
|
+
manager.decRef(expanded);
|
|
97
|
+
return result;
|
|
98
|
+
}
|
|
105
99
|
}
|
|
106
|
-
if (data.
|
|
100
|
+
if (data.kind === QUANTIFIER_FORALL)
|
|
101
|
+
result = assignOwned(manager, result, pushNotOwned(manager, result));
|
|
107
102
|
const updated = assign(manager, -1, manager.mkQuantifier({ ...data, body: result, patterns }));
|
|
108
103
|
result = assignOwned(manager, result, this.rewriter.rewrite(updated));
|
|
109
104
|
manager.decRef(updated);
|
|
110
105
|
return result;
|
|
111
106
|
}
|
|
112
107
|
|
|
113
|
-
//
|
|
114
|
-
|
|
115
|
-
private reduceFormula(numVars: number, formula: number) {
|
|
108
|
+
// The formula comes with a reference, and so does the result.
|
|
109
|
+
private reduceFormula(isVariableIndex: (index: number) => boolean, formula: number) {
|
|
116
110
|
const manager = this.manager;
|
|
117
111
|
const disjs = new RefVector(manager);
|
|
118
112
|
const conjs = new RefVector(manager);
|
|
@@ -123,7 +117,7 @@ class QeLite {
|
|
|
123
117
|
for (let index = 0; index < size; index++) {
|
|
124
118
|
conjs.reset();
|
|
125
119
|
conjs.push(disjs.items[index]);
|
|
126
|
-
this.reduceConjs(
|
|
120
|
+
this.reduceConjs(isVariableIndex, conjs);
|
|
127
121
|
result = assignOwned(manager, result, this.mkAnd(conjs.items));
|
|
128
122
|
disjs.setOwned(index, result);
|
|
129
123
|
result = -1;
|
|
@@ -134,29 +128,25 @@ class QeLite {
|
|
|
134
128
|
return result;
|
|
135
129
|
}
|
|
136
130
|
|
|
137
|
-
|
|
138
|
-
// as a disjunction, and otherwise eq_der and fm run.
|
|
139
|
-
private reduceConjs(numVars: number, fmls: RefVector) {
|
|
131
|
+
reduceConjs(isVariableIndex: (index: number) => boolean, fmls: RefVector) {
|
|
140
132
|
const manager = this.manager;
|
|
141
133
|
flattenAndVector(manager, fmls);
|
|
142
134
|
const nonGround = fmls.items.flatMap((fml, index) => (manager.isGroundApp(fml) ? [] : [index]));
|
|
143
135
|
if (fmls.size > 1 && nonGround.length === 1) {
|
|
144
136
|
const index = nonGround[0];
|
|
145
|
-
const reduced = this.reduceFormula(
|
|
137
|
+
const reduced = this.reduceFormula(isVariableIndex, assign(manager, -1, fmls.items[index]));
|
|
146
138
|
fmls.set(index, reduced);
|
|
147
139
|
manager.decRef(reduced);
|
|
148
140
|
return;
|
|
149
141
|
}
|
|
150
|
-
this.der.
|
|
151
|
-
this.fm.
|
|
142
|
+
this.der.isVariableIndex = isVariableIndex;
|
|
143
|
+
this.fm.isVariableIndex = isVariableIndex;
|
|
152
144
|
this.der.apply(fmls);
|
|
153
145
|
this.fm.apply(fmls);
|
|
154
|
-
// ar_der checks the limit for each formula
|
|
146
|
+
// Z3's ar_der checks the limit for each formula, though tlapm's formulas have no arrays for it to solve.
|
|
155
147
|
for (let index = 0; index < fmls.size; index++) manager.limit.checkpoint();
|
|
156
148
|
}
|
|
157
149
|
|
|
158
|
-
// collect_negative_equalities: whether every occurrence of the variable is in a negative equality
|
|
159
|
-
// with a term without it, or outside any equality.
|
|
160
150
|
private collectNegativeEqualities(
|
|
161
151
|
expr: number,
|
|
162
152
|
index: number,
|
|
@@ -198,9 +188,6 @@ class QeLite {
|
|
|
198
188
|
return !isOccurring(manager, index, expr);
|
|
199
189
|
}
|
|
200
190
|
|
|
201
|
-
// eliminate_diseq_vars: an integer variable that occurs only in negative equalities can avoid
|
|
202
|
-
// every value they name, so those equalities are false. The body comes with a reference, and so
|
|
203
|
-
// does the result.
|
|
204
191
|
private eliminateDiseqVars(sorts: number[], body: number) {
|
|
205
192
|
const manager = this.manager;
|
|
206
193
|
const replace = new ExprSafeReplace(manager);
|
|
@@ -227,7 +214,6 @@ class QeLite {
|
|
|
227
214
|
return result;
|
|
228
215
|
}
|
|
229
216
|
|
|
230
|
-
// extract_var_bound: an inclusive integer bound of the variable that a conjunct states.
|
|
231
217
|
private getBound(expr: number, index: number) {
|
|
232
218
|
const manager = this.manager;
|
|
233
219
|
const isNegated = manager.isNot(expr);
|
|
@@ -255,8 +241,6 @@ class QeLite {
|
|
|
255
241
|
return { isLower: isVarOnLeft, value: isVarOnLeft ? value + 1n : value - 1n };
|
|
256
242
|
}
|
|
257
243
|
|
|
258
|
-
// try_expand_bounded_quantifier: the disjunction of the body over every value of the integer
|
|
259
|
-
// variables when their ranges are small, with a reference, or -1.
|
|
260
244
|
private tryExpandBoundedQuantifier(sorts: number[], body: number) {
|
|
261
245
|
const manager = this.manager;
|
|
262
246
|
const numDecls = sorts.length;
|
|
@@ -264,8 +248,7 @@ class QeLite {
|
|
|
264
248
|
const used = collectUsedVars(manager, body, numDecls);
|
|
265
249
|
const remaining = used.flatMap((isUsed, index) => (isUsed ? [index] : []));
|
|
266
250
|
if (remaining.length === 0) return -1;
|
|
267
|
-
// Z3 checks the declaration at position i for the variable with de Bruijn index i,
|
|
268
|
-
// another variable's sort. This port checks the variable's own sort.
|
|
251
|
+
// Z3 checks the declaration at position i for the variable with de Bruijn index i, where this checks the variable's own sort.
|
|
269
252
|
if (remaining.some((index) => sorts[numDecls - 1 - index] !== SORT_INT)) return -1;
|
|
270
253
|
const conjs = new RefVector(manager);
|
|
271
254
|
conjs.push(body);
|
|
@@ -332,7 +315,6 @@ class QeLite {
|
|
|
332
315
|
disjuncts.push(instBody);
|
|
333
316
|
manager.decRef(instBody);
|
|
334
317
|
instConjs.reset();
|
|
335
|
-
// The rightmost variable moves first.
|
|
336
318
|
let position = remaining.length - 1;
|
|
337
319
|
for (; position >= 0; position--) {
|
|
338
320
|
values[position]++;
|
|
@@ -352,8 +334,18 @@ class QeLite {
|
|
|
352
334
|
}
|
|
353
335
|
}
|
|
354
336
|
|
|
355
|
-
//
|
|
356
|
-
//
|
|
337
|
+
// qe_lite over a vector of conjuncts, with the variables isVariableIndex picks as the eliminable
|
|
338
|
+
// ones.
|
|
339
|
+
export const applyQeLiteToConjuncts = (
|
|
340
|
+
manager: AstManager,
|
|
341
|
+
isVariableIndex: (index: number) => boolean,
|
|
342
|
+
conjs: RefVector,
|
|
343
|
+
) => {
|
|
344
|
+
const qe = new QeLite(manager);
|
|
345
|
+
qe.reduceConjs(isVariableIndex, conjs);
|
|
346
|
+
qe.release();
|
|
347
|
+
};
|
|
348
|
+
|
|
357
349
|
export const applyQeLite = (manager: AstManager, goal: Goal) => {
|
|
358
350
|
const qe = new QeLite(manager);
|
|
359
351
|
let dep = -1;
|
|
@@ -369,13 +361,11 @@ export const applyQeLite = (manager: AstManager, goal: Goal) => {
|
|
|
369
361
|
formula = assignOwned(manager, formula, qe.apply(formula));
|
|
370
362
|
if (formula !== form) goal.update(index, formula);
|
|
371
363
|
}
|
|
372
|
-
// The iterator of the simplifier's indices counts a step after each formula.
|
|
373
364
|
manager.limit.checkpoint();
|
|
374
365
|
}
|
|
375
366
|
release(manager, formula);
|
|
376
367
|
}
|
|
377
|
-
goal
|
|
378
|
-
goal.elimRedundancies();
|
|
368
|
+
finishSimplifier(goal);
|
|
379
369
|
qe.release();
|
|
380
370
|
release(manager, dep);
|
|
381
371
|
};
|