tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- 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 +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- 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 +120 -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 +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- 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 +226 -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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- 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 +9 -20
- 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 +3 -5
- 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/md5.ts +26 -29
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- 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 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- 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 +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -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-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 +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -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 +178 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +34 -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 +111 -39
- 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 +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +30 -11
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- 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 +167 -85
- 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 +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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 +310 -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 +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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- 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 +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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -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 +634 -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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- 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 +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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -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 +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- 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 +495 -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 +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- 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 +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -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/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/polynomial/upolynomial_factorization{.cpp,_int.h}, the factorization
|
|
2
|
-
// in src/math/polynomial/upolynomial.cpp, src/util/prime_generator.cpp and mpz_manager::root),
|
|
3
|
-
// MIT license, see z3-license.txt.
|
|
4
1
|
import { type Upolynomial, UpolynomialManager } from "./upolynomial";
|
|
5
2
|
|
|
6
3
|
const UINT_MAX = 4294967295;
|
|
@@ -23,7 +20,7 @@ export interface UpolynomialFactors {
|
|
|
23
20
|
degrees: number[];
|
|
24
21
|
}
|
|
25
22
|
|
|
26
|
-
const mkFactors = (): UpolynomialFactors => ({ constant: 1n, factors: [], degrees: [] });
|
|
23
|
+
export const mkFactors = (): UpolynomialFactors => ({ constant: 1n, factors: [], degrees: [] });
|
|
27
24
|
|
|
28
25
|
const getTotalFactors = (fs: UpolynomialFactors) =>
|
|
29
26
|
fs.degrees.reduce((total, degree) => total + degree, 0);
|
|
@@ -224,7 +221,7 @@ const henselLiftOnce = (
|
|
|
224
221
|
r: bigint,
|
|
225
222
|
polynomials: { u: Upolynomial; a: Upolynomial; v: Upolynomial; b: Upolynomial; c: Upolynomial },
|
|
226
223
|
) => {
|
|
227
|
-
const zr = new UpolynomialManager(r);
|
|
224
|
+
const zr = new UpolynomialManager(z.limit, r);
|
|
228
225
|
const f = zr.set(z.divConst(z.sub(polynomials.c, z.mul(polynomials.a, polynomials.b)), b));
|
|
229
226
|
const division = zr.divRem(zr.mul(polynomials.v, f), polynomials.a);
|
|
230
227
|
const t = zr.add(zr.mul(polynomials.u, f), zr.mul(polynomials.b, division.quotient));
|
|
@@ -242,13 +239,14 @@ const henselLiftQuadratic = (
|
|
|
242
239
|
b: Upolynomial,
|
|
243
240
|
e: number,
|
|
244
241
|
) => {
|
|
245
|
-
const zp = new UpolynomialManager(zpe.zp);
|
|
242
|
+
const zp = new UpolynomialManager(z.limit, zpe.zp);
|
|
246
243
|
const ext = zp.extGcd(a, b);
|
|
247
244
|
let u = ext.u;
|
|
248
245
|
let v = ext.v;
|
|
249
246
|
let currentA = [...a];
|
|
250
247
|
let currentB = [...b];
|
|
251
248
|
for (let k = 1; k < e; k *= 2) {
|
|
249
|
+
z.limit.checkpoint();
|
|
252
250
|
const modulus = zpe.zp as bigint;
|
|
253
251
|
const lifted = henselLiftOnce(z, modulus, modulus, {
|
|
254
252
|
u,
|
|
@@ -454,12 +452,13 @@ export const factorSquareFree = (
|
|
|
454
452
|
fPp = fPp.map((coeff) => -coeff);
|
|
455
453
|
if (k % 2 === 1) fs.constant = -fs.constant;
|
|
456
454
|
}
|
|
457
|
-
const zp = new UpolynomialManager(2n);
|
|
455
|
+
const zp = new UpolynomialManager(z.limit, 2n);
|
|
458
456
|
let zpFs = mkFactors();
|
|
459
457
|
let zpFsPrime = 2n;
|
|
460
458
|
let degreeSet = [true];
|
|
461
459
|
const getNextPrime = mkPrimeIterator();
|
|
462
460
|
for (let trials = 0; trials <= params.primeTrials;) {
|
|
461
|
+
z.limit.checkpoint();
|
|
463
462
|
const nextPrime = getNextPrime();
|
|
464
463
|
if (nextPrime > params.maxPrime) {
|
|
465
464
|
pushFactor(z, fs, fPp, k);
|
|
@@ -491,7 +490,7 @@ export const factorSquareFree = (
|
|
|
491
490
|
}
|
|
492
491
|
}
|
|
493
492
|
zp.setZp(zpFsPrime);
|
|
494
|
-
const zpe = new UpolynomialManager(zpFsPrime);
|
|
493
|
+
const zpe = new UpolynomialManager(z.limit, zpFsPrime);
|
|
495
494
|
const zpeFs = henselLiftFactors(z, fPp, zp, zpFs, getMignotteBound(fPp, zpFsPrime), zpe);
|
|
496
495
|
let leading = zpe.normalizeNumeral(fPp[fPp.length - 1]);
|
|
497
496
|
fPp = z.mulConst(fPp, leading);
|
|
@@ -500,6 +499,7 @@ export const factorSquareFree = (
|
|
|
500
499
|
let result = true;
|
|
501
500
|
let isRemoving = false;
|
|
502
501
|
for (let counter = 1; iterator.next(isRemoving); counter++) {
|
|
502
|
+
z.limit.checkpoint();
|
|
503
503
|
if (counter > params.maxSearchSize) {
|
|
504
504
|
result = false;
|
|
505
505
|
break;
|
|
@@ -587,6 +587,7 @@ export const factorUpolynomial = (
|
|
|
587
587
|
let isComplete = true;
|
|
588
588
|
let product = z.exactDiv(primitive, square) as bigint[];
|
|
589
589
|
for (let multiplicity = 1; product.length > 1; multiplicity++) {
|
|
590
|
+
z.limit.checkpoint();
|
|
590
591
|
const next = z.gcd(product, square);
|
|
591
592
|
const factor = z.exactDiv(product, next) as bigint[];
|
|
592
593
|
if (factor.length > 1) {
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
// src/math/polynomial/polynomial_primes.h), MIT license, see z3-license.txt.
|
|
3
|
-
import { SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
4
2
|
import { getGcd, Rational } from "../rational";
|
|
3
|
+
import type { ResourceLimit } from "../rlimit";
|
|
5
4
|
import { getLog2, Mpbq, refineLower, refineUpper } from "./mpbq";
|
|
6
5
|
|
|
7
6
|
export type Upolynomial = readonly bigint[];
|
|
8
7
|
|
|
9
|
-
const BIG_PRIMES = [
|
|
8
|
+
export const BIG_PRIMES = [
|
|
10
9
|
39103, 39107, 39113, 39119, 39133, 39139, 39157, 39161, 39163, 39181, 39191, 39199, 39209, 39217,
|
|
11
10
|
39227, 39229, 39233, 39239, 39241, 39251, 39293, 39301, 39313, 39317, 39323, 39341, 39343, 39359,
|
|
12
11
|
39367, 39371, 39373, 39383, 39397, 39409, 39419, 39439, 39443, 39451, 39461, 39499, 39503, 39509,
|
|
@@ -28,12 +27,12 @@ const BIG_PRIMES = [
|
|
|
28
27
|
|
|
29
28
|
const getSign = (value: bigint) => (value > 0n ? 1 : value < 0n ? -1 : 0);
|
|
30
29
|
|
|
31
|
-
|
|
30
|
+
const floorDiv = (dividend: bigint, divisor: bigint) => {
|
|
32
31
|
const quotient = dividend / divisor;
|
|
33
32
|
return dividend % divisor !== 0n && dividend < 0n !== divisor < 0n ? quotient - 1n : quotient;
|
|
34
33
|
};
|
|
35
34
|
|
|
36
|
-
const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
35
|
+
export const getExtendedGcd = (first: bigint, second: bigint) => {
|
|
37
36
|
let [oldR, r] = [first, second];
|
|
38
37
|
let [oldS, s] = [1n, 0n];
|
|
39
38
|
let [oldT, t] = [0n, 1n];
|
|
@@ -75,7 +74,10 @@ interface DrsFrame {
|
|
|
75
74
|
export class UpolynomialManager {
|
|
76
75
|
private isPrimeModulus = true;
|
|
77
76
|
|
|
78
|
-
constructor(
|
|
77
|
+
constructor(
|
|
78
|
+
readonly limit: ResourceLimit,
|
|
79
|
+
private modulus: bigint | null = null,
|
|
80
|
+
) {}
|
|
79
81
|
|
|
80
82
|
get zp() {
|
|
81
83
|
return this.modulus;
|
|
@@ -172,12 +174,15 @@ export class UpolynomialManager {
|
|
|
172
174
|
mul(first: Upolynomial, second: Upolynomial) {
|
|
173
175
|
if (first.length === 0 || second.length === 0) return [];
|
|
174
176
|
const result = Array.from({ length: first.length + second.length - 1 }, () => 0n);
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
177
|
+
const outer = first.length < second.length ? second : first;
|
|
178
|
+
const inner = first.length < second.length ? first : second;
|
|
179
|
+
for (let index = 0; index < outer.length; index++) {
|
|
180
|
+
this.limit.checkpoint();
|
|
181
|
+
if (outer[index] === 0n) continue;
|
|
182
|
+
for (let other = 0; other < inner.length; other++)
|
|
183
|
+
if (inner[other] !== 0n)
|
|
179
184
|
result[index + other] = this.normalizeNumeral(
|
|
180
|
-
result[index + other] +
|
|
185
|
+
result[index + other] + outer[index] * inner[other],
|
|
181
186
|
);
|
|
182
187
|
}
|
|
183
188
|
return trim(result);
|
|
@@ -233,8 +238,10 @@ export class UpolynomialManager {
|
|
|
233
238
|
const quotient = Array.from({ length: quotientSize }, () => 0n);
|
|
234
239
|
const leading = divisor[divisor.length - 1];
|
|
235
240
|
let power = 0;
|
|
236
|
-
while (
|
|
241
|
+
while (true) {
|
|
242
|
+
this.limit.checkpoint();
|
|
237
243
|
const size = remainder.length;
|
|
244
|
+
if (size < divisor.length) return { quotient: trim(quotient), remainder, power };
|
|
238
245
|
const shift = size - divisor.length;
|
|
239
246
|
if (isField) {
|
|
240
247
|
const ratio = this.divNumeral(remainder[size - 1], leading);
|
|
@@ -259,7 +266,6 @@ export class UpolynomialManager {
|
|
|
259
266
|
remainder.length = size - 1;
|
|
260
267
|
trim(remainder);
|
|
261
268
|
}
|
|
262
|
-
return { quotient: trim(quotient), remainder, power };
|
|
263
269
|
}
|
|
264
270
|
|
|
265
271
|
div(dividend: Upolynomial, divisor: Upolynomial) {
|
|
@@ -273,8 +279,9 @@ export class UpolynomialManager {
|
|
|
273
279
|
const isField = this.isField;
|
|
274
280
|
const leading = divisor[divisor.length - 1];
|
|
275
281
|
let power = 0;
|
|
276
|
-
while (
|
|
282
|
+
while (this.limit.inc()) {
|
|
277
283
|
const size = remainder.length;
|
|
284
|
+
if (size < divisor.length) break;
|
|
278
285
|
const shift = size - divisor.length;
|
|
279
286
|
if (isField) {
|
|
280
287
|
const ratio = this.divNumeral(remainder[size - 1], leading);
|
|
@@ -359,13 +366,16 @@ export class UpolynomialManager {
|
|
|
359
366
|
if (second.length === 0) return this.flipSignIfLmNeg(this.set(first));
|
|
360
367
|
let a = this.set(first);
|
|
361
368
|
let b = this.set(second);
|
|
362
|
-
while (
|
|
369
|
+
while (this.limit.inc()) {
|
|
370
|
+
if (b.length === 0) {
|
|
371
|
+
const normalized = this.normalize(a);
|
|
372
|
+
return this.isField ? this.mkMonic(normalized) : this.flipSignIfLmNeg(normalized);
|
|
373
|
+
}
|
|
363
374
|
const remainder = this.normalize(this.rem(a, b));
|
|
364
375
|
a = b;
|
|
365
376
|
b = remainder;
|
|
366
377
|
}
|
|
367
|
-
|
|
368
|
-
return this.isField ? this.mkMonic(normalized) : this.flipSignIfLmNeg(normalized);
|
|
378
|
+
throw new SmtCanceledError();
|
|
369
379
|
}
|
|
370
380
|
|
|
371
381
|
private combineImages(image: Upolynomial, prime: bigint, combined: Upolynomial, bound: bigint) {
|
|
@@ -499,6 +509,7 @@ export class UpolynomialManager {
|
|
|
499
509
|
let previous = 0;
|
|
500
510
|
let changes = 0;
|
|
501
511
|
for (let index = 0; index < work.length; index++) {
|
|
512
|
+
this.limit.checkpoint();
|
|
502
513
|
let position = 1;
|
|
503
514
|
for (; position < work.length - index; position++) work[position] += work[position - 1];
|
|
504
515
|
const current = getSign(work[position - 1]);
|
|
@@ -515,9 +526,11 @@ export class UpolynomialManager {
|
|
|
515
526
|
translate(coeffs: Upolynomial) {
|
|
516
527
|
const result = [...coeffs];
|
|
517
528
|
const degree = result.length - 1;
|
|
518
|
-
for (let step = 1; step <= degree; step++)
|
|
529
|
+
for (let step = 1; step <= degree; step++) {
|
|
530
|
+
this.limit.checkpoint();
|
|
519
531
|
for (let index = degree - step; index <= degree - 1; index++)
|
|
520
532
|
result[index] += result[index + 1];
|
|
533
|
+
}
|
|
521
534
|
return result;
|
|
522
535
|
}
|
|
523
536
|
|
|
@@ -526,6 +539,7 @@ export class UpolynomialManager {
|
|
|
526
539
|
const result = this.composeAnPxDivA(coeffs, value.den);
|
|
527
540
|
const degree = result.length - 1;
|
|
528
541
|
for (let step = 1; step <= degree; step++) {
|
|
542
|
+
this.limit.checkpoint();
|
|
529
543
|
result[degree - step] += value.num * result[degree - step + 1];
|
|
530
544
|
for (let index = degree - step + 1; index <= degree - 1; index++)
|
|
531
545
|
result[index] = result[index] * value.den + value.num * result[index + 1];
|
|
@@ -698,6 +712,7 @@ export class UpolynomialManager {
|
|
|
698
712
|
this.pushChildFrames(this.div(coeffs, twoXMinusOne), frames);
|
|
699
713
|
} else this.pushChildFrames(coeffs, frames);
|
|
700
714
|
while (frames.length > 0) {
|
|
715
|
+
this.limit.checkpoint();
|
|
701
716
|
const frame = frames[frames.length - 1];
|
|
702
717
|
if (!frame.isFirst) {
|
|
703
718
|
frames.pop();
|
|
@@ -760,11 +775,12 @@ export class UpolynomialManager {
|
|
|
760
775
|
}
|
|
761
776
|
|
|
762
777
|
private sturmSeqCore(sequence: bigint[][]) {
|
|
763
|
-
while (
|
|
778
|
+
while (this.limit.inc()) {
|
|
764
779
|
const remainder = this.srem(sequence[sequence.length - 2], sequence[sequence.length - 1]);
|
|
765
780
|
if (remainder.length === 0) return sequence;
|
|
766
781
|
sequence.push(this.normalize(remainder));
|
|
767
782
|
}
|
|
783
|
+
return sequence;
|
|
768
784
|
}
|
|
769
785
|
|
|
770
786
|
sturmSeq(coeffs: Upolynomial) {
|
|
@@ -776,6 +792,7 @@ export class UpolynomialManager {
|
|
|
776
792
|
}
|
|
777
793
|
|
|
778
794
|
isolating2refinable(coeffs: Upolynomial, lower: Mpbq, upper: Mpbq): Refinement {
|
|
795
|
+
this.limit.checkpoint();
|
|
779
796
|
const signLower = this.evalSignAtBq(coeffs, lower);
|
|
780
797
|
const signUpper = this.evalSignAtBq(coeffs, upper);
|
|
781
798
|
if (signLower !== 0 && signUpper !== 0) return { isInterval: true, lower, upper };
|
|
@@ -784,6 +801,7 @@ export class UpolynomialManager {
|
|
|
784
801
|
let b = upper;
|
|
785
802
|
let newA = a.add(b).div2();
|
|
786
803
|
while (true) {
|
|
804
|
+
this.limit.checkpoint();
|
|
787
805
|
const signNewA = this.evalSignAtBq(coeffs, newA);
|
|
788
806
|
if (signNewA !== signUpper) return { isInterval: signNewA !== 0, lower: newA, upper: b };
|
|
789
807
|
b = newA;
|
|
@@ -795,6 +813,7 @@ export class UpolynomialManager {
|
|
|
795
813
|
let b = upper;
|
|
796
814
|
let newB = a.add(b).div2();
|
|
797
815
|
while (true) {
|
|
816
|
+
this.limit.checkpoint();
|
|
798
817
|
const signNewB = this.evalSignAtBq(coeffs, newB);
|
|
799
818
|
if (signNewB !== signLower)
|
|
800
819
|
return signNewB === 0
|
|
@@ -814,6 +833,7 @@ export class UpolynomialManager {
|
|
|
814
833
|
let newA1 = a1.add(b1).div2();
|
|
815
834
|
let newB2 = a2.add(b2).div2();
|
|
816
835
|
while (true) {
|
|
836
|
+
this.limit.checkpoint();
|
|
817
837
|
const signNewA1 = this.evalSignAtBq(coeffs, newA1);
|
|
818
838
|
if (signNewA1 === 0) return { isInterval: false, lower: newA1, upper };
|
|
819
839
|
if (signNewA1 === -signB1) return { isInterval: true, lower: newA1, upper: b1 };
|
|
@@ -840,6 +860,7 @@ export class UpolynomialManager {
|
|
|
840
860
|
const signLower = this.evalSignAtBq(coeffs, lower);
|
|
841
861
|
let current: Refinement = { isInterval: true, lower, upper };
|
|
842
862
|
while (true) {
|
|
863
|
+
this.limit.checkpoint();
|
|
843
864
|
if (current.upper.sub(current.lower).isLessThanOneDiv2k(precision)) return current;
|
|
844
865
|
current = this.refineCore(coeffs, signLower, current.lower, current.upper);
|
|
845
866
|
if (!current.isInterval) return current;
|
|
@@ -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).mkModel();
|
|
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,13 @@ 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
|
+
type SmtSymbol,
|
|
18
|
+
QUANTIFIER_FORALL,
|
|
16
19
|
} from "./ast";
|
|
17
20
|
import { mkNot } from "./ast-util";
|
|
18
21
|
import { RefVector } from "./ref-vector";
|
|
@@ -25,7 +28,10 @@ export class DefinedNames {
|
|
|
25
28
|
private nameRefs: RefVector;
|
|
26
29
|
private lims: number[] = [];
|
|
27
30
|
|
|
28
|
-
constructor(
|
|
31
|
+
constructor(
|
|
32
|
+
private manager: AstManager,
|
|
33
|
+
private prefix: SmtSymbol | null = "z3name",
|
|
34
|
+
) {
|
|
29
35
|
this.exprs = new RefVector(manager);
|
|
30
36
|
this.nameRefs = new RefVector(manager);
|
|
31
37
|
}
|
|
@@ -44,21 +50,36 @@ export class DefinedNames {
|
|
|
44
50
|
}
|
|
45
51
|
}
|
|
46
52
|
|
|
47
|
-
|
|
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) {
|
|
48
67
|
const manager = this.manager;
|
|
49
|
-
const existing = this.names.get(
|
|
68
|
+
const existing = this.names.get(expr);
|
|
50
69
|
if (existing !== undefined) return { name: existing, definition: -1 };
|
|
51
|
-
|
|
70
|
+
// A variable that does not occur still takes a position, filled with true.
|
|
71
|
+
const freeVarSorts = getFreeVarSorts(manager, expr, manager.freeVarBounds[expr]);
|
|
52
72
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
73
|
+
const sort = manager.sorts[expr];
|
|
53
74
|
const name = manager.mkApp(
|
|
54
|
-
manager.mkFreshFuncDecl(
|
|
55
|
-
freeVarSorts.map((
|
|
56
|
-
|
|
75
|
+
manager.mkFreshFuncDecl(this.prefix, varSorts, sort),
|
|
76
|
+
freeVarSorts.map((varSort, index) =>
|
|
77
|
+
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
57
78
|
),
|
|
58
|
-
|
|
79
|
+
sort,
|
|
59
80
|
);
|
|
60
|
-
this.names.set(
|
|
61
|
-
this.exprs.push(
|
|
81
|
+
this.names.set(expr, name);
|
|
82
|
+
this.exprs.push(expr);
|
|
62
83
|
this.nameRefs.push(name);
|
|
63
84
|
const definition = manager.withTemporaries(() => {
|
|
64
85
|
const boundVars = (conjunct: number) =>
|
|
@@ -67,35 +88,57 @@ export class DefinedNames {
|
|
|
67
88
|
: elimUnusedVars(
|
|
68
89
|
manager,
|
|
69
90
|
manager.mkQuantifier({
|
|
70
|
-
|
|
91
|
+
kind: QUANTIFIER_FORALL,
|
|
71
92
|
sorts: varSorts.toReversed(),
|
|
72
93
|
names: varSorts.map((_sort, index) => varSorts.length - 1 - index),
|
|
73
94
|
body: conjunct,
|
|
74
95
|
patterns: [manager.mkPattern([name])],
|
|
96
|
+
noPatterns: [],
|
|
75
97
|
weight: 1,
|
|
76
98
|
qid: "",
|
|
77
99
|
}),
|
|
78
100
|
);
|
|
79
|
-
|
|
80
|
-
|
|
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]));
|
|
81
112
|
return manager.mkAnd([first, second]);
|
|
82
113
|
});
|
|
83
114
|
return { name, definition };
|
|
84
115
|
}
|
|
85
116
|
}
|
|
86
117
|
|
|
87
|
-
|
|
118
|
+
// The nested formula namer also names each application of a Boolean operator below the root.
|
|
119
|
+
class ExprNamer extends RewriterTpl {
|
|
88
120
|
private definitions: RefVector | null = null;
|
|
121
|
+
private root = -1;
|
|
89
122
|
|
|
90
123
|
constructor(
|
|
91
124
|
manager: AstManager,
|
|
92
125
|
private names: DefinedNames,
|
|
126
|
+
private isNamingFormulas: boolean,
|
|
93
127
|
) {
|
|
94
128
|
super(manager);
|
|
95
129
|
}
|
|
96
130
|
|
|
97
131
|
getSubst(expr: number) {
|
|
98
|
-
|
|
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;
|
|
99
142
|
const named = this.names.mkName(expr);
|
|
100
143
|
if (named.definition !== -1) {
|
|
101
144
|
this.definitions?.push(named.definition);
|
|
@@ -106,6 +149,7 @@ class QuantifierNamer extends RewriterTpl {
|
|
|
106
149
|
|
|
107
150
|
name(expr: number, definitions: RefVector) {
|
|
108
151
|
this.definitions = definitions;
|
|
152
|
+
this.root = expr;
|
|
109
153
|
return this.rewrite(expr);
|
|
110
154
|
}
|
|
111
155
|
}
|
|
@@ -144,7 +188,11 @@ class Skolemizer {
|
|
|
144
188
|
for (let index = count - 1; index >= 0; index--) {
|
|
145
189
|
const sort = data.sorts[index];
|
|
146
190
|
substitution.push(
|
|
147
|
-
manager.mkApp(
|
|
191
|
+
manager.mkApp(
|
|
192
|
+
manager.mkFreshFuncDecl(data.names[index], argSorts, sort, true, data.skid),
|
|
193
|
+
args.items,
|
|
194
|
+
sort,
|
|
195
|
+
),
|
|
148
196
|
);
|
|
149
197
|
}
|
|
150
198
|
freeVarSorts.forEach((sort, index) =>
|
|
@@ -173,23 +221,31 @@ interface Frame {
|
|
|
173
221
|
spos: number;
|
|
174
222
|
}
|
|
175
223
|
|
|
224
|
+
export const NNF_SKOLEM = 0;
|
|
225
|
+
export const NNF_QUANT = 1;
|
|
226
|
+
export const NNF_FULL = 2;
|
|
227
|
+
|
|
176
228
|
export class Nnf {
|
|
177
229
|
private frames: Frame[] = [];
|
|
178
230
|
private results: RefVector;
|
|
179
231
|
private caches: ActCache[];
|
|
180
232
|
private todoDefs: RefVector;
|
|
181
233
|
private skolemizer: Skolemizer;
|
|
182
|
-
private namer:
|
|
234
|
+
private namer: ExprNamer;
|
|
235
|
+
private nestedNamer: ExprNamer;
|
|
183
236
|
|
|
184
237
|
constructor(
|
|
185
238
|
private manager: AstManager,
|
|
186
239
|
names: DefinedNames,
|
|
240
|
+
private mode = NNF_SKOLEM,
|
|
241
|
+
private isIgnoringLabels = false,
|
|
187
242
|
) {
|
|
188
243
|
this.results = new RefVector(manager);
|
|
189
244
|
this.caches = Array.from({ length: 4 }, () => new ActCache(manager, manager.getNumAsts()));
|
|
190
245
|
this.todoDefs = new RefVector(manager);
|
|
191
246
|
this.skolemizer = new Skolemizer(manager);
|
|
192
|
-
this.namer = new
|
|
247
|
+
this.namer = new ExprNamer(manager, names, false);
|
|
248
|
+
this.nestedNamer = new ExprNamer(manager, names, true);
|
|
193
249
|
}
|
|
194
250
|
|
|
195
251
|
apply(expr: number, definitions: RefVector) {
|
|
@@ -208,6 +264,7 @@ export class Nnf {
|
|
|
208
264
|
|
|
209
265
|
release() {
|
|
210
266
|
this.manager.withoutTemporaries(() => {
|
|
267
|
+
this.nestedNamer.release();
|
|
211
268
|
this.namer.release();
|
|
212
269
|
this.skolemizer.release();
|
|
213
270
|
this.todoDefs.reset();
|
|
@@ -254,7 +311,8 @@ export class Nnf {
|
|
|
254
311
|
|
|
255
312
|
private visit(expr: number, isPositive: boolean, isInQuantifier: boolean) {
|
|
256
313
|
const manager = this.manager;
|
|
257
|
-
|
|
314
|
+
const isSkipping = this.mode === NNF_SKOLEM || (this.mode === NNF_QUANT && !isInQuantifier);
|
|
315
|
+
if (isSkipping && !manager.hasQuantifierFlags[expr] && !manager.hasLabelFlags[expr]) {
|
|
258
316
|
this.skip(expr, isPositive);
|
|
259
317
|
return true;
|
|
260
318
|
}
|
|
@@ -399,8 +457,29 @@ export class Nnf {
|
|
|
399
457
|
this.setResult(frame.spos, manager.mkApp(OP_AND, [first, second], SORT_BOOL));
|
|
400
458
|
return true;
|
|
401
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
|
+
}
|
|
402
469
|
default: {
|
|
403
|
-
|
|
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);
|
|
404
483
|
if (isPositive) this.results.pushOwned(named);
|
|
405
484
|
else {
|
|
406
485
|
this.results.push(mkNot(manager, named));
|
|
@@ -414,21 +493,28 @@ export class Nnf {
|
|
|
414
493
|
private processQuantifier(quantifier: number, frame: Frame) {
|
|
415
494
|
const manager = this.manager;
|
|
416
495
|
const data = manager.getQuantifier(quantifier);
|
|
417
|
-
const isUniversal = data.
|
|
496
|
+
const isUniversal = (data.kind === QUANTIFIER_FORALL) === frame.isPositive;
|
|
418
497
|
if (frame.index === 0) {
|
|
419
498
|
frame.index = 1;
|
|
420
499
|
if (isUniversal) {
|
|
421
500
|
if (!this.visit(data.body, frame.isPositive, true)) return false;
|
|
422
501
|
} else {
|
|
423
502
|
const skolemized = this.skolemizer.skolemize(quantifier);
|
|
424
|
-
const isDone = this.visit(
|
|
503
|
+
const isDone = this.visit(
|
|
504
|
+
skolemized,
|
|
505
|
+
data.kind !== QUANTIFIER_FORALL,
|
|
506
|
+
frame.isInQuantifier,
|
|
507
|
+
);
|
|
425
508
|
manager.decRef(skolemized);
|
|
426
509
|
if (!isDone) return false;
|
|
427
510
|
}
|
|
428
511
|
}
|
|
429
512
|
if (!isUniversal) return true;
|
|
430
513
|
const body = this.results.items[this.results.size - 1];
|
|
431
|
-
this.setResult(
|
|
514
|
+
this.setResult(
|
|
515
|
+
this.results.size - 1,
|
|
516
|
+
manager.mkQuantifier({ ...data, kind: QUANTIFIER_FORALL, body }),
|
|
517
|
+
);
|
|
432
518
|
return true;
|
|
433
519
|
}
|
|
434
520
|
}
|