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,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/random_updater_def.h, and shift_var and
|
|
2
|
-
// get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { getLcm, Rational } from "../rational";
|
|
4
2
|
import { IndexedUintSet } from "./containers";
|
|
5
3
|
import type { LarSolver } from "./lar-solver";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/trail.h, src/util/union_find.h), MIT license, see z3-license.txt.
|
|
2
1
|
import { shrink } from "../array";
|
|
3
2
|
|
|
4
3
|
export class TrailStack {
|
|
@@ -21,7 +20,7 @@ export class TrailStack {
|
|
|
21
20
|
}
|
|
22
21
|
}
|
|
23
22
|
|
|
24
|
-
|
|
23
|
+
interface UnionFindTrail {
|
|
25
24
|
push(undo: () => void): void;
|
|
26
25
|
}
|
|
27
26
|
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/macros/macro_finder.cpp, src/ast/macros/macro_manager.cpp,
|
|
2
|
-
// src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp,
|
|
3
|
-
// src/tactic/ufbv/macro_finder_tactic.cpp), MIT license, see z3-license.txt.
|
|
4
1
|
import {
|
|
5
2
|
FAMILY_USER,
|
|
6
3
|
KIND_APP,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { KIND_VAR, type AstManager } from "./ast";
|
|
3
2
|
import type { Enode } from "./enode";
|
|
4
3
|
|
|
@@ -73,7 +72,7 @@ export interface MamEnode<E> {
|
|
|
73
72
|
}
|
|
74
73
|
|
|
75
74
|
// The context that undoes a compiler's updates of shared code trees.
|
|
76
|
-
|
|
75
|
+
interface CompilerContext {
|
|
77
76
|
readonly manager: AstManager;
|
|
78
77
|
pushTrail(undo: () => void): void;
|
|
79
78
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/bv/max_bv_sharing_tactic.h, src/ast/simplifiers/max_bv_sharing.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import type { AstManager } from "./ast";
|
|
4
2
|
import { runSimplifier } from "./dependent-expr-state";
|
|
5
3
|
import type { Goal } from "./goal";
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// with Z3's default parameters is ported.
|
|
1
|
+
// Only the maxres strategy with Z3's default parameters is ported.
|
|
3
2
|
import { OP_AND, OP_EQ, OP_IMPLIES, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { mkNot } from "./ast-util";
|
|
5
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -275,10 +274,11 @@ export class Maxcore extends MaxsmtSolverBase {
|
|
|
275
274
|
const upper = this.getCost(model);
|
|
276
275
|
if (upper.compare(this.upper) > 0) return;
|
|
277
276
|
if (!this.context.verifyModel(this.index, model, upper)) return;
|
|
277
|
+
const numAssertions = this.solver.getNumAssertions();
|
|
278
278
|
this.model = model;
|
|
279
279
|
this.context.modelUpdated(model);
|
|
280
280
|
for (const soft of this.soft) soft.value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
|
|
281
|
-
this.upper = upper;
|
|
281
|
+
if (numAssertions === this.solver.getNumAssertions()) this.upper = upper;
|
|
282
282
|
}
|
|
283
283
|
|
|
284
284
|
private removeSoft(core: readonly number[]) {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/opt/maxsmt.h, src/opt/maxsmt.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, SORT_BOOL } from "./ast";
|
|
3
2
|
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
4
3
|
import { Preprocess } from "./opt-preprocess";
|
|
@@ -11,6 +10,7 @@ export interface MaxsatSolver {
|
|
|
11
10
|
checkSat(assumptions: readonly number[]): number;
|
|
12
11
|
getModel(): ProtoModel | null;
|
|
13
12
|
getUnsatCore(): readonly number[];
|
|
13
|
+
getNumAssertions(): number;
|
|
14
14
|
findMutexes(vars: readonly number[]): { status: number; mutexes: number[][] };
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/mbp/mbp_term_graph.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, KIND_APP, OP_AND, OP_DISTINCT, OP_EQ, SORT_BOOL } from "../ast";
|
|
3
2
|
import { getNumExprs, isAppOf } from "../ast-util";
|
|
4
3
|
import { RefVector } from "../ref-vector";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/simplex/model_based_opt.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { getEuclideanDiv, getEuclideanMod, getGcd, getLcm, Rational } from "./rational";
|
|
4
3
|
|
|
@@ -29,7 +28,7 @@ export const DEF_ADD = 0;
|
|
|
29
28
|
export const DEF_MUL = 1;
|
|
30
29
|
export const DEF_DIV = 2;
|
|
31
30
|
export const DEF_CONST = 3;
|
|
32
|
-
|
|
31
|
+
const DEF_VAR = 4;
|
|
33
32
|
|
|
34
33
|
interface AddDef {
|
|
35
34
|
readonly kind: typeof DEF_ADD;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_checker.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import { KIND_APP, OP_NOT, OP_OR, SORT_BOOL } from "./ast";
|
|
4
3
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
@@ -56,7 +55,7 @@ class AuxContext {
|
|
|
56
55
|
const context = this.context;
|
|
57
56
|
context.popToBaseLevel();
|
|
58
57
|
const result = context.checkResearching(this.asserted, []);
|
|
59
|
-
return result === L_TRUE ? context.
|
|
58
|
+
return result === L_TRUE ? context.getSatModel() : result === L_FALSE ? "unsat" : "unknown";
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/model/model_evaluator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
3
2
|
import {
|
|
4
3
|
FAMILY_ARITH,
|
|
@@ -65,6 +64,8 @@ export class ModelEvaluator extends RewriterTpl {
|
|
|
65
64
|
this.rewriter = new Rewriter(manager, {
|
|
66
65
|
...TACTIC_REWRITER_OPTIONS,
|
|
67
66
|
bv: { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0, isMkbv2num: true },
|
|
67
|
+
isExpandingSelects: true,
|
|
68
|
+
isKeepingDistinct: true,
|
|
68
69
|
});
|
|
69
70
|
this.rewriter.releaseResult = () => this.setLastResult(-1);
|
|
70
71
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_generator.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { FAMILY_BASIC, FAMILY_USER, SORT_BOOL } from "./ast";
|
|
3
2
|
import type { Context } from "./context";
|
|
4
3
|
import { Enode } from "./enode";
|
|
5
4
|
import { FuncInterp, ProtoModel } from "./proto-model";
|
|
6
|
-
import type { DependentValue } from "./theory";
|
|
5
|
+
import type { DependentValue, ExtraFreshValue } from "./theory";
|
|
7
6
|
|
|
8
7
|
export interface GeneratedModel {
|
|
9
8
|
model: ProtoModel;
|
|
@@ -20,6 +19,9 @@ const isIncludedFuncInterp = (context: Context, decl: number) => {
|
|
|
20
19
|
return context.getTheory(family)?.includeFuncInterp(decl) ?? true;
|
|
21
20
|
};
|
|
22
21
|
|
|
22
|
+
const GREY = 1;
|
|
23
|
+
const BLACK = 2;
|
|
24
|
+
|
|
23
25
|
export const mkModel = (context: Context): GeneratedModel => {
|
|
24
26
|
const manager = context.manager;
|
|
25
27
|
const model = new ProtoModel(manager);
|
|
@@ -35,58 +37,95 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
35
37
|
context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr,
|
|
36
38
|
);
|
|
37
39
|
}
|
|
38
|
-
const
|
|
39
|
-
const
|
|
40
|
-
const
|
|
40
|
+
const roots: Enode[] = [];
|
|
41
|
+
const procs = new Map<Enode, number | DependentValue>();
|
|
42
|
+
const freshRoots = new Set<Enode>();
|
|
43
|
+
const extraFreshValues = new Set<ExtraFreshValue>();
|
|
41
44
|
for (const node of context.enodes) {
|
|
42
45
|
if (node.root !== node) continue;
|
|
43
46
|
const expr = node.owner;
|
|
44
47
|
if (!context.isRelevant(expr) && !manager.isValue(expr)) continue;
|
|
48
|
+
roots.push(node);
|
|
45
49
|
const sort = manager.sorts[expr];
|
|
46
50
|
const theory = context.getTheory(manager.getSortFamily(sort));
|
|
47
51
|
if (sort === SORT_BOOL)
|
|
48
|
-
|
|
49
|
-
else if (manager.isModelValue(expr))
|
|
52
|
+
procs.set(node, context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr);
|
|
53
|
+
else if (manager.isModelValue(expr)) procs.set(node, expr);
|
|
50
54
|
else if (theory !== undefined && theory.buildModels()) {
|
|
51
|
-
const
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
const proc = node.getThVar(theory.id) < 0 ? undefined : theory.mkValue(node);
|
|
56
|
+
if (proc === undefined) {
|
|
57
|
+
const freshValue: ExtraFreshValue = { sort, value: undefined };
|
|
58
|
+
freshRoots.add(node);
|
|
59
|
+
extraFreshValues.add(freshValue);
|
|
60
|
+
procs.set(node, { dependencies: [freshValue], mkValue: (values) => values[0] });
|
|
61
|
+
} else {
|
|
62
|
+
if (typeof proc !== "number")
|
|
63
|
+
for (const dependency of proc.dependencies)
|
|
64
|
+
if (!(dependency instanceof Enode)) extraFreshValues.add(dependency);
|
|
65
|
+
procs.set(node, proc);
|
|
66
|
+
}
|
|
67
|
+
} else procs.set(node, model.getFreshValue(sort) ?? model.getSomeValue(sort));
|
|
60
68
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
root2value.set(node, value);
|
|
68
|
-
return value;
|
|
69
|
+
const colors = new Map<Enode | ExtraFreshValue, number>();
|
|
70
|
+
const traversedSorts = new Set<number>();
|
|
71
|
+
const sortedSources: (Enode | ExtraFreshValue)[] = [];
|
|
72
|
+
const todo: (Enode | ExtraFreshValue)[] = [];
|
|
73
|
+
const visitChild = (source: Enode | ExtraFreshValue) => {
|
|
74
|
+
if (!colors.has(source)) todo.push(source);
|
|
69
75
|
};
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
if (
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
76
|
+
const processSource = (source: Enode | ExtraFreshValue) => {
|
|
77
|
+
if (colors.get(source) === BLACK) return;
|
|
78
|
+
todo.push(source);
|
|
79
|
+
while (todo.length > 0) {
|
|
80
|
+
const current = todo[todo.length - 1];
|
|
81
|
+
const color = colors.get(current);
|
|
82
|
+
if (color === BLACK) todo.pop();
|
|
83
|
+
else if (color === GREY) {
|
|
84
|
+
colors.set(current, BLACK);
|
|
85
|
+
sortedSources.push(current);
|
|
86
|
+
} else {
|
|
87
|
+
colors.set(current, GREY);
|
|
88
|
+
if (current instanceof Enode) {
|
|
89
|
+
const proc = procs.get(current);
|
|
90
|
+
if (proc !== undefined && typeof proc !== "number")
|
|
91
|
+
for (const dependency of proc.dependencies)
|
|
92
|
+
visitChild(dependency instanceof Enode ? dependency.root : dependency);
|
|
93
|
+
} else if (!traversedSorts.has(current.sort)) {
|
|
94
|
+
for (const root of roots)
|
|
95
|
+
if (manager.sorts[root.owner] === current.sort && !freshRoots.has(root))
|
|
96
|
+
visitChild(root);
|
|
97
|
+
traversedSorts.add(current.sort);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
87
101
|
};
|
|
88
|
-
for (const
|
|
89
|
-
for (const
|
|
102
|
+
for (const freshValue of extraFreshValues) processSource(freshValue);
|
|
103
|
+
for (const root of freshRoots) processSource(root);
|
|
104
|
+
for (const root of roots) processSource(root);
|
|
105
|
+
const root2value = new Map<Enode, number>();
|
|
106
|
+
for (const source of sortedSources) {
|
|
107
|
+
if (!(source instanceof Enode)) {
|
|
108
|
+
source.value = model.getFreshValue(source.sort) ?? undefined;
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
const expr = source.owner;
|
|
112
|
+
const sort = manager.sorts[expr];
|
|
113
|
+
const proc = procs.get(source) ?? model.getFreshValue(sort) ?? model.getSomeValue(sort);
|
|
114
|
+
const value = manager.isValue(expr)
|
|
115
|
+
? expr
|
|
116
|
+
: typeof proc === "number"
|
|
117
|
+
? proc
|
|
118
|
+
: proc.mkValue(
|
|
119
|
+
proc.dependencies.map((dependency) =>
|
|
120
|
+
dependency instanceof Enode
|
|
121
|
+
? (root2value.get(dependency.root) ??
|
|
122
|
+
model.getSomeValue(manager.sorts[dependency.owner]))
|
|
123
|
+
: (dependency.value ?? model.getSomeValue(dependency.sort)),
|
|
124
|
+
),
|
|
125
|
+
);
|
|
126
|
+
model.registerValue(value);
|
|
127
|
+
root2value.set(source, value);
|
|
128
|
+
}
|
|
90
129
|
const getValue = (node: Enode) =>
|
|
91
130
|
root2value.get(node.root) ?? model.getSomeValue(manager.sorts[node.owner]);
|
|
92
131
|
for (const node of context.enodes)
|
|
@@ -105,7 +144,9 @@ export const mkModel = (context: Context): GeneratedModel => {
|
|
|
105
144
|
interp = new FuncInterp(manager, node.numArgs);
|
|
106
145
|
model.registerFunc(node.decl, interp);
|
|
107
146
|
}
|
|
108
|
-
const args = Array.from({ length: node.numArgs }, (
|
|
147
|
+
const args = Array.from({ length: node.numArgs }, (_value, index) =>
|
|
148
|
+
getValue(node.getArg(index)),
|
|
149
|
+
);
|
|
109
150
|
if (interp.getEntry(args) === undefined) interp.insertNewEntry(args, getValue(node));
|
|
110
151
|
}
|
|
111
152
|
for (const theory of context.theories) theory.finalizeModel();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/util/mpf.h, src/util/mpf.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { Rational } from "./rational";
|
|
3
2
|
|
|
4
3
|
export const MPF_ROUND_NEAREST_TEVEN = 0;
|
|
@@ -45,9 +44,9 @@ const getRoot = (value: bigint) => {
|
|
|
45
44
|
return low * low === value ? { root: low, isExact: true } : { root: low + 1n, isExact: false };
|
|
46
45
|
};
|
|
47
46
|
|
|
48
|
-
|
|
47
|
+
const mkBotExp = (ebits: number) => -(2 ** (ebits - 1) - 1);
|
|
49
48
|
|
|
50
|
-
|
|
49
|
+
const mkTopExp = (ebits: number) => 2 ** (ebits - 1);
|
|
51
50
|
|
|
52
51
|
export const mkMinExp = (ebits: number) => mkBotExp(ebits) + 1;
|
|
53
52
|
|
|
@@ -99,8 +98,6 @@ export const isPzero = (value: Mpf) => !value.sign && isZero(value);
|
|
|
99
98
|
|
|
100
99
|
export const isNeg = (value: Mpf) => value.sign && !isNan(value);
|
|
101
100
|
|
|
102
|
-
export const isPos = (value: Mpf) => !value.sign && !isNan(value);
|
|
103
|
-
|
|
104
101
|
export const isDenormal = (value: Mpf) => !isZero(value) && hasBotExp(value);
|
|
105
102
|
|
|
106
103
|
export const isNormal = (value: Mpf) => !(hasTopExp(value) || isDenormal(value) || isZero(value));
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/mus.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import type { AstManager } from "./ast";
|
|
3
2
|
import { mkNot } from "./ast-util";
|
|
4
3
|
import { L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -11,7 +10,7 @@ export class Mus {
|
|
|
11
10
|
|
|
12
11
|
constructor(
|
|
13
12
|
private manager: AstManager,
|
|
14
|
-
private solver: MaxsatSolver,
|
|
13
|
+
private solver: Pick<MaxsatSolver, "checkSat" | "getUnsatCore">,
|
|
15
14
|
) {
|
|
16
15
|
this.lit2expr = new RefVector(manager);
|
|
17
16
|
this.trail = new RefVector(manager);
|
|
@@ -34,8 +33,7 @@ export class Mus {
|
|
|
34
33
|
return L_TRUE;
|
|
35
34
|
}
|
|
36
35
|
let unknown = [...literals];
|
|
37
|
-
|
|
38
|
-
const literal = unknown.pop() as number;
|
|
36
|
+
for (let literal = unknown.pop(); literal !== undefined; literal = unknown.pop()) {
|
|
39
37
|
const notLiteral = mkNot(this.manager, literal);
|
|
40
38
|
this.trail.push(notLiteral);
|
|
41
39
|
const status = this.solver.checkSat([...mus.items, ...unknown, notLiteral]);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/base/dl_context.cpp, src/muz/base/dl_engine_base.h), MIT license, see
|
|
2
|
-
// z3-license.txt.
|
|
3
1
|
import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import {
|
|
5
3
|
type AstManager,
|
|
@@ -12,16 +10,16 @@ import {
|
|
|
12
10
|
SORT_SIZE_INFINITE,
|
|
13
11
|
} from "../ast";
|
|
14
12
|
import type { Definition } from "../goal";
|
|
15
|
-
import {
|
|
16
|
-
import { FuncInterp, type ProtoModel } from "../proto-model";
|
|
13
|
+
import type { ProtoModel } from "../proto-model";
|
|
17
14
|
import { type RewriterOptions, Rewriter } from "../rewriter";
|
|
18
15
|
import { RefVector } from "../ref-vector";
|
|
19
16
|
import { applyQeLiteToConjuncts } from "../qe-lite";
|
|
17
|
+
import { applyDefinitions } from "../tactic";
|
|
20
18
|
import { BindVariables, mkExists, type Rule, RuleManager, getUsedVars } from "./dl-rule";
|
|
21
19
|
import { RuleSet } from "./dl-rule-set";
|
|
22
20
|
import { RuleProperties } from "./rule-properties";
|
|
23
21
|
|
|
24
|
-
const ENGINE_DATALOG = 0;
|
|
22
|
+
export const ENGINE_DATALOG = 0;
|
|
25
23
|
export const ENGINE_SPACER = 1;
|
|
26
24
|
const ENGINE_BMC = 2;
|
|
27
25
|
const ENGINE_QBMC = 3;
|
|
@@ -40,9 +38,13 @@ const ENGINE_NAMES = new Map([
|
|
|
40
38
|
["ddnf", ENGINE_DDNF],
|
|
41
39
|
]);
|
|
42
40
|
|
|
43
|
-
//
|
|
41
|
+
// As in Z3, these are copied when the context is made, so a later fp option doesn't apply.
|
|
44
42
|
export class FpParams {
|
|
45
|
-
|
|
43
|
+
private parameters: ReadonlyMap<string, string>;
|
|
44
|
+
|
|
45
|
+
constructor(parameters: ReadonlyMap<string, string>) {
|
|
46
|
+
this.parameters = new Map(parameters);
|
|
47
|
+
}
|
|
46
48
|
|
|
47
49
|
getBool(name: string, defaultValue: boolean) {
|
|
48
50
|
const value = this.parameters.get(`fp.${name}`);
|
|
@@ -61,40 +63,6 @@ export class FpParams {
|
|
|
61
63
|
|
|
62
64
|
export type ModelConverter = (model: ProtoModel) => ProtoModel;
|
|
63
65
|
|
|
64
|
-
// generic_model_converter::operator() over predicates, where a definition of -1 hides the
|
|
65
|
-
// declaration.
|
|
66
|
-
const applyDefinitions = (definitions: readonly Definition[], model: ProtoModel) => {
|
|
67
|
-
const manager = model.manager;
|
|
68
|
-
let evaluator = new ModelEvaluator(manager, model);
|
|
69
|
-
evaluator.setModelCompletion(true);
|
|
70
|
-
for (let index = definitions.length - 1; index >= 0; index--) {
|
|
71
|
-
const definition = definitions[index];
|
|
72
|
-
if (definition.def === -1) {
|
|
73
|
-
model.unregisterDecl(definition.decl);
|
|
74
|
-
continue;
|
|
75
|
-
}
|
|
76
|
-
const value = evaluator.rewrite(definition.def);
|
|
77
|
-
const arity = manager.funcDecls[definition.decl].domain.length;
|
|
78
|
-
const oldInterp = model.funcInterps.get(definition.decl);
|
|
79
|
-
const old = arity === 0 ? model.constInterps.get(definition.decl) : oldInterp?.elseExpr;
|
|
80
|
-
if (old !== value) {
|
|
81
|
-
if (arity === 0) model.registerConst(definition.decl, value);
|
|
82
|
-
else {
|
|
83
|
-
const interp = new FuncInterp(manager, arity);
|
|
84
|
-
interp.setElse(value);
|
|
85
|
-
model.registerFunc(definition.decl, interp);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
manager.decRef(value);
|
|
89
|
-
if (old === value || (arity === 0 ? old === undefined : oldInterp === undefined)) continue;
|
|
90
|
-
evaluator.release();
|
|
91
|
-
evaluator = new ModelEvaluator(manager, model);
|
|
92
|
-
evaluator.setModelCompletion(true);
|
|
93
|
-
}
|
|
94
|
-
evaluator.release();
|
|
95
|
-
return model;
|
|
96
|
-
};
|
|
97
|
-
|
|
98
66
|
export interface Engine {
|
|
99
67
|
query(query: number): number;
|
|
100
68
|
getModel(): ProtoModel;
|
|
@@ -110,7 +78,7 @@ export class DatalogContext {
|
|
|
110
78
|
private isBindingVariables = true;
|
|
111
79
|
ruleSet: RuleSet;
|
|
112
80
|
private ruleFmls: number[] = [];
|
|
113
|
-
private ruleNames: string[] = [];
|
|
81
|
+
private ruleNames: (string | undefined)[] = [];
|
|
114
82
|
private ruleFmlsHead = 0;
|
|
115
83
|
readonly background: number[] = [];
|
|
116
84
|
private isClosed = false;
|
|
@@ -119,6 +87,7 @@ export class DatalogContext {
|
|
|
119
87
|
readonly rewriter: Rewriter;
|
|
120
88
|
// m_mc: the converters since the last query, or undefined before one.
|
|
121
89
|
modelConverters: ModelConverter[] | undefined;
|
|
90
|
+
isBounded = false;
|
|
122
91
|
|
|
123
92
|
constructor(
|
|
124
93
|
readonly manager: AstManager,
|
|
@@ -178,7 +147,7 @@ export class DatalogContext {
|
|
|
178
147
|
return result;
|
|
179
148
|
}
|
|
180
149
|
|
|
181
|
-
addRule(fml: number, name
|
|
150
|
+
addRule(fml: number, name?: string) {
|
|
182
151
|
this.manager.incRef(fml);
|
|
183
152
|
this.ruleFmls.push(fml);
|
|
184
153
|
this.ruleNames.push(name);
|
|
@@ -214,7 +183,13 @@ export class DatalogContext {
|
|
|
214
183
|
const properties = this.ruleProperties;
|
|
215
184
|
switch (this.getEngine()) {
|
|
216
185
|
case ENGINE_DATALOG:
|
|
217
|
-
|
|
186
|
+
properties.collect(rules);
|
|
187
|
+
properties.checkQuantifierFree();
|
|
188
|
+
properties.checkUninterpretedFree();
|
|
189
|
+
properties.checkNestedFree();
|
|
190
|
+
properties.checkInfiniteSorts();
|
|
191
|
+
properties.checkBackgroundFree();
|
|
192
|
+
break;
|
|
218
193
|
case ENGINE_SPACER:
|
|
219
194
|
properties.collect(rules);
|
|
220
195
|
properties.checkExistentialTail();
|
|
@@ -330,6 +305,7 @@ export class DatalogContext {
|
|
|
330
305
|
|
|
331
306
|
query(query: number) {
|
|
332
307
|
this.modelConverters = [];
|
|
308
|
+
this.isBounded = false;
|
|
333
309
|
this.getEngine(query);
|
|
334
310
|
this.flushAddRules();
|
|
335
311
|
return this.ensureEngine(query).query(query);
|
|
@@ -364,7 +340,7 @@ export class DatalogContext {
|
|
|
364
340
|
: mkExists(
|
|
365
341
|
manager,
|
|
366
342
|
[...domain].reverse(),
|
|
367
|
-
domain.map((
|
|
343
|
+
domain.map((_value, index) => String(index)).reverse(),
|
|
368
344
|
atom,
|
|
369
345
|
);
|
|
370
346
|
manager.incRef(query);
|
|
@@ -397,7 +373,7 @@ export class DatalogContext {
|
|
|
397
373
|
...conjs.items.map((conj) => this.ruleManager.ensureApp(conj)),
|
|
398
374
|
];
|
|
399
375
|
const isNegated = tail.map(
|
|
400
|
-
(
|
|
376
|
+
(_value, index) => index < rule.uninterpretedSize && rule.isNegated[index],
|
|
401
377
|
);
|
|
402
378
|
const reduced = this.ruleManager.mk(rule.head, tail, isNegated, rule.name);
|
|
403
379
|
conjs.reset();
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_bit_blast.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, FAMILY_USER, getSymbolName, OP_MKBV, SORT_BOOL } from "../ast";
|
|
3
2
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
4
3
|
import { type Rewrite, RewriterTpl } from "../rewriter-tpl";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_coi_filter.cpp, src/muz/dataflow/dataflow.h,
|
|
2
|
-
// src/muz/dataflow/reachability.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { ObjHashtable, ObjMap } from "../hashtable";
|
|
4
2
|
import type { DatalogContext } from "./dl-context";
|
|
5
3
|
import type { Rule } from "./dl-rule";
|
|
@@ -93,7 +91,7 @@ export class MkCoiFilter implements RuleTransformerPlugin {
|
|
|
93
91
|
newTail.push(rule.tail[index]);
|
|
94
92
|
newNegated.push(false);
|
|
95
93
|
}
|
|
96
|
-
result.addRule(this.context.ruleManager.mk(rule.head, newTail, newNegated,
|
|
94
|
+
result.addRule(this.context.ruleManager.mk(rule.head, newTail, newNegated, undefined, false));
|
|
97
95
|
}
|
|
98
96
|
if (result.rules.length === source.rules.length) return undefined;
|
|
99
97
|
result.close();
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/muz/transforms/dl_mk_elim_term_ite.cpp,
|
|
2
|
-
// src/ast/simplifiers/blast_term_ite_simplifier.h), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtUnsupportedError } from "../../../../errors";
|
|
4
2
|
import { type AstManager, KIND_APP, KIND_QUANTIFIER, OP_ITE, SORT_BOOL } from "../ast";
|
|
5
3
|
import { flattenAndVector, getNumExprs } from "../ast-util";
|