tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/polynomial/upolynomial.{h,cpp}, src/util/mpzzp.h,
|
|
2
|
-
// src/math/polynomial/polynomial_primes.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { getGcd, Rational } from "../rational";
|
|
5
3
|
import { getLog2, Mpbq, refineLower, refineUpper } from "./mpbq";
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
2
|
+
import { type AstManager, FAMILY_ARITH, KIND_APP, OP_ATAN2, OP_PI, SORT_INT } from "./ast";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { goal2nlsat } from "./goal2nlsat";
|
|
5
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
6
|
+
import { NlsatSolver } from "./nlsat/solver";
|
|
7
|
+
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
8
|
+
import { ProtoModel } from "./proto-model";
|
|
9
|
+
|
|
10
|
+
const isSupportedTranscendental = (manager: AstManager, term: number) =>
|
|
11
|
+
manager.kinds[term] === KIND_APP &&
|
|
12
|
+
manager.getFamily(term) === FAMILY_ARITH &&
|
|
13
|
+
(TRANSCENDENTAL_OPS.has(manager.getOp(term)) ||
|
|
14
|
+
manager.getOp(term) === OP_ATAN2 ||
|
|
15
|
+
manager.getOp(term) === OP_PI);
|
|
16
|
+
|
|
17
|
+
const containsUnsupported = (
|
|
18
|
+
manager: AstManager,
|
|
19
|
+
t2x: ReadonlyMap<number, number>,
|
|
20
|
+
a2b: ReadonlyMap<number, number>,
|
|
21
|
+
) =>
|
|
22
|
+
[...t2x.keys()].some(
|
|
23
|
+
(term) => !manager.isUninterpretedConst(term) && !isSupportedTranscendental(manager, term),
|
|
24
|
+
) || [...a2b.keys()].some((atom) => !manager.isUninterpretedConst(atom));
|
|
25
|
+
|
|
26
|
+
// Undefined when nlsat assigns a fraction to an integer variable.
|
|
27
|
+
const mkModel = (
|
|
28
|
+
manager: AstManager,
|
|
29
|
+
solver: NlsatSolver,
|
|
30
|
+
t2x: ReadonlyMap<number, number>,
|
|
31
|
+
a2b: ReadonlyMap<number, number>,
|
|
32
|
+
) => {
|
|
33
|
+
const model = new ProtoModel(manager);
|
|
34
|
+
for (const [term, variable] of t2x) {
|
|
35
|
+
if (!manager.isUninterpretedConst(term)) continue;
|
|
36
|
+
const value = solver.getValue(variable);
|
|
37
|
+
if (manager.sorts[term] === SORT_INT && !solver.am.isInt(value)) return undefined;
|
|
38
|
+
model.registerConst(
|
|
39
|
+
manager.decls[term],
|
|
40
|
+
manager.mkAlgebraicNumeral(value, manager.sorts[term]),
|
|
41
|
+
);
|
|
42
|
+
}
|
|
43
|
+
for (const [atom, boolVar] of a2b) {
|
|
44
|
+
const value = solver.getBoolValue(boolVar);
|
|
45
|
+
if (value === L_UNDEF) continue;
|
|
46
|
+
model.registerConst(
|
|
47
|
+
manager.decls[atom],
|
|
48
|
+
value === L_TRUE ? manager.trueExpr : manager.falseExpr,
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
return model;
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
export interface NlsatOptions {
|
|
55
|
+
seed: number;
|
|
56
|
+
isFactoring: boolean;
|
|
57
|
+
isShufflingVars: boolean;
|
|
58
|
+
variableOrderingStrategy: number;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export const runNlsat = (manager: AstManager, options: NlsatOptions) => (goal: Goal) => {
|
|
62
|
+
if (goal.isDecided()) return [goal];
|
|
63
|
+
if (goal.isProofsEnabled) throw new SmtTacticError("nlsat does not support proof production");
|
|
64
|
+
const solver = new NlsatSolver(manager.limit);
|
|
65
|
+
solver.updtParams(options.seed, options.isFactoring);
|
|
66
|
+
const t2x = new Map<number, number>();
|
|
67
|
+
const a2b = new Map<number, number>();
|
|
68
|
+
goal2nlsat(manager, goal.forms.items, solver, t2x, a2b, null, options.isFactoring);
|
|
69
|
+
if (options.isShufflingVars || options.variableOrderingStrategy !== 0)
|
|
70
|
+
throw new SmtUnsupportedError("nlsat's shuffle_vars and variable_ordering_strategy");
|
|
71
|
+
const status = solver.check();
|
|
72
|
+
if (status === L_TRUE && !containsUnsupported(manager, t2x, a2b)) {
|
|
73
|
+
const model = mkModel(manager, solver, t2x, a2b);
|
|
74
|
+
if (model !== undefined) {
|
|
75
|
+
goal.reset();
|
|
76
|
+
goal.model = model;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
if (status === L_FALSE) goal.assert(manager.falseExpr);
|
|
80
|
+
goal.depth++;
|
|
81
|
+
return [goal];
|
|
82
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/normal_forms/nnf.cpp, name_exprs.cpp, defined_names.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { ActCache } from "./act-cache";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
4
|
+
FAMILY_BASIC,
|
|
5
5
|
KIND_APP,
|
|
6
6
|
KIND_QUANTIFIER,
|
|
7
7
|
KIND_VAR,
|
|
@@ -9,10 +9,12 @@ import {
|
|
|
9
9
|
OP_EQ,
|
|
10
10
|
OP_IMPLIES,
|
|
11
11
|
OP_ITE,
|
|
12
|
+
OP_LABEL,
|
|
12
13
|
OP_NOT,
|
|
13
14
|
OP_OR,
|
|
14
15
|
OP_XOR,
|
|
15
16
|
SORT_BOOL,
|
|
17
|
+
QUANTIFIER_FORALL,
|
|
16
18
|
} from "./ast";
|
|
17
19
|
import { mkNot } from "./ast-util";
|
|
18
20
|
import { RefVector } from "./ref-vector";
|
|
@@ -44,21 +46,36 @@ export class DefinedNames {
|
|
|
44
46
|
}
|
|
45
47
|
}
|
|
46
48
|
|
|
47
|
-
|
|
49
|
+
get numNames() {
|
|
50
|
+
return this.nameRefs.size;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
getNameDecl(index: number) {
|
|
54
|
+
return this.manager.decls[this.nameRefs.items[index]];
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
release() {
|
|
58
|
+
this.nameRefs.reset();
|
|
59
|
+
this.exprs.reset();
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
mkName(expr: number) {
|
|
48
63
|
const manager = this.manager;
|
|
49
|
-
const existing = this.names.get(
|
|
64
|
+
const existing = this.names.get(expr);
|
|
50
65
|
if (existing !== undefined) return { name: existing, definition: -1 };
|
|
51
|
-
|
|
66
|
+
// A variable that does not occur still takes a position, filled with true.
|
|
67
|
+
const freeVarSorts = getFreeVarSorts(manager, expr, manager.freeVarBounds[expr]);
|
|
52
68
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
69
|
+
const sort = manager.sorts[expr];
|
|
53
70
|
const name = manager.mkApp(
|
|
54
|
-
manager.mkFreshFuncDecl("z3name", varSorts,
|
|
55
|
-
freeVarSorts.map((
|
|
56
|
-
|
|
71
|
+
manager.mkFreshFuncDecl("z3name", varSorts, sort),
|
|
72
|
+
freeVarSorts.map((varSort, index) =>
|
|
73
|
+
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
57
74
|
),
|
|
58
|
-
|
|
75
|
+
sort,
|
|
59
76
|
);
|
|
60
|
-
this.names.set(
|
|
61
|
-
this.exprs.push(
|
|
77
|
+
this.names.set(expr, name);
|
|
78
|
+
this.exprs.push(expr);
|
|
62
79
|
this.nameRefs.push(name);
|
|
63
80
|
const definition = manager.withTemporaries(() => {
|
|
64
81
|
const boundVars = (conjunct: number) =>
|
|
@@ -67,35 +84,57 @@ export class DefinedNames {
|
|
|
67
84
|
: elimUnusedVars(
|
|
68
85
|
manager,
|
|
69
86
|
manager.mkQuantifier({
|
|
70
|
-
|
|
87
|
+
kind: QUANTIFIER_FORALL,
|
|
71
88
|
sorts: varSorts.toReversed(),
|
|
72
89
|
names: varSorts.map((_sort, index) => varSorts.length - 1 - index),
|
|
73
90
|
body: conjunct,
|
|
74
91
|
patterns: [manager.mkPattern([name])],
|
|
92
|
+
noPatterns: [],
|
|
75
93
|
weight: 1,
|
|
76
94
|
qid: "",
|
|
77
95
|
}),
|
|
78
96
|
);
|
|
79
|
-
|
|
80
|
-
|
|
97
|
+
if (manager.isBool(expr)) {
|
|
98
|
+
const first = boundVars(manager.mkOr([manager.mkNot(name), expr]));
|
|
99
|
+
const second = boundVars(manager.mkOr([name, manager.mkNot(expr)]));
|
|
100
|
+
return manager.mkAnd([first, second]);
|
|
101
|
+
}
|
|
102
|
+
if (manager.getOp(expr) !== OP_ITE) return boundVars(manager.mkEq(expr, name));
|
|
103
|
+
const notCondition = manager.mkNot(manager.getArg(expr, 0));
|
|
104
|
+
const thenEq = manager.mkEq(name, manager.getArg(expr, 1));
|
|
105
|
+
const first = boundVars(manager.mkOr([notCondition, thenEq]));
|
|
106
|
+
const elseEq = manager.mkEq(name, manager.getArg(expr, 2));
|
|
107
|
+
const second = boundVars(manager.mkOr([manager.getArg(expr, 0), elseEq]));
|
|
81
108
|
return manager.mkAnd([first, second]);
|
|
82
109
|
});
|
|
83
110
|
return { name, definition };
|
|
84
111
|
}
|
|
85
112
|
}
|
|
86
113
|
|
|
87
|
-
|
|
114
|
+
// The nested formula namer also names each application of a Boolean operator below the root.
|
|
115
|
+
class ExprNamer extends RewriterTpl {
|
|
88
116
|
private definitions: RefVector | null = null;
|
|
117
|
+
private root = -1;
|
|
89
118
|
|
|
90
119
|
constructor(
|
|
91
120
|
manager: AstManager,
|
|
92
121
|
private names: DefinedNames,
|
|
122
|
+
private isNamingFormulas: boolean,
|
|
93
123
|
) {
|
|
94
124
|
super(manager);
|
|
95
125
|
}
|
|
96
126
|
|
|
97
127
|
getSubst(expr: number) {
|
|
98
|
-
|
|
128
|
+
const manager = this.manager;
|
|
129
|
+
const isNamed =
|
|
130
|
+
(manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)) ||
|
|
131
|
+
(manager.kinds[expr] === KIND_APP && manager.getOp(expr) === OP_LABEL) ||
|
|
132
|
+
(this.isNamingFormulas &&
|
|
133
|
+
manager.kinds[expr] === KIND_APP &&
|
|
134
|
+
manager.funcDecls[manager.decls[expr]].family === FAMILY_BASIC &&
|
|
135
|
+
manager.getNumArgs(expr) > 0 &&
|
|
136
|
+
expr !== this.root);
|
|
137
|
+
if (!isNamed) return undefined;
|
|
99
138
|
const named = this.names.mkName(expr);
|
|
100
139
|
if (named.definition !== -1) {
|
|
101
140
|
this.definitions?.push(named.definition);
|
|
@@ -106,6 +145,7 @@ class QuantifierNamer extends RewriterTpl {
|
|
|
106
145
|
|
|
107
146
|
name(expr: number, definitions: RefVector) {
|
|
108
147
|
this.definitions = definitions;
|
|
148
|
+
this.root = expr;
|
|
109
149
|
return this.rewrite(expr);
|
|
110
150
|
}
|
|
111
151
|
}
|
|
@@ -144,7 +184,11 @@ class Skolemizer {
|
|
|
144
184
|
for (let index = count - 1; index >= 0; index--) {
|
|
145
185
|
const sort = data.sorts[index];
|
|
146
186
|
substitution.push(
|
|
147
|
-
manager.mkApp(
|
|
187
|
+
manager.mkApp(
|
|
188
|
+
manager.mkFreshFuncDecl(data.names[index], argSorts, sort, true, data.skid),
|
|
189
|
+
args.items,
|
|
190
|
+
sort,
|
|
191
|
+
),
|
|
148
192
|
);
|
|
149
193
|
}
|
|
150
194
|
freeVarSorts.forEach((sort, index) =>
|
|
@@ -173,23 +217,31 @@ interface Frame {
|
|
|
173
217
|
spos: number;
|
|
174
218
|
}
|
|
175
219
|
|
|
220
|
+
export const NNF_SKOLEM = 0;
|
|
221
|
+
export const NNF_QUANT = 1;
|
|
222
|
+
export const NNF_FULL = 2;
|
|
223
|
+
|
|
176
224
|
export class Nnf {
|
|
177
225
|
private frames: Frame[] = [];
|
|
178
226
|
private results: RefVector;
|
|
179
227
|
private caches: ActCache[];
|
|
180
228
|
private todoDefs: RefVector;
|
|
181
229
|
private skolemizer: Skolemizer;
|
|
182
|
-
private namer:
|
|
230
|
+
private namer: ExprNamer;
|
|
231
|
+
private nestedNamer: ExprNamer;
|
|
183
232
|
|
|
184
233
|
constructor(
|
|
185
234
|
private manager: AstManager,
|
|
186
235
|
names: DefinedNames,
|
|
236
|
+
private mode = NNF_SKOLEM,
|
|
237
|
+
private isIgnoringLabels = false,
|
|
187
238
|
) {
|
|
188
239
|
this.results = new RefVector(manager);
|
|
189
240
|
this.caches = Array.from({ length: 4 }, () => new ActCache(manager, manager.getNumAsts()));
|
|
190
241
|
this.todoDefs = new RefVector(manager);
|
|
191
242
|
this.skolemizer = new Skolemizer(manager);
|
|
192
|
-
this.namer = new
|
|
243
|
+
this.namer = new ExprNamer(manager, names, false);
|
|
244
|
+
this.nestedNamer = new ExprNamer(manager, names, true);
|
|
193
245
|
}
|
|
194
246
|
|
|
195
247
|
apply(expr: number, definitions: RefVector) {
|
|
@@ -208,6 +260,7 @@ export class Nnf {
|
|
|
208
260
|
|
|
209
261
|
release() {
|
|
210
262
|
this.manager.withoutTemporaries(() => {
|
|
263
|
+
this.nestedNamer.release();
|
|
211
264
|
this.namer.release();
|
|
212
265
|
this.skolemizer.release();
|
|
213
266
|
this.todoDefs.reset();
|
|
@@ -254,7 +307,8 @@ export class Nnf {
|
|
|
254
307
|
|
|
255
308
|
private visit(expr: number, isPositive: boolean, isInQuantifier: boolean) {
|
|
256
309
|
const manager = this.manager;
|
|
257
|
-
|
|
310
|
+
const isSkipping = this.mode === NNF_SKOLEM || (this.mode === NNF_QUANT && !isInQuantifier);
|
|
311
|
+
if (isSkipping && !manager.hasQuantifierFlags[expr] && !manager.hasLabelFlags[expr]) {
|
|
258
312
|
this.skip(expr, isPositive);
|
|
259
313
|
return true;
|
|
260
314
|
}
|
|
@@ -399,8 +453,29 @@ export class Nnf {
|
|
|
399
453
|
this.setResult(frame.spos, manager.mkApp(OP_AND, [first, second], SORT_BOOL));
|
|
400
454
|
return true;
|
|
401
455
|
}
|
|
456
|
+
case OP_LABEL: {
|
|
457
|
+
if (!this.visitChildren(frame, [[manager.getArg(expr, 0), isPositive]])) return false;
|
|
458
|
+
const decl = manager.decls[expr];
|
|
459
|
+
if (this.isIgnoringLabels || isPositive !== manager.isLabelPositive(decl)) return true;
|
|
460
|
+
const arg = this.results.items[this.results.size - 1];
|
|
461
|
+
const literal = manager.mkLabelLit(manager.getLabelNames(decl));
|
|
462
|
+
this.setResult(frame.spos, manager.mkApp(OP_AND, [arg, literal], SORT_BOOL));
|
|
463
|
+
return true;
|
|
464
|
+
}
|
|
402
465
|
default: {
|
|
403
|
-
|
|
466
|
+
if (
|
|
467
|
+
this.mode !== NNF_FULL &&
|
|
468
|
+
!manager.hasQuantifierFlags[expr] &&
|
|
469
|
+
!manager.hasLabelFlags[expr]
|
|
470
|
+
) {
|
|
471
|
+
this.skip(expr, isPositive);
|
|
472
|
+
return true;
|
|
473
|
+
}
|
|
474
|
+
const namer =
|
|
475
|
+
this.mode === NNF_FULL || (this.mode !== NNF_SKOLEM && frame.isInQuantifier)
|
|
476
|
+
? this.nestedNamer
|
|
477
|
+
: this.namer;
|
|
478
|
+
const named = namer.name(expr, this.todoDefs);
|
|
404
479
|
if (isPositive) this.results.pushOwned(named);
|
|
405
480
|
else {
|
|
406
481
|
this.results.push(mkNot(manager, named));
|
|
@@ -414,21 +489,28 @@ export class Nnf {
|
|
|
414
489
|
private processQuantifier(quantifier: number, frame: Frame) {
|
|
415
490
|
const manager = this.manager;
|
|
416
491
|
const data = manager.getQuantifier(quantifier);
|
|
417
|
-
const isUniversal = data.
|
|
492
|
+
const isUniversal = (data.kind === QUANTIFIER_FORALL) === frame.isPositive;
|
|
418
493
|
if (frame.index === 0) {
|
|
419
494
|
frame.index = 1;
|
|
420
495
|
if (isUniversal) {
|
|
421
496
|
if (!this.visit(data.body, frame.isPositive, true)) return false;
|
|
422
497
|
} else {
|
|
423
498
|
const skolemized = this.skolemizer.skolemize(quantifier);
|
|
424
|
-
const isDone = this.visit(
|
|
499
|
+
const isDone = this.visit(
|
|
500
|
+
skolemized,
|
|
501
|
+
data.kind !== QUANTIFIER_FORALL,
|
|
502
|
+
frame.isInQuantifier,
|
|
503
|
+
);
|
|
425
504
|
manager.decRef(skolemized);
|
|
426
505
|
if (!isDone) return false;
|
|
427
506
|
}
|
|
428
507
|
}
|
|
429
508
|
if (!isUniversal) return true;
|
|
430
509
|
const body = this.results.items[this.results.size - 1];
|
|
431
|
-
this.setResult(
|
|
510
|
+
this.setResult(
|
|
511
|
+
this.results.size - 1,
|
|
512
|
+
manager.mkQuantifier({ ...data, kind: QUANTIFIER_FORALL, body }),
|
|
513
|
+
);
|
|
432
514
|
return true;
|
|
433
515
|
}
|
|
434
516
|
}
|
|
@@ -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
|
+
};
|