tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d166e0ae9
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +14 -4
- package/dist/index.d.ts +14 -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 +69 -69
- package/dist/prove.js +79 -79
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +46 -44
- package/dist/transfer.js +42 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -78
- package/src/check.ts +474 -209
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +5 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +29 -9
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +96 -37
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +152 -55
- package/src/exit-codes.ts +29 -13
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +172 -83
- package/src/liveness.ts +52 -11
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +0 -2
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +1 -1
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/source.ts +2 -0
- package/src/obligations/subexpression.ts +0 -2
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +115 -145
- package/src/pretty-print.ts +1 -1
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +4 -8
- package/src/prover/isabelle/isar/context.ts +0 -4
- package/src/prover/isabelle/isar/induct.ts +0 -4
- package/src/prover/isabelle/isar/method.ts +0 -2
- package/src/prover/isabelle/isar/proof.ts +0 -2
- package/src/prover/isabelle/isar/rule-cases.ts +8 -8
- package/src/prover/isabelle/isar/toplevel.ts +0 -4
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- 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 +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- 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 +0 -2
- 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 +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +0 -1
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +11 -4
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +12 -3
- package/src/prover/smt/solver/asserted-formulas.ts +169 -59
- package/src/prover/smt/solver/ast-lt.ts +1 -2
- package/src/prover/smt/solver/ast-util.ts +0 -2
- package/src/prover/smt/solver/ast.ts +63 -15
- package/src/prover/smt/solver/auf-solver.ts +23 -13
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -3
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +0 -1
- package/src/prover/smt/solver/bound-simplifier.ts +11 -15
- package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +1 -3
- package/src/prover/smt/solver/bv1-blast.ts +0 -2
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +35 -20
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +0 -2
- package/src/prover/smt/solver/check-logic.ts +0 -1
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -26
- package/src/prover/smt/solver/conflict-resolution.ts +0 -1
- package/src/prover/smt/solver/context.ts +67 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -8
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +0 -3
- package/src/prover/smt/solver/dependent-expr-state.ts +26 -18
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +0 -1
- package/src/prover/smt/solver/dom-simplify.ts +0 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -22
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +0 -1
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -10
- package/src/prover/smt/solver/enode.ts +0 -1
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +0 -2
- package/src/prover/smt/solver/euf/egraph.ts +4 -12
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -5
- package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -7
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -4
- package/src/prover/smt/solver/euf/q-mbi.ts +0 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +0 -3
- package/src/prover/smt/solver/euf/q-solver.ts +0 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -9
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +36 -15
- package/src/prover/smt/solver/fd-solver.ts +148 -42
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +1 -3
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +0 -1
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -3
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +1 -2
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +0 -1
- package/src/prover/smt/solver/lia2pb.ts +0 -1
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -3
- 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 +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +0 -1
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- 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 +26 -7
- 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 +158 -82
- 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 +0 -1
- 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 +0 -2
- 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 +138 -97
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +0 -3
- package/src/prover/smt/solver/mam-compiler.ts +1 -2
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +0 -2
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +3 -3
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
- package/src/prover/smt/solver/maxlex.ts +0 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +0 -2
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +1 -2
- package/src/prover/smt/solver/model-evaluator.ts +2 -1
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +85 -44
- package/src/prover/smt/solver/model-macro-solver.ts +0 -1
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +22 -46
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -3
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -4
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -11
- package/src/prover/smt/solver/muz/hnf.ts +2 -3
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -3
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -4
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -5
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +0 -1
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -1
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -3
- package/src/prover/smt/solver/muz/spacer-util.ts +0 -1
- package/src/prover/smt/solver/muz/substitution.ts +0 -2
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +3 -3
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -94
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +375 -218
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +77 -75
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +22 -9
- package/src/prover/smt/solver/opt-nlsat.ts +29 -19
- package/src/prover/smt/solver/opt-pareto.ts +19 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +10 -7
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +1 -3
- package/src/prover/smt/solver/parallel-tactic.ts +1 -3
- package/src/prover/smt/solver/pattern-inference.ts +0 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -7
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +75 -19
- package/src/prover/smt/solver/probes.ts +90 -27
- package/src/prover/smt/solver/propagate-values.ts +0 -1
- package/src/prover/smt/solver/proto-model.ts +8 -9
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +0 -1
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -6
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +0 -1
- package/src/prover/smt/solver/qe.ts +3 -4
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +23 -9
- package/src/prover/smt/solver/quant-hoist.ts +0 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +0 -1
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +0 -2
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +0 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -2
- package/src/prover/smt/solver/recfun-rewriter.ts +0 -1
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -7
- package/src/prover/smt/solver/rewriter.ts +31 -26
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +0 -2
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -2
- package/src/prover/smt/solver/sat/clause.ts +0 -3
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +1 -4
- package/src/prover/smt/solver/sat/consequences.ts +0 -1
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -29
- package/src/prover/smt/solver/sat/model-converter.ts +1 -3
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -3
- package/src/prover/smt/solver/sat/probing.ts +0 -2
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -8
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -9
- package/src/prover/smt/solver/sat/scc.ts +0 -1
- package/src/prover/smt/solver/sat/simplifier.ts +1 -4
- package/src/prover/smt/solver/sat/solver.ts +25 -49
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +0 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +20 -36
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -2
- package/src/prover/smt/solver/seq-derive.ts +4 -9
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -3
- package/src/prover/smt/solver/seq-factory.ts +0 -1
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +0 -2
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -2
- package/src/prover/smt/solver/seq-re-util.ts +1 -3
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
- package/src/prover/smt/solver/seq-regex-live.ts +2 -4
- package/src/prover/smt/solver/seq-rewriter.ts +31 -31
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +1 -3
- package/src/prover/smt/solver/smt-kernel.ts +48 -9
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +99 -15
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +589 -226
- package/src/prover/smt/solver/smtlib-script.ts +674 -197
- package/src/prover/smt/solver/solve-eqs.ts +36 -39
- package/src/prover/smt/solver/solver.ts +19 -5
- package/src/prover/smt/solver/static-features.ts +0 -2
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +332 -191
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +0 -2
- package/src/prover/smt/solver/theory-bv.ts +13 -5
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +1 -2
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +10 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -4
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -2
- package/src/prover/smt/solver/theory-pb.ts +24 -9
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +0 -1
- package/src/prover/smt/solver/theory-seq-regex.ts +0 -1
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -3
- package/src/prover/smt/solver/theory-seq-state.ts +2 -23
- package/src/prover/smt/solver/theory-seq.ts +0 -1
- package/src/prover/smt/solver/theory.ts +0 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -2
- package/src/prover/smt/solver/var-subst.ts +0 -1
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +0 -2
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +0 -2
- package/src/prover/zenon/parse.ts +0 -2
- 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 +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +0 -2
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +1072 -253
- package/src/runtime.ts +11 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +38 -30
- package/src/sany/generator-proofs.ts +6 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +262 -144
- package/src/simulate.ts +168 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +56 -22
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_slice.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { getSymbolName, KIND_VAR, OP_EQ, OP_ITE, SORT_BOOL } from "../ast";
|
|
3
2
|
import { flattenAndVector } from "../ast-util";
|
|
4
3
|
import { ObjMap } from "../hashtable";
|
|
@@ -214,7 +213,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
214
213
|
const manager = this.context.manager;
|
|
215
214
|
let hasOutput = false;
|
|
216
215
|
for (const [predicate, slice] of this.sliceable) {
|
|
217
|
-
const domain = manager.funcDecls[predicate].domain.filter((
|
|
216
|
+
const domain = manager.funcDecls[predicate].domain.filter((_value, index) => !slice[index]);
|
|
218
217
|
if (domain.length < slice.length) {
|
|
219
218
|
const sliced = this.context.mkFreshHeadPredicate(
|
|
220
219
|
getSymbolName(manager.funcDecls[predicate].name),
|
|
@@ -239,7 +238,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
239
238
|
const slice = this.getPredicateSlice(manager.decls[atom]);
|
|
240
239
|
return manager.mkApp(
|
|
241
240
|
sliced,
|
|
242
|
-
manager.getArgs(atom).filter((
|
|
241
|
+
manager.getArgs(atom).filter((_value, index) => !slice[index]),
|
|
243
242
|
SORT_BOOL,
|
|
244
243
|
);
|
|
245
244
|
}
|
|
@@ -304,7 +303,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
304
303
|
const domain = manager.funcDecls[predicate].domain;
|
|
305
304
|
const subst = domain
|
|
306
305
|
.map((sort, index) => manager.mkVar(index, sort))
|
|
307
|
-
.filter((
|
|
306
|
+
.filter((_value, index) => !slice[index]);
|
|
308
307
|
const interp = model.funcInterps.get(sliced);
|
|
309
308
|
if (interp === undefined) continue;
|
|
310
309
|
const oldInterp = new FuncInterp(manager, slice.length);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_subsumption_checker.cpp,
|
|
2
|
-
// src/muz/base/dl_rule_subsumption_index.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { KIND_VAR } from "../ast";
|
|
4
2
|
import { ObjHashtable } from "../hashtable";
|
|
5
3
|
import type { DatalogContext } from "./dl-context";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_rule_transformer.cpp, src/muz/transforms/dl_transforms.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import type { DatalogContext } from "./dl-context";
|
|
5
3
|
import { MkBitBlast } from "./dl-mk-bit-blast";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_rule.cpp, src/muz/base/bind_variables.cpp), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -49,7 +47,7 @@ export class Rule {
|
|
|
49
47
|
readonly isNegated: boolean[],
|
|
50
48
|
readonly uninterpretedSize: number,
|
|
51
49
|
readonly positiveSize: number,
|
|
52
|
-
readonly name: string,
|
|
50
|
+
readonly name: string | undefined,
|
|
53
51
|
) {}
|
|
54
52
|
|
|
55
53
|
getDecl(manager: AstManager) {
|
|
@@ -66,9 +64,8 @@ export class Rule {
|
|
|
66
64
|
return false;
|
|
67
65
|
}
|
|
68
66
|
|
|
69
|
-
// symbol::str of the name, where the empty name is the null symbol.
|
|
70
67
|
getNameText() {
|
|
71
|
-
return this.name
|
|
68
|
+
return this.name ?? "<null>";
|
|
72
69
|
}
|
|
73
70
|
|
|
74
71
|
display(context: DatalogContext) {
|
|
@@ -227,20 +224,20 @@ export class RuleManager {
|
|
|
227
224
|
return expr;
|
|
228
225
|
}
|
|
229
226
|
|
|
230
|
-
mkRule(fml: number, rules: RuleSet, name
|
|
227
|
+
mkRule(fml: number, rules: RuleSet, name?: string) {
|
|
231
228
|
const bound = this.context.bindVars(fml, true);
|
|
232
229
|
if (this.manager.hasLabelFlags[bound]) throw new SmtUnsupportedError("labels in Horn rules");
|
|
233
230
|
this.mkRuleCore(bound, rules, name);
|
|
234
231
|
}
|
|
235
232
|
|
|
236
|
-
private mkRuleCore(fml: number, rules: RuleSet, name: string) {
|
|
233
|
+
private mkRuleCore(fml: number, rules: RuleSet, name: string | undefined) {
|
|
237
234
|
this.hnf.setName(name);
|
|
238
235
|
const fmls = this.hnf.apply(fml);
|
|
239
236
|
for (const predicate of this.hnf.freshPredicates) this.context.registerPredicate(predicate);
|
|
240
237
|
for (const horn of fmls) this.mkHornRule(horn, rules, name);
|
|
241
238
|
}
|
|
242
239
|
|
|
243
|
-
private mkHornRule(fml: number, rules: RuleSet, name: string) {
|
|
240
|
+
private mkHornRule(fml: number, rules: RuleSet, name: string | undefined) {
|
|
244
241
|
const manager = this.manager;
|
|
245
242
|
const body: number[] = [];
|
|
246
243
|
const extracted = this.extractHorn(fml, body);
|
|
@@ -309,7 +306,7 @@ export class RuleManager {
|
|
|
309
306
|
head: number,
|
|
310
307
|
tail: readonly number[],
|
|
311
308
|
isNegated: readonly boolean[],
|
|
312
|
-
name
|
|
309
|
+
name?: string,
|
|
313
310
|
isNormalizing = true,
|
|
314
311
|
) {
|
|
315
312
|
const manager = this.manager;
|
|
@@ -384,7 +381,7 @@ export class RuleManager {
|
|
|
384
381
|
return mkForall(
|
|
385
382
|
manager,
|
|
386
383
|
sorts,
|
|
387
|
-
sorts.map((
|
|
384
|
+
sorts.map((_value, index) => getVarName(index)),
|
|
388
385
|
matrix,
|
|
389
386
|
);
|
|
390
387
|
}
|
|
@@ -481,7 +478,7 @@ export class RuleManager {
|
|
|
481
478
|
const preQuant = this.pin(varSubst.apply(unboundTail, subst));
|
|
482
479
|
varSubst.release();
|
|
483
480
|
sorts.reverse();
|
|
484
|
-
const names = sorts.map((
|
|
481
|
+
const names = sorts.map((_value, index) => String(sorts.length - 1 - index));
|
|
485
482
|
const quantified = this.pin(mkExists(manager, sorts, names, preQuant));
|
|
486
483
|
let fixed = isTryingQe ? this.pin(simplifyQuantifiers(manager, quantified)) : quantified;
|
|
487
484
|
if (manager.kinds[fixed] !== KIND_APP) fixed = this.pin(manager.mkEq(fixed, manager.trueExpr));
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/hnf.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
FAMILY_USER,
|
|
@@ -26,8 +25,8 @@ export class Hnf {
|
|
|
26
25
|
|
|
27
26
|
constructor(private manager: AstManager) {}
|
|
28
27
|
|
|
29
|
-
setName(name: string) {
|
|
30
|
-
this.name = name
|
|
28
|
+
setName(name: string | undefined) {
|
|
29
|
+
this.name = name ?? "P";
|
|
31
30
|
}
|
|
32
31
|
|
|
33
32
|
private isPredicate(expr: number) {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/converters/horn_subsume_model_converter.cpp, del_rule of
|
|
2
|
-
// src/muz/base/dl_util.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
FAMILY_USER,
|
|
5
3
|
KIND_APP,
|
|
@@ -66,7 +64,7 @@ export class HornSubsumeModelConverter {
|
|
|
66
64
|
const quantified = manager.mkQuantifier({
|
|
67
65
|
kind: QUANTIFIER_EXISTS,
|
|
68
66
|
sorts: sorts.reverse(),
|
|
69
|
-
names: sorts.map((
|
|
67
|
+
names: sorts.map((_value, index) => sorts.length - index - 1),
|
|
70
68
|
body: substituted,
|
|
71
69
|
patterns: [],
|
|
72
70
|
noPatterns: [],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/fp/horn_tactic.cpp, src/muz/fp/dl_register_engine.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -19,7 +17,7 @@ import { L_FALSE, L_TRUE } from "../lbool";
|
|
|
19
17
|
import { RefVector } from "../ref-vector";
|
|
20
18
|
import type { RewriterOptions } from "../rewriter";
|
|
21
19
|
import { getFreeVarSorts } from "../var-subst";
|
|
22
|
-
import { DatalogContext, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
20
|
+
import { DatalogContext, ENGINE_DATALOG, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
23
21
|
import { mkForall, mkPp } from "./dl-rule";
|
|
24
22
|
import { SpacerDlInterface } from "./spacer-dl-interface";
|
|
25
23
|
|
|
@@ -29,6 +27,19 @@ export const createDatalogContext = (
|
|
|
29
27
|
rewriterOptions: RewriterOptions,
|
|
30
28
|
) =>
|
|
31
29
|
new DatalogContext(manager, new FpParams(parameters), rewriterOptions, (context, engine) => {
|
|
30
|
+
if (engine === ENGINE_DATALOG)
|
|
31
|
+
return {
|
|
32
|
+
// rel_context::query checks the rules with the query's before the saturation the port lacks.
|
|
33
|
+
query: (query) => {
|
|
34
|
+
context.ruleManager.mkQuery(query, context.getRules());
|
|
35
|
+
context.ensureClosed();
|
|
36
|
+
context.getRules();
|
|
37
|
+
throw new SmtUnsupportedError("the datalog engine");
|
|
38
|
+
},
|
|
39
|
+
getModel: () => {
|
|
40
|
+
throw new SmtUnsupportedError("the datalog engine");
|
|
41
|
+
},
|
|
42
|
+
};
|
|
32
43
|
if (engine !== ENGINE_SPACER) throw new SmtUnsupportedError("the bmc engine");
|
|
33
44
|
return new SpacerDlInterface(context);
|
|
34
45
|
});
|
|
@@ -140,7 +151,7 @@ class HornTactic {
|
|
|
140
151
|
);
|
|
141
152
|
if (sorts.length === 0) return formula;
|
|
142
153
|
sorts.reverse();
|
|
143
|
-
const names = sorts.map((
|
|
154
|
+
const names = sorts.map((_value, index) => String(sorts.length - index - 1));
|
|
144
155
|
const result = mkForall(manager, sorts, names, formula);
|
|
145
156
|
manager.incRef(result);
|
|
146
157
|
return result;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/rule_properties.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError } from "../../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
type AstManager,
|
|
@@ -278,6 +277,28 @@ export class RuleProperties {
|
|
|
278
277
|
);
|
|
279
278
|
}
|
|
280
279
|
|
|
280
|
+
checkQuantifierFree() {
|
|
281
|
+
const first = this.quantifiers.entries().next();
|
|
282
|
+
if (first.done !== true)
|
|
283
|
+
throw new SmtTacticError(
|
|
284
|
+
`cannot process quantifier in rule ${first.value[1].display(this.context)}`,
|
|
285
|
+
);
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
checkNestedFree() {
|
|
289
|
+
const rules = this.interpretedPredicateRules;
|
|
290
|
+
if (rules.length > 0)
|
|
291
|
+
throw new SmtTacticError(`Rule contains nested predicates ${rules[0].display(this.context)}`);
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
checkInfiniteSorts() {
|
|
295
|
+
const rules = this.infiniteSortRules;
|
|
296
|
+
if (rules.length > 0)
|
|
297
|
+
throw new SmtTacticError(
|
|
298
|
+
`Rule contains infinite sorts in rule ${rules[rules.length - 1].display(this.context)}`,
|
|
299
|
+
);
|
|
300
|
+
}
|
|
301
|
+
|
|
281
302
|
checkExistsFree() {
|
|
282
303
|
for (const entry of this.quantifiers)
|
|
283
304
|
if (this.manager.getQuantifier(entry[0]).kind === QUANTIFIER_EXISTS)
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_context.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { type AstManager, getSymbolName, KIND_VAR, OP_AND, OP_IMPLIES, SORT_BOOL } from "../ast";
|
|
4
3
|
import { flattenOrVector, pushNotOwned } from "../ast-util";
|
|
@@ -54,7 +53,6 @@ export class Lemma {
|
|
|
54
53
|
ctp: ProtoModel | undefined;
|
|
55
54
|
level: number;
|
|
56
55
|
bumped = 0;
|
|
57
|
-
weakness: number;
|
|
58
56
|
isBlocked = false;
|
|
59
57
|
|
|
60
58
|
constructor(
|
|
@@ -64,7 +62,6 @@ export class Lemma {
|
|
|
64
62
|
pob?: Pob,
|
|
65
63
|
) {
|
|
66
64
|
this.level = level;
|
|
67
|
-
this.weakness = pob === undefined ? 65535 : pob.weakness;
|
|
68
65
|
this.pob = pob;
|
|
69
66
|
if (body !== -1) this.body = context.normalizer.normalize(body);
|
|
70
67
|
}
|
|
@@ -299,7 +296,6 @@ class Derivation {
|
|
|
299
296
|
|
|
300
297
|
constructor(
|
|
301
298
|
readonly parent: Pob,
|
|
302
|
-
readonly rule: Rule,
|
|
303
299
|
private trans: number,
|
|
304
300
|
private evars: number[],
|
|
305
301
|
) {}
|
|
@@ -1143,6 +1139,7 @@ export class SpacerContext {
|
|
|
1143
1139
|
this.pobQueue.incLevel();
|
|
1144
1140
|
level = this.pobQueue.maxLevel;
|
|
1145
1141
|
}
|
|
1142
|
+
this.datalogContext.isBounded = true;
|
|
1146
1143
|
return L_UNDEF;
|
|
1147
1144
|
}
|
|
1148
1145
|
|
|
@@ -1373,7 +1370,7 @@ export class SpacerContext {
|
|
|
1373
1370
|
];
|
|
1374
1371
|
phi = pt.mbp(vars, phi, model, this.isUsingGroundPob);
|
|
1375
1372
|
if (this.isUsingGpdr && predicates.length > 1) return gpdrCreateSplitChildren();
|
|
1376
|
-
const derivation = new Derivation(pob,
|
|
1373
|
+
const derivation = new Derivation(pob, phi, vars);
|
|
1377
1374
|
for (let index = 0; index < predicates.length; index++) {
|
|
1378
1375
|
const premisePt = this.getPredTransformer(predicates[index]);
|
|
1379
1376
|
const summary = premisePt.getOriginSummary(
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_ind_lemma_generalizer.cpp,
|
|
2
|
-
// src/muz/spacer/spacer_generalizers.cpp, src/muz/spacer/spacer_util.cpp), MIT license, see
|
|
3
|
-
// z3-license.txt.
|
|
4
1
|
import { MBQI_MAX_ITERATIONS } from "../context";
|
|
5
2
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
6
3
|
import {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_manager.cpp, src/muz/spacer/spacer_sym_mux.cpp), MIT
|
|
2
|
-
// license, see z3-license.txt.
|
|
3
1
|
import { type AstManager, getSymbolName, KIND_APP } from "../ast";
|
|
4
2
|
import { RewriterTpl } from "../rewriter-tpl";
|
|
5
3
|
import { pin } from "./spacer-util";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/spacer/spacer_pdr.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
3
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
4
3
|
import { L_GAVE_UP, type Pob, type SpacerContext } from "./spacer-context";
|
|
@@ -211,6 +210,7 @@ export const gpdrSolveCore = (context: SpacerContext) => {
|
|
|
211
210
|
if (reachable !== L_FALSE) return reachable;
|
|
212
211
|
if (level > 0 && context.propagate(context.expandedLevel, level)) return L_FALSE;
|
|
213
212
|
}
|
|
213
|
+
context.datalogContext.isBounded = true;
|
|
214
214
|
return L_UNDEF;
|
|
215
215
|
};
|
|
216
216
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// MIT license, see z3-license.txt. Cores are subset cores: the port has no proofs to interpolate.
|
|
1
|
+
// Cores are subset cores: the port has no proofs to interpolate.
|
|
3
2
|
import { MBQI_MAX_ITERATIONS } from "../context";
|
|
4
3
|
import { type AstManager, KIND_APP, SORT_BOOL } from "../ast";
|
|
5
4
|
import { flattenAndVector } from "../ast-util";
|
|
@@ -129,7 +128,7 @@ export class IucSolver {
|
|
|
129
128
|
const result = kernel.check(this.assumptions);
|
|
130
129
|
this.lastModel = undefined;
|
|
131
130
|
if (result === L_TRUE) {
|
|
132
|
-
this.lastModel = kernel.context.
|
|
131
|
+
this.lastModel = kernel.context.getSatModel();
|
|
133
132
|
this.lastModel.incRef();
|
|
134
133
|
}
|
|
135
134
|
this.lastCore = result === L_FALSE ? [...kernel.context.unsatCore] : [];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
1
|
+
// Z3 registers only the satisfiability mode as a tactic, so the elimination mode of mk_nlqe_tactic
|
|
2
|
+
// is not ported.
|
|
3
3
|
import { SmtTacticError } from "../../../errors";
|
|
4
4
|
import {
|
|
5
5
|
type AstManager,
|
|
@@ -429,7 +429,7 @@ class Nlqsat {
|
|
|
429
429
|
|
|
430
430
|
private mkModel() {
|
|
431
431
|
const manager = this.manager;
|
|
432
|
-
const model = new ProtoModel(manager);
|
|
432
|
+
const model = new ProtoModel(manager).mkModel();
|
|
433
433
|
for (const [term, variable] of this.t2x) {
|
|
434
434
|
if (!manager.isUninterpretedConst(term) || !this.freeVars.has(term)) continue;
|
|
435
435
|
const value = this.rmodel0[variable] ?? new Anum(Rational.zero);
|