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,13 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/normal_forms/nnf.cpp, name_exprs.cpp, defined_names.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt. Negation normal form in Z3's default NNF_SKOLEM mode: only subformulas that
|
|
3
|
-
// contain quantifiers are normalized, and existential quantifiers in positive positions become
|
|
4
|
-
// Skolem functions of the enclosing universal variables. A quantifier inside an atom gets a name, a
|
|
5
|
-
// fresh predicate over its free variables, with a definition that is normalized too. Like Z3, the
|
|
6
|
-
// frames, the result stack and the caches hold their expressions, so that expressions are created
|
|
7
|
-
// and deleted in Z3's order.
|
|
8
1
|
import { ActCache } from "./act-cache";
|
|
9
2
|
import {
|
|
10
|
-
AstManager,
|
|
3
|
+
type AstManager,
|
|
4
|
+
FAMILY_BASIC,
|
|
11
5
|
KIND_APP,
|
|
12
6
|
KIND_QUANTIFIER,
|
|
13
7
|
KIND_VAR,
|
|
@@ -15,24 +9,29 @@ import {
|
|
|
15
9
|
OP_EQ,
|
|
16
10
|
OP_IMPLIES,
|
|
17
11
|
OP_ITE,
|
|
12
|
+
OP_LABEL,
|
|
18
13
|
OP_NOT,
|
|
19
14
|
OP_OR,
|
|
20
15
|
OP_XOR,
|
|
21
16
|
SORT_BOOL,
|
|
17
|
+
type SmtSymbol,
|
|
18
|
+
QUANTIFIER_FORALL,
|
|
22
19
|
} from "./ast";
|
|
23
20
|
import { mkNot } from "./ast-util";
|
|
24
21
|
import { RefVector } from "./ref-vector";
|
|
25
22
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
26
23
|
import { elimUnusedVars, getFreeVarSorts, VarSubst } from "./var-subst";
|
|
27
24
|
|
|
28
|
-
// defined_names: the name of each named expression. It holds the expressions and their names.
|
|
29
25
|
export class DefinedNames {
|
|
30
26
|
private names = new Map<number, number>();
|
|
31
27
|
private exprs: RefVector;
|
|
32
28
|
private nameRefs: RefVector;
|
|
33
29
|
private lims: number[] = [];
|
|
34
30
|
|
|
35
|
-
constructor(
|
|
31
|
+
constructor(
|
|
32
|
+
private manager: AstManager,
|
|
33
|
+
private prefix: SmtSymbol | null = "z3name",
|
|
34
|
+
) {
|
|
36
35
|
this.exprs = new RefVector(manager);
|
|
37
36
|
this.nameRefs = new RefVector(manager);
|
|
38
37
|
}
|
|
@@ -41,7 +40,6 @@ export class DefinedNames {
|
|
|
41
40
|
this.lims.push(this.exprs.size);
|
|
42
41
|
}
|
|
43
42
|
|
|
44
|
-
// pop_scope: forgets the names since the matching push, the last first.
|
|
45
43
|
pop() {
|
|
46
44
|
const size = this.lims[this.lims.length - 1];
|
|
47
45
|
this.lims.pop();
|
|
@@ -52,27 +50,37 @@ export class DefinedNames {
|
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
52
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
get numNames() {
|
|
54
|
+
return this.nameRefs.size;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
getNameDecl(index: number) {
|
|
58
|
+
return this.manager.decls[this.nameRefs.items[index]];
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
release() {
|
|
62
|
+
this.nameRefs.reset();
|
|
63
|
+
this.exprs.reset();
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
mkName(expr: number) {
|
|
59
67
|
const manager = this.manager;
|
|
60
|
-
const existing = this.names.get(
|
|
68
|
+
const existing = this.names.get(expr);
|
|
61
69
|
if (existing !== undefined) return { name: existing, definition: -1 };
|
|
62
|
-
//
|
|
63
|
-
const freeVarSorts = getFreeVarSorts(manager,
|
|
70
|
+
// A variable that does not occur still takes a position, filled with true.
|
|
71
|
+
const freeVarSorts = getFreeVarSorts(manager, expr, manager.freeVarBounds[expr]);
|
|
64
72
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
73
|
+
const sort = manager.sorts[expr];
|
|
65
74
|
const name = manager.mkApp(
|
|
66
|
-
manager.mkFreshFuncDecl(
|
|
67
|
-
freeVarSorts.map((
|
|
68
|
-
|
|
75
|
+
manager.mkFreshFuncDecl(this.prefix, varSorts, sort),
|
|
76
|
+
freeVarSorts.map((varSort, index) =>
|
|
77
|
+
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
69
78
|
),
|
|
70
|
-
|
|
79
|
+
sort,
|
|
71
80
|
);
|
|
72
|
-
this.names.set(
|
|
73
|
-
this.exprs.push(
|
|
81
|
+
this.names.set(expr, name);
|
|
82
|
+
this.exprs.push(expr);
|
|
74
83
|
this.nameRefs.push(name);
|
|
75
|
-
// bound_vars: the variables are in reverse order in the quantifier.
|
|
76
84
|
const definition = manager.withTemporaries(() => {
|
|
77
85
|
const boundVars = (conjunct: number) =>
|
|
78
86
|
varSorts.length === 0
|
|
@@ -80,37 +88,57 @@ export class DefinedNames {
|
|
|
80
88
|
: elimUnusedVars(
|
|
81
89
|
manager,
|
|
82
90
|
manager.mkQuantifier({
|
|
83
|
-
|
|
91
|
+
kind: QUANTIFIER_FORALL,
|
|
84
92
|
sorts: varSorts.toReversed(),
|
|
85
93
|
names: varSorts.map((_sort, index) => varSorts.length - 1 - index),
|
|
86
94
|
body: conjunct,
|
|
87
95
|
patterns: [manager.mkPattern([name])],
|
|
96
|
+
noPatterns: [],
|
|
88
97
|
weight: 1,
|
|
89
98
|
qid: "",
|
|
90
99
|
}),
|
|
91
100
|
);
|
|
92
|
-
|
|
93
|
-
|
|
101
|
+
if (manager.isBool(expr)) {
|
|
102
|
+
const first = boundVars(manager.mkOr([manager.mkNot(name), expr]));
|
|
103
|
+
const second = boundVars(manager.mkOr([name, manager.mkNot(expr)]));
|
|
104
|
+
return manager.mkAnd([first, second]);
|
|
105
|
+
}
|
|
106
|
+
if (manager.getOp(expr) !== OP_ITE) return boundVars(manager.mkEq(expr, name));
|
|
107
|
+
const notCondition = manager.mkNot(manager.getArg(expr, 0));
|
|
108
|
+
const thenEq = manager.mkEq(name, manager.getArg(expr, 1));
|
|
109
|
+
const first = boundVars(manager.mkOr([notCondition, thenEq]));
|
|
110
|
+
const elseEq = manager.mkEq(name, manager.getArg(expr, 2));
|
|
111
|
+
const second = boundVars(manager.mkOr([manager.getArg(expr, 0), elseEq]));
|
|
94
112
|
return manager.mkAnd([first, second]);
|
|
95
113
|
});
|
|
96
114
|
return { name, definition };
|
|
97
115
|
}
|
|
98
116
|
}
|
|
99
117
|
|
|
100
|
-
//
|
|
101
|
-
|
|
102
|
-
class QuantifierNamer extends RewriterTpl {
|
|
118
|
+
// The nested formula namer also names each application of a Boolean operator below the root.
|
|
119
|
+
class ExprNamer extends RewriterTpl {
|
|
103
120
|
private definitions: RefVector | null = null;
|
|
121
|
+
private root = -1;
|
|
104
122
|
|
|
105
123
|
constructor(
|
|
106
124
|
manager: AstManager,
|
|
107
125
|
private names: DefinedNames,
|
|
126
|
+
private isNamingFormulas: boolean,
|
|
108
127
|
) {
|
|
109
128
|
super(manager);
|
|
110
129
|
}
|
|
111
130
|
|
|
112
131
|
getSubst(expr: number) {
|
|
113
|
-
|
|
132
|
+
const manager = this.manager;
|
|
133
|
+
const isNamed =
|
|
134
|
+
(manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)) ||
|
|
135
|
+
(manager.kinds[expr] === KIND_APP && manager.getOp(expr) === OP_LABEL) ||
|
|
136
|
+
(this.isNamingFormulas &&
|
|
137
|
+
manager.kinds[expr] === KIND_APP &&
|
|
138
|
+
manager.funcDecls[manager.decls[expr]].family === FAMILY_BASIC &&
|
|
139
|
+
manager.getNumArgs(expr) > 0 &&
|
|
140
|
+
expr !== this.root);
|
|
141
|
+
if (!isNamed) return undefined;
|
|
114
142
|
const named = this.names.mkName(expr);
|
|
115
143
|
if (named.definition !== -1) {
|
|
116
144
|
this.definitions?.push(named.definition);
|
|
@@ -119,15 +147,13 @@ class QuantifierNamer extends RewriterTpl {
|
|
|
119
147
|
return named.name;
|
|
120
148
|
}
|
|
121
149
|
|
|
122
|
-
// The result comes with a reference, which the caller releases.
|
|
123
150
|
name(expr: number, definitions: RefVector) {
|
|
124
151
|
this.definitions = definitions;
|
|
152
|
+
this.root = expr;
|
|
125
153
|
return this.rewrite(expr);
|
|
126
154
|
}
|
|
127
155
|
}
|
|
128
156
|
|
|
129
|
-
// skolemizer: the Skolem functions take the free variables of the quantifier. The function of the
|
|
130
|
-
// last variable comes first, and takes the variable's name.
|
|
131
157
|
class Skolemizer {
|
|
132
158
|
private cache: ActCache;
|
|
133
159
|
private subst: VarSubst;
|
|
@@ -137,7 +163,6 @@ class Skolemizer {
|
|
|
137
163
|
this.subst = new VarSubst(manager, true);
|
|
138
164
|
}
|
|
139
165
|
|
|
140
|
-
// The result comes with a reference, which the caller releases.
|
|
141
166
|
skolemize(quantifier: number) {
|
|
142
167
|
const manager = this.manager;
|
|
143
168
|
const cached = this.cache.find(quantifier, 0);
|
|
@@ -163,7 +188,11 @@ class Skolemizer {
|
|
|
163
188
|
for (let index = count - 1; index >= 0; index--) {
|
|
164
189
|
const sort = data.sorts[index];
|
|
165
190
|
substitution.push(
|
|
166
|
-
manager.mkApp(
|
|
191
|
+
manager.mkApp(
|
|
192
|
+
manager.mkFreshFuncDecl(data.names[index], argSorts, sort, true, data.skid),
|
|
193
|
+
args.items,
|
|
194
|
+
sort,
|
|
195
|
+
),
|
|
167
196
|
);
|
|
168
197
|
}
|
|
169
198
|
freeVarSorts.forEach((sort, index) =>
|
|
@@ -177,15 +206,12 @@ class Skolemizer {
|
|
|
177
206
|
return result;
|
|
178
207
|
}
|
|
179
208
|
|
|
180
|
-
// ~skolemizer: the cache goes first, then the substitution.
|
|
181
209
|
release() {
|
|
182
210
|
this.cache.reset();
|
|
183
211
|
this.subst.release();
|
|
184
212
|
}
|
|
185
213
|
}
|
|
186
214
|
|
|
187
|
-
// A normalization still to finish: its expression, the next child, its polarity, whether it is
|
|
188
|
-
// nested in a quantifier, whether to cache its result, and where its children's results start.
|
|
189
215
|
interface Frame {
|
|
190
216
|
curr: number;
|
|
191
217
|
index: number;
|
|
@@ -195,38 +221,40 @@ interface Frame {
|
|
|
195
221
|
spos: number;
|
|
196
222
|
}
|
|
197
223
|
|
|
198
|
-
|
|
199
|
-
|
|
224
|
+
export const NNF_SKOLEM = 0;
|
|
225
|
+
export const NNF_QUANT = 1;
|
|
226
|
+
export const NNF_FULL = 2;
|
|
227
|
+
|
|
200
228
|
export class Nnf {
|
|
201
229
|
private frames: Frame[] = [];
|
|
202
230
|
private results: RefVector;
|
|
203
|
-
// One cache per polarity and nesting in a quantifier, in Z3's order of get_cache_idx.
|
|
204
231
|
private caches: ActCache[];
|
|
205
232
|
private todoDefs: RefVector;
|
|
206
233
|
private skolemizer: Skolemizer;
|
|
207
|
-
private namer:
|
|
234
|
+
private namer: ExprNamer;
|
|
235
|
+
private nestedNamer: ExprNamer;
|
|
208
236
|
|
|
209
237
|
constructor(
|
|
210
238
|
private manager: AstManager,
|
|
211
239
|
names: DefinedNames,
|
|
240
|
+
private mode = NNF_SKOLEM,
|
|
241
|
+
private isIgnoringLabels = false,
|
|
212
242
|
) {
|
|
213
243
|
this.results = new RefVector(manager);
|
|
214
244
|
this.caches = Array.from({ length: 4 }, () => new ActCache(manager, manager.getNumAsts()));
|
|
215
245
|
this.todoDefs = new RefVector(manager);
|
|
216
246
|
this.skolemizer = new Skolemizer(manager);
|
|
217
|
-
this.namer = new
|
|
247
|
+
this.namer = new ExprNamer(manager, names, false);
|
|
248
|
+
this.nestedNamer = new ExprNamer(manager, names, true);
|
|
218
249
|
}
|
|
219
250
|
|
|
220
|
-
// operator(): pushes the normal forms of the definitions of the names it introduced, the last
|
|
221
|
-
// first, then returns the normal form of expr with a reference, which the caller releases.
|
|
222
251
|
apply(expr: number, definitions: RefVector) {
|
|
223
252
|
return this.manager.withoutTemporaries(() => {
|
|
224
253
|
this.reset();
|
|
225
254
|
const result = this.process(expr);
|
|
226
255
|
const start = definitions.size;
|
|
227
256
|
for (let index = 0; index < this.todoDefs.size; index++) {
|
|
228
|
-
|
|
229
|
-
definitions.pushOwned(definition);
|
|
257
|
+
definitions.pushOwned(this.process(this.todoDefs.items[index]));
|
|
230
258
|
}
|
|
231
259
|
const added = definitions.items.splice(start).reverse();
|
|
232
260
|
definitions.items.push(...added);
|
|
@@ -234,9 +262,9 @@ export class Nnf {
|
|
|
234
262
|
});
|
|
235
263
|
}
|
|
236
264
|
|
|
237
|
-
// ~nnf: the namer, then the skolemizer, the definitions and the caches, the last first.
|
|
238
265
|
release() {
|
|
239
266
|
this.manager.withoutTemporaries(() => {
|
|
267
|
+
this.nestedNamer.release();
|
|
240
268
|
this.namer.release();
|
|
241
269
|
this.skolemizer.release();
|
|
242
270
|
this.todoDefs.reset();
|
|
@@ -281,10 +309,10 @@ export class Nnf {
|
|
|
281
309
|
this.results.push(isPositive ? expr : mkNot(this.manager, expr));
|
|
282
310
|
}
|
|
283
311
|
|
|
284
|
-
// visit: whether the result of expr is on the result stack. Otherwise it pushes a frame for expr.
|
|
285
312
|
private visit(expr: number, isPositive: boolean, isInQuantifier: boolean) {
|
|
286
313
|
const manager = this.manager;
|
|
287
|
-
|
|
314
|
+
const isSkipping = this.mode === NNF_SKOLEM || (this.mode === NNF_QUANT && !isInQuantifier);
|
|
315
|
+
if (isSkipping && !manager.hasQuantifierFlags[expr] && !manager.hasLabelFlags[expr]) {
|
|
288
316
|
this.skip(expr, isPositive);
|
|
289
317
|
return true;
|
|
290
318
|
}
|
|
@@ -305,7 +333,6 @@ export class Nnf {
|
|
|
305
333
|
return false;
|
|
306
334
|
}
|
|
307
335
|
|
|
308
|
-
// process: the normal form of expr, with a reference.
|
|
309
336
|
private process(expr: number) {
|
|
310
337
|
const manager = this.manager;
|
|
311
338
|
if (!this.visit(expr, true, false))
|
|
@@ -339,7 +366,6 @@ export class Nnf {
|
|
|
339
366
|
return result;
|
|
340
367
|
}
|
|
341
368
|
|
|
342
|
-
// Visits the children from frame.index on, each with its polarity, and whether all are done.
|
|
343
369
|
private visitChildren(frame: Frame, children: [number, boolean][]) {
|
|
344
370
|
while (frame.index < children.length) {
|
|
345
371
|
const child = children[frame.index++];
|
|
@@ -348,7 +374,6 @@ export class Nnf {
|
|
|
348
374
|
return true;
|
|
349
375
|
}
|
|
350
376
|
|
|
351
|
-
// Replaces the results from spos on with result.
|
|
352
377
|
private setResult(spos: number, result: number) {
|
|
353
378
|
this.manager.incRef(result);
|
|
354
379
|
this.results.shrink(spos);
|
|
@@ -432,9 +457,29 @@ export class Nnf {
|
|
|
432
457
|
this.setResult(frame.spos, manager.mkApp(OP_AND, [first, second], SORT_BOOL));
|
|
433
458
|
return true;
|
|
434
459
|
}
|
|
460
|
+
case OP_LABEL: {
|
|
461
|
+
if (!this.visitChildren(frame, [[manager.getArg(expr, 0), isPositive]])) return false;
|
|
462
|
+
const decl = manager.decls[expr];
|
|
463
|
+
if (this.isIgnoringLabels || isPositive !== manager.isLabelPositive(decl)) return true;
|
|
464
|
+
const arg = this.results.items[this.results.size - 1];
|
|
465
|
+
const literal = manager.mkLabelLit(manager.getLabelNames(decl));
|
|
466
|
+
this.setResult(frame.spos, manager.mkApp(OP_AND, [arg, literal], SORT_BOOL));
|
|
467
|
+
return true;
|
|
468
|
+
}
|
|
435
469
|
default: {
|
|
436
|
-
|
|
437
|
-
|
|
470
|
+
if (
|
|
471
|
+
this.mode !== NNF_FULL &&
|
|
472
|
+
!manager.hasQuantifierFlags[expr] &&
|
|
473
|
+
!manager.hasLabelFlags[expr]
|
|
474
|
+
) {
|
|
475
|
+
this.skip(expr, isPositive);
|
|
476
|
+
return true;
|
|
477
|
+
}
|
|
478
|
+
const namer =
|
|
479
|
+
this.mode === NNF_FULL || (this.mode !== NNF_SKOLEM && frame.isInQuantifier)
|
|
480
|
+
? this.nestedNamer
|
|
481
|
+
: this.namer;
|
|
482
|
+
const named = namer.name(expr, this.todoDefs);
|
|
438
483
|
if (isPositive) this.results.pushOwned(named);
|
|
439
484
|
else {
|
|
440
485
|
this.results.push(mkNot(manager, named));
|
|
@@ -448,22 +493,28 @@ export class Nnf {
|
|
|
448
493
|
private processQuantifier(quantifier: number, frame: Frame) {
|
|
449
494
|
const manager = this.manager;
|
|
450
495
|
const data = manager.getQuantifier(quantifier);
|
|
451
|
-
const isUniversal = data.
|
|
496
|
+
const isUniversal = (data.kind === QUANTIFIER_FORALL) === frame.isPositive;
|
|
452
497
|
if (frame.index === 0) {
|
|
453
498
|
frame.index = 1;
|
|
454
499
|
if (isUniversal) {
|
|
455
500
|
if (!this.visit(data.body, frame.isPositive, true)) return false;
|
|
456
501
|
} else {
|
|
457
502
|
const skolemized = this.skolemizer.skolemize(quantifier);
|
|
458
|
-
const isDone = this.visit(
|
|
503
|
+
const isDone = this.visit(
|
|
504
|
+
skolemized,
|
|
505
|
+
data.kind !== QUANTIFIER_FORALL,
|
|
506
|
+
frame.isInQuantifier,
|
|
507
|
+
);
|
|
459
508
|
manager.decRef(skolemized);
|
|
460
509
|
if (!isDone) return false;
|
|
461
510
|
}
|
|
462
511
|
}
|
|
463
|
-
// A skolemized quantifier's result is already on the stack.
|
|
464
512
|
if (!isUniversal) return true;
|
|
465
513
|
const body = this.results.items[this.results.size - 1];
|
|
466
|
-
this.setResult(
|
|
514
|
+
this.setResult(
|
|
515
|
+
this.results.size - 1,
|
|
516
|
+
manager.mkQuantifier({ ...data, kind: QUANTIFIER_FORALL, body }),
|
|
517
|
+
);
|
|
467
518
|
return true;
|
|
468
519
|
}
|
|
469
520
|
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { type AstManager, OP_ADD, SORT_INT } from "./ast";
|
|
2
|
+
import { BoundManager } from "./bound-manager";
|
|
3
|
+
import type { Definition, Goal } from "./goal";
|
|
4
|
+
import { RefVector } from "./ref-vector";
|
|
5
|
+
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
6
|
+
|
|
7
|
+
export const normalizeBounds = (
|
|
8
|
+
manager: AstManager,
|
|
9
|
+
goal: Goal,
|
|
10
|
+
options: RewriterOptions,
|
|
11
|
+
isIntOnly: boolean,
|
|
12
|
+
) => {
|
|
13
|
+
const bounds = new BoundManager(manager);
|
|
14
|
+
if (!goal.isProofsEnabled) for (const form of goal.forms.items) bounds.add(form);
|
|
15
|
+
const getLower = (variable: number) => {
|
|
16
|
+
const lower = bounds.lowers.get(variable);
|
|
17
|
+
return manager.isUninterpretedConst(variable) &&
|
|
18
|
+
(!isIntOnly || manager.sorts[variable] === SORT_INT) &&
|
|
19
|
+
lower !== undefined &&
|
|
20
|
+
!lower.value.isZero()
|
|
21
|
+
? lower.value
|
|
22
|
+
: undefined;
|
|
23
|
+
};
|
|
24
|
+
if (!bounds.boundedVars.some((variable) => getLower(variable) !== undefined)) return;
|
|
25
|
+
const terms = new RefVector(manager);
|
|
26
|
+
const definitions: Definition[] = [];
|
|
27
|
+
const substitution = new Map<number, number>();
|
|
28
|
+
for (const variable of bounds.boundedVars) {
|
|
29
|
+
const lower = getLower(variable);
|
|
30
|
+
if (lower === undefined) continue;
|
|
31
|
+
const sort = manager.sorts[variable];
|
|
32
|
+
const fresh = manager.mkFreshConst(null, sort);
|
|
33
|
+
terms.push(fresh);
|
|
34
|
+
const def = manager.mkApp(OP_ADD, [fresh, manager.mkNumeralOfSort(lower, sort)], sort);
|
|
35
|
+
terms.push(def);
|
|
36
|
+
substitution.set(variable, def);
|
|
37
|
+
definitions.push(
|
|
38
|
+
{ decl: manager.decls[fresh], def: -1 },
|
|
39
|
+
{ decl: manager.decls[variable], def },
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
const rewriter = new Rewriter(manager, options);
|
|
43
|
+
rewriter.setSubstitution(substitution);
|
|
44
|
+
for (let index = 0; !goal.isInconsistent && index < goal.forms.size; index++) {
|
|
45
|
+
const rewritten = rewriter.rewrite(goal.forms.items[index]);
|
|
46
|
+
goal.update(index, rewritten);
|
|
47
|
+
manager.decRef(rewritten);
|
|
48
|
+
}
|
|
49
|
+
rewriter.release();
|
|
50
|
+
goal.addDefinitions(definitions);
|
|
51
|
+
terms.reset();
|
|
52
|
+
goal.depth++;
|
|
53
|
+
};
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { SmtTacticError } from "../../../errors";
|
|
2
|
+
import { type AstManager, OP_OR, SORT_BOOL } from "./ast";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { RefVector } from "./ref-vector";
|
|
5
|
+
|
|
6
|
+
interface BvarInfo {
|
|
7
|
+
bvar: number;
|
|
8
|
+
isGenPos: boolean;
|
|
9
|
+
isGenNeg: boolean;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const occf = (manager: AstManager, goal: Goal) => {
|
|
13
|
+
if (goal.isProofsEnabled) throw new SmtTacticError("occf does not support proof production");
|
|
14
|
+
const pinned = new RefVector(manager);
|
|
15
|
+
const pin = (expr: number) => {
|
|
16
|
+
pinned.push(expr);
|
|
17
|
+
return expr;
|
|
18
|
+
};
|
|
19
|
+
const isLiteral = (expr: number) =>
|
|
20
|
+
manager.isUninterpretedConst(expr) ||
|
|
21
|
+
(manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
|
|
22
|
+
const isConstraint = (expr: number) => !isLiteral(expr);
|
|
23
|
+
const isTarget = (clause: number) => {
|
|
24
|
+
let isFound = false;
|
|
25
|
+
for (const arg of manager.getArgs(clause)) {
|
|
26
|
+
if (!isConstraint(arg)) continue;
|
|
27
|
+
if (isFound) return true;
|
|
28
|
+
isFound = true;
|
|
29
|
+
}
|
|
30
|
+
return false;
|
|
31
|
+
};
|
|
32
|
+
const constraintToBvar = new Map<number, BvarInfo>();
|
|
33
|
+
const getAtom = (constraint: number) => {
|
|
34
|
+
let atom = constraint;
|
|
35
|
+
let isSign = false;
|
|
36
|
+
while (manager.isNot(atom)) {
|
|
37
|
+
atom = manager.getArg(atom, 0);
|
|
38
|
+
isSign = !isSign;
|
|
39
|
+
}
|
|
40
|
+
return { atom, isSign };
|
|
41
|
+
};
|
|
42
|
+
const getAuxLit = (constraint: number) => {
|
|
43
|
+
const literal = getAtom(constraint);
|
|
44
|
+
const info = constraintToBvar.get(literal.atom);
|
|
45
|
+
if (info === undefined) return undefined;
|
|
46
|
+
if (literal.isSign) {
|
|
47
|
+
if (!info.isGenNeg) {
|
|
48
|
+
info.isGenNeg = true;
|
|
49
|
+
goal.assert(pin(manager.mkOr([info.bvar, pin(manager.mkNot(literal.atom))])));
|
|
50
|
+
}
|
|
51
|
+
return pin(manager.mkNot(info.bvar));
|
|
52
|
+
}
|
|
53
|
+
if (!info.isGenPos) {
|
|
54
|
+
info.isGenPos = true;
|
|
55
|
+
goal.assert(pin(manager.mkOr([pin(manager.mkNot(info.bvar)), literal.atom])));
|
|
56
|
+
}
|
|
57
|
+
return info.bvar;
|
|
58
|
+
};
|
|
59
|
+
const mkAuxLit = (constraint: number) => {
|
|
60
|
+
const literal = getAtom(constraint);
|
|
61
|
+
const bvar = pin(manager.mkFreshConst(null, SORT_BOOL));
|
|
62
|
+
goal.addConverter(manager.decls[bvar]);
|
|
63
|
+
constraintToBvar.set(literal.atom, {
|
|
64
|
+
bvar,
|
|
65
|
+
isGenPos: !literal.isSign,
|
|
66
|
+
isGenNeg: literal.isSign,
|
|
67
|
+
});
|
|
68
|
+
if (literal.isSign) {
|
|
69
|
+
goal.assert(pin(manager.mkOr([bvar, pin(manager.mkNot(literal.atom))])));
|
|
70
|
+
return pin(manager.mkNot(bvar));
|
|
71
|
+
}
|
|
72
|
+
goal.assert(pin(manager.mkOr([pin(manager.mkNot(bvar)), literal.atom])));
|
|
73
|
+
return bvar;
|
|
74
|
+
};
|
|
75
|
+
const size = goal.forms.size;
|
|
76
|
+
for (let index = 0; index < size; index++) {
|
|
77
|
+
manager.limit.checkpoint();
|
|
78
|
+
const clause = goal.forms.items[index];
|
|
79
|
+
if (manager.getOp(clause) !== OP_OR || !isTarget(clause)) continue;
|
|
80
|
+
let keep: number | undefined;
|
|
81
|
+
const literals: number[] = [];
|
|
82
|
+
for (const literal of manager.getArgs(clause)) {
|
|
83
|
+
if (!isConstraint(literal)) {
|
|
84
|
+
literals.push(literal);
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
const aux = getAuxLit(literal);
|
|
88
|
+
if (aux !== undefined) literals.push(aux);
|
|
89
|
+
else if (keep === undefined) keep = literal;
|
|
90
|
+
else literals.push(mkAuxLit(literal));
|
|
91
|
+
}
|
|
92
|
+
if (keep !== undefined) literals.push(keep);
|
|
93
|
+
goal.update(index, pin(manager.mkOr(literals)));
|
|
94
|
+
}
|
|
95
|
+
pinned.reset();
|
|
96
|
+
goal.depth++;
|
|
97
|
+
};
|