tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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 +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- 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 +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- 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 +9 -8
- 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/pragma.ts +2 -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/subexpression.ts +1 -4
- 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 +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- 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 +1 -3
- 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/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -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 +1 -8
- 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 +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- 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 +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- 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 +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- 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 +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- 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 +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- 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 +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- 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 +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- 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 +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- 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 +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- 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 +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- 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 +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- 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 +41 -3
- 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 +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- 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 +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -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 +144 -108
- 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 +50 -19
- 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 +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- 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 +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- 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 +379 -217
- 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 +118 -105
- 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 +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- 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 +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- 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 +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- 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 +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- 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 +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- 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 +46 -79
- 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 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- 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 +12 -13
- 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 +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -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 +36 -30
- package/src/sany/generator-proofs.ts +5 -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 +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
package/src/prover/smt/data.ts
CHANGED
|
@@ -46,6 +46,7 @@ import {
|
|
|
46
46
|
UNION,
|
|
47
47
|
} from "./format";
|
|
48
48
|
import { getUntypedSpec } from "./arithmetic";
|
|
49
|
+
import type { SmtEncoding } from "./rewrite";
|
|
49
50
|
import { axiom, type Axiom } from "./table";
|
|
50
51
|
import { getTypeKey, getTypeName, IDV, type Type } from "./types";
|
|
51
52
|
|
|
@@ -58,12 +59,11 @@ export interface SymbolSpec {
|
|
|
58
59
|
}
|
|
59
60
|
|
|
60
61
|
export interface CollectState {
|
|
61
|
-
|
|
62
|
-
isSetExtensional: boolean;
|
|
62
|
+
encoding: SmtEncoding;
|
|
63
63
|
recordFields: Map<string, string[]>;
|
|
64
64
|
setTypes: Map<string, Type>;
|
|
65
65
|
strings: string[];
|
|
66
|
-
integers:
|
|
66
|
+
integers: string[];
|
|
67
67
|
isFunConstr: boolean;
|
|
68
68
|
isFunSet: boolean;
|
|
69
69
|
isExcept: boolean;
|
|
@@ -434,7 +434,8 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
434
434
|
axiom("SetOfIntro", [count], undefined),
|
|
435
435
|
axiom("SetOfElim", [count], undefined),
|
|
436
436
|
];
|
|
437
|
-
if (!state.isSetExtensional)
|
|
437
|
+
if (!state.encoding.isSetExtensional)
|
|
438
|
+
return createSpec(getOmittedDeclaration(name), ["Mem"], axioms);
|
|
438
439
|
return createSpec(
|
|
439
440
|
getOmittedDeclaration(name),
|
|
440
441
|
["Mem", "IsSetOf"],
|
|
@@ -466,23 +467,27 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
466
467
|
}
|
|
467
468
|
const integer = /^IntLit_(\d+)$/.exec(name);
|
|
468
469
|
if (integer) {
|
|
469
|
-
const value =
|
|
470
|
+
const value = integer[1];
|
|
470
471
|
const distinct = state.integers.map((other) =>
|
|
471
|
-
axiom(
|
|
472
|
+
axiom(
|
|
473
|
+
"IntLitDistinct",
|
|
474
|
+
[BigInt(other), BigInt(value)],
|
|
475
|
+
`(distinct ${tla(`IntLit_${other}`)} ${symbol})`,
|
|
476
|
+
),
|
|
472
477
|
);
|
|
473
478
|
state.integers.push(value);
|
|
474
479
|
const zero = tla("IntLit_0");
|
|
475
|
-
const isPositivityNeeded = value === 0 && !state.isArithmetic;
|
|
480
|
+
const isPositivityNeeded = value === "0" && !state.encoding.isArithmetic;
|
|
476
481
|
return declareSpec(
|
|
477
482
|
name,
|
|
478
483
|
0,
|
|
479
484
|
["Mem", "IntSet", "IntLit_0", "IntLteq", ...(isPositivityNeeded ? ["IntLit_1"] : [])],
|
|
480
485
|
[
|
|
481
|
-
axiom("IntLitIsint", [value], `(${MEM} ${symbol} ${INT_SET})`),
|
|
486
|
+
axiom("IntLitIsint", [BigInt(value)], `(${MEM} ${symbol} ${INT_SET})`),
|
|
482
487
|
axiom(
|
|
483
488
|
"IntLitZeroCmp",
|
|
484
|
-
[value],
|
|
485
|
-
value === 0 ? `(${INT_LTEQ} ${symbol} ${zero})` : `(${INT_LTEQ} ${zero} ${symbol})`,
|
|
489
|
+
[BigInt(value)],
|
|
490
|
+
value === "0" ? `(${INT_LTEQ} ${symbol} ${zero})` : `(${INT_LTEQ} ${zero} ${symbol})`,
|
|
486
491
|
),
|
|
487
492
|
...distinct,
|
|
488
493
|
...(isPositivityNeeded
|
|
@@ -501,7 +506,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
501
506
|
if (tuple) {
|
|
502
507
|
const count = Number(tuple[1]);
|
|
503
508
|
state.tuples.push(count);
|
|
504
|
-
const indexes = state.isArithmetic
|
|
509
|
+
const indexes = state.encoding.isArithmetic
|
|
505
510
|
? ["Cast_Int"]
|
|
506
511
|
: count === 0
|
|
507
512
|
? ["IntLit_0"]
|
|
@@ -514,7 +519,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
514
519
|
name,
|
|
515
520
|
count,
|
|
516
521
|
deps,
|
|
517
|
-
getTupleAxioms(count, state.isExcept, state.isArithmetic),
|
|
522
|
+
getTupleAxioms(count, state.isExcept, state.encoding.isArithmetic),
|
|
518
523
|
);
|
|
519
524
|
}
|
|
520
525
|
const product = /^Product_(\d+)$/.exec(name);
|
|
@@ -527,14 +532,14 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
527
532
|
"Mem",
|
|
528
533
|
`Tuple_${count}`,
|
|
529
534
|
"FunApp",
|
|
530
|
-
...(state.isArithmetic ? ["Cast_Int", "Proj_Int"] : getLiteralNames(count)),
|
|
535
|
+
...(state.encoding.isArithmetic ? ["Cast_Int", "Proj_Int"] : getLiteralNames(count)),
|
|
531
536
|
],
|
|
532
537
|
getComponentSet(
|
|
533
538
|
"Product",
|
|
534
539
|
[count],
|
|
535
540
|
symbol,
|
|
536
541
|
tla(`Tuple_${count}`),
|
|
537
|
-
getIntegers(count, state.isArithmetic),
|
|
542
|
+
getIntegers(count, state.encoding.isArithmetic),
|
|
538
543
|
"t",
|
|
539
544
|
),
|
|
540
545
|
);
|
|
@@ -590,7 +595,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
590
595
|
}
|
|
591
596
|
const anonymous = state.anonymous.get(name);
|
|
592
597
|
if (anonymous !== undefined) return declareSpec(name, anonymous, [], []);
|
|
593
|
-
const untyped = state.isArithmetic ? undefined : getUntypedSpec(name);
|
|
598
|
+
const untyped = state.encoding.isArithmetic ? undefined : getUntypedSpec(name);
|
|
594
599
|
if (untyped) return untyped;
|
|
595
600
|
const known = STATIC_SPECS.get(name);
|
|
596
601
|
if (known) return known;
|
|
@@ -617,7 +622,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
617
622
|
"IntSet",
|
|
618
623
|
"NatSet",
|
|
619
624
|
"Tuple_0",
|
|
620
|
-
state.isArithmetic ? "Proj_Int" : "IntLteq",
|
|
625
|
+
state.encoding.isArithmetic ? "Proj_Int" : "IntLteq",
|
|
621
626
|
],
|
|
622
627
|
[
|
|
623
628
|
axiom("SeqSelectseqTyping", [], undefined),
|
|
@@ -628,48 +633,49 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
628
633
|
],
|
|
629
634
|
);
|
|
630
635
|
case "Mem":
|
|
631
|
-
if (!state.isSetExtensional) return declareSpec(name, 2, [], [], "Bool");
|
|
632
636
|
return declareSpec(
|
|
633
|
-
|
|
637
|
+
name,
|
|
634
638
|
2,
|
|
635
|
-
["SetExtTrigger"],
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
639
|
+
state.encoding.isSetExtensional ? ["SetExtTrigger"] : [],
|
|
640
|
+
state.encoding.isSetExtensional
|
|
641
|
+
? [
|
|
642
|
+
axiom(
|
|
643
|
+
"SetExt",
|
|
644
|
+
[],
|
|
645
|
+
`(forall ((x Idv) (y Idv)) (! (=> (forall ((z Idv)) (= (${MEM} z x) (${MEM} z y))) (= x y)) :pattern ((${SET_EXT_TRIGGER} x y))))`,
|
|
646
|
+
),
|
|
647
|
+
]
|
|
648
|
+
: [],
|
|
643
649
|
"Bool",
|
|
644
650
|
);
|
|
645
651
|
case "Cap":
|
|
646
|
-
if (!state.isSetExtensional)
|
|
647
|
-
return declareSpec(
|
|
648
|
-
name,
|
|
649
|
-
2,
|
|
650
|
-
["Mem"],
|
|
651
|
-
[getSetOperationDef("Cap", `(and (${MEM} x a) (${MEM} x b))`)],
|
|
652
|
-
);
|
|
653
652
|
return declareSpec(
|
|
654
|
-
|
|
653
|
+
name,
|
|
655
654
|
2,
|
|
656
|
-
["Mem", "SetEnum_0", "SetExtTrigger"],
|
|
655
|
+
["Mem", ...(state.encoding.isSetExtensional ? ["SetEnum_0", "SetExtTrigger"] : [])],
|
|
657
656
|
[
|
|
658
657
|
getSetOperationDef("Cap", `(and (${MEM} x a) (${MEM} x b))`),
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
658
|
+
...(state.encoding.isSetExtensional
|
|
659
|
+
? [
|
|
660
|
+
axiom(
|
|
661
|
+
"DisjointTrigger",
|
|
662
|
+
[],
|
|
663
|
+
`(forall ((x Idv) (y Idv)) (! (${SET_EXT_TRIGGER} (${CAP} x y) ${tla("SetEnum_0")}) :pattern ((${CAP} x y))))`,
|
|
664
|
+
),
|
|
665
|
+
]
|
|
666
|
+
: []),
|
|
664
667
|
],
|
|
665
668
|
);
|
|
666
669
|
case "SetSt":
|
|
667
|
-
if (!state.isSetExtensional)
|
|
668
|
-
return createSpec(getOmittedDeclaration(name), ["Mem"], [axiom("SetStDef", [], undefined)]);
|
|
669
670
|
return createSpec(
|
|
670
671
|
getOmittedDeclaration(name),
|
|
671
|
-
["Mem", "SetEnum_0", "SetExtTrigger"],
|
|
672
|
-
[
|
|
672
|
+
["Mem", ...(state.encoding.isSetExtensional ? ["SetEnum_0", "SetExtTrigger"] : [])],
|
|
673
|
+
[
|
|
674
|
+
axiom("SetStDef", [], undefined),
|
|
675
|
+
...(state.encoding.isSetExtensional
|
|
676
|
+
? [axiom("EmptyComprehensionTrigger", [], undefined)]
|
|
677
|
+
: []),
|
|
678
|
+
],
|
|
673
679
|
);
|
|
674
680
|
case "FunSet":
|
|
675
681
|
state.isFunSet = true;
|
|
@@ -734,7 +740,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
734
740
|
[],
|
|
735
741
|
`(forall ((f Idv) (x Idv) (y Idv) (z Idv)) (! (=> (${MEM} z (${FUN_DOM} f)) (and (=> (= z x) (= (${FUN_APP} ${updated} z) y)) (=> (distinct z x) (= (${FUN_APP} ${updated} z) (${FUN_APP} f z))))) :pattern ((${FUN_APP} ${updated} z)) :pattern (${updated} (${FUN_APP} f z))))`,
|
|
736
742
|
),
|
|
737
|
-
...state.tuples.flatMap((count) => getTupleExcepts(count, state.isArithmetic)),
|
|
743
|
+
...state.tuples.flatMap((count) => getTupleExcepts(count, state.encoding.isArithmetic)),
|
|
738
744
|
...state.records.flatMap(getRecordExcepts),
|
|
739
745
|
],
|
|
740
746
|
);
|
package/src/prover/smt/encode.ts
CHANGED
|
@@ -82,8 +82,7 @@ const sortRecordFields = (expression: Expr): Expr =>
|
|
|
82
82
|
|
|
83
83
|
const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
84
84
|
const state: CollectState = {
|
|
85
|
-
|
|
86
|
-
isSetExtensional: encoder.encoding.isSetExtensional,
|
|
85
|
+
encoding: encoder.encoding,
|
|
87
86
|
recordFields: encoder.recordFields,
|
|
88
87
|
setTypes: encoder.setTypes,
|
|
89
88
|
strings: [],
|
|
@@ -296,7 +296,7 @@ const invert = (mode: Mode): Mode => ({
|
|
|
296
296
|
: "Neither",
|
|
297
297
|
});
|
|
298
298
|
|
|
299
|
-
|
|
299
|
+
const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
|
|
300
300
|
toIdv(encode(encoder, expression, env, clearPolarity(mode)));
|
|
301
301
|
|
|
302
302
|
export const encodeBool = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
|
|
@@ -917,12 +917,7 @@ const encodeSequent = (
|
|
|
917
917
|
);
|
|
918
918
|
};
|
|
919
919
|
|
|
920
|
-
|
|
921
|
-
encoder: Encoder,
|
|
922
|
-
expression: Expr,
|
|
923
|
-
env: Env | undefined,
|
|
924
|
-
mode: Mode,
|
|
925
|
-
): Term => {
|
|
920
|
+
const encode = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode): Term => {
|
|
926
921
|
switch (expression.kind) {
|
|
927
922
|
case "Ix":
|
|
928
923
|
return encodeReference(encoder, getBinding(env, expression.index), [], env, mode);
|
|
@@ -1093,6 +1088,7 @@ export const encode = (
|
|
|
1093
1088
|
return wrapIdv(tla(`StrLit_${expression.value}`), getTypedOnly(encoder, STRING));
|
|
1094
1089
|
case "Num":
|
|
1095
1090
|
if (expression.fraction !== "") throw new TlaUnsupportedError("a real number");
|
|
1091
|
+
// Deviation from tlapm: its int_of_string fails the obligation for a literal above 2^62 - 1.
|
|
1096
1092
|
// Type.Synthesize gives a number no type when arithmetic is off.
|
|
1097
1093
|
if (!encoder.encoding.isArithmetic)
|
|
1098
1094
|
return wrapIdv(tla(`IntLit_${BigInt(expression.integer)}`));
|
|
@@ -307,7 +307,7 @@ const getMembership = (polarity: Polarity, element: Expr, set: Expr): Expr | und
|
|
|
307
307
|
items: [
|
|
308
308
|
builtin("Eq", [
|
|
309
309
|
left,
|
|
310
|
-
{ kind: "Tuple", elements: factors.map((
|
|
310
|
+
{ kind: "Tuple", elements: factors.map((_value, index) => component(index)) },
|
|
311
311
|
]),
|
|
312
312
|
...factors.map((factor, index) => mem(component(index), factor)),
|
|
313
313
|
],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ackermannization/ackermannize_bv_tactic.cpp,
|
|
2
|
-
// src/tactic/smtlogics/qfufbv_tactic.cpp), MIT license, see z3-license.txt.
|
|
3
1
|
import { SmtTacticError } from "../../../errors";
|
|
4
2
|
import type { AstManager } from "./ast";
|
|
5
3
|
import { convertAckrModel } from "./ackr-model-converter";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ackermannization/ackr_model_converter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { type AstManager, OP_CONST_ARRAY, OP_SELECT, OP_STORE } from "./ast";
|
|
3
2
|
import type { AckrInfo } from "./ackr-helper";
|
|
4
3
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
@@ -70,13 +69,7 @@ const addEntry = (
|
|
|
70
69
|
|
|
71
70
|
const convert = (info: AckrInfo, source: ProtoModel, target: ProtoModel) => {
|
|
72
71
|
const manager = source.manager;
|
|
73
|
-
for (const entry of source.funcInterps)
|
|
74
|
-
const copied = new FuncInterp(manager, entry[1].arity);
|
|
75
|
-
for (const funcEntry of entry[1].entries)
|
|
76
|
-
copied.insertNewEntry(funcEntry.args, funcEntry.result);
|
|
77
|
-
if (entry[1].elseExpr !== null) copied.setElse(entry[1].elseExpr);
|
|
78
|
-
target.registerFunc(entry[0], copied);
|
|
79
|
-
}
|
|
72
|
+
for (const entry of source.funcInterps) target.registerFunc(entry[0], entry[1].copy());
|
|
80
73
|
for (const sort of source.getUninterpretedSorts())
|
|
81
74
|
for (const value of source.getKnownUniverse(sort)) target.registerValue(value);
|
|
82
75
|
const interpretations = new ObjMap<FuncInterp>((decl) => manager.getDeclHash(decl));
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
|
|
1
|
+
import { SmtTacticError } from "../../../errors";
|
|
3
2
|
import type { AstManager } from "./ast";
|
|
4
3
|
import { AigManager } from "./aig";
|
|
5
4
|
import { getNumExprs } from "./ast-util";
|
|
@@ -7,32 +6,42 @@ import type { Goal } from "./goal";
|
|
|
7
6
|
import { RefVector } from "./ref-vector";
|
|
8
7
|
import type { Tactic } from "./tactic";
|
|
9
8
|
|
|
10
|
-
// Z3 rewrites each formula with a dependency on its own, but the goal does not track dependencies,
|
|
11
|
-
// which only named assertions under unsat cores have.
|
|
12
9
|
export const createAigTactic =
|
|
13
10
|
(manager: AstManager): Tactic =>
|
|
14
11
|
(goal: Goal) => {
|
|
15
12
|
if (goal.isProofsEnabled) throw new SmtTacticError("aig does not support proof production");
|
|
16
|
-
if (goal.isCoresEnabled) throw new SmtUnsupportedError("aig with unsat cores");
|
|
17
13
|
const aigs = new AigManager(manager);
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
forms.push(goal.forms.items[index]);
|
|
21
|
-
goal.update(index, manager.trueExpr);
|
|
22
|
-
}
|
|
23
|
-
if (forms.size > 0) {
|
|
24
|
-
const conjunction = manager.mkAnd(forms.items);
|
|
25
|
-
manager.incRef(conjunction);
|
|
26
|
-
const root = aigs.mkAig(conjunction);
|
|
14
|
+
const useSharedFormula = (expr: number, use: (formula: number) => void) => {
|
|
15
|
+
const root = aigs.mkAig(expr);
|
|
27
16
|
aigs.incRef(root);
|
|
28
17
|
const shared = aigs.maxSharing(root);
|
|
29
18
|
aigs.incRef(shared);
|
|
30
19
|
aigs.decRef(root);
|
|
31
20
|
const formula = aigs.toFormula(shared);
|
|
32
|
-
|
|
33
|
-
goal.assert(isSmall ? formula : conjunction);
|
|
21
|
+
use(formula);
|
|
34
22
|
manager.decRef(formula);
|
|
35
23
|
aigs.decRef(shared);
|
|
24
|
+
};
|
|
25
|
+
const forms = new RefVector(manager);
|
|
26
|
+
for (let index = 0; index < goal.forms.size; index++) {
|
|
27
|
+
const form = goal.forms.items[index];
|
|
28
|
+
const dependency = goal.getDependency(index);
|
|
29
|
+
if (dependency === undefined) {
|
|
30
|
+
forms.push(form);
|
|
31
|
+
goal.update(index, manager.trueExpr);
|
|
32
|
+
} else
|
|
33
|
+
useSharedFormula(form, (formula) => {
|
|
34
|
+
if (getNumExprs(manager, formula) <= 1.2 * getNumExprs(manager, form))
|
|
35
|
+
goal.update(index, formula, dependency);
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
if (forms.size > 0) {
|
|
39
|
+
const conjunction = manager.mkAnd(forms.items);
|
|
40
|
+
manager.incRef(conjunction);
|
|
41
|
+
useSharedFormula(conjunction, (formula) => {
|
|
42
|
+
const isSmall = getNumExprs(manager, formula) <= 1.2 * getNumExprs(manager, conjunction);
|
|
43
|
+
goal.assert(isSmall ? formula : conjunction);
|
|
44
|
+
});
|
|
36
45
|
manager.decRef(conjunction);
|
|
37
46
|
}
|
|
38
47
|
goal.elimTrue();
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
// 2 * node, plus 1 when inverted.
|
|
1
|
+
// A node is 2 * id for a variable and 2 * (id - FIRST_NODE_ID) + 1 for an and, and a literal is 2 *
|
|
2
|
+
// node, plus 1 when inverted.
|
|
4
3
|
import { SmtTacticError } from "../../../errors";
|
|
5
4
|
import {
|
|
6
5
|
type AstManager,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/arith_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_ARITH,
|
|
4
3
|
KIND_APP,
|
|
@@ -905,12 +904,10 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
905
904
|
else if (manager.getOp(child) === OP_TO_REAL) intArgs.push(manager.getArg(child, 0));
|
|
906
905
|
else realArgs.push(child);
|
|
907
906
|
}
|
|
908
|
-
|
|
909
|
-
args.length === 1 ? args[0] : manager.mkApp(op, args, sort);
|
|
910
|
-
if (realArgs.length === 0) return this.reduce(mkSum(intArgs, SORT_INT), 1);
|
|
907
|
+
if (realArgs.length === 0) return this.reduce(manager.mkApp(op, intArgs, SORT_INT), 1);
|
|
911
908
|
if (intArgs.length === 0 || op !== OP_ADD) return undefined;
|
|
912
|
-
const intSum =
|
|
913
|
-
const realSum =
|
|
909
|
+
const intSum = manager.mkApp(OP_ADD, intArgs, SORT_INT);
|
|
910
|
+
const realSum = manager.mkApp(OP_ADD, realArgs, SORT_REAL);
|
|
914
911
|
return this.reduce(
|
|
915
912
|
manager.mkApp(OP_ADD, [intSum, manager.mkApp(OP_TO_INT, [realSum], SORT_INT)], SORT_INT),
|
|
916
913
|
3,
|
|
@@ -1015,7 +1012,7 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
1015
1012
|
if (op !== OP_POWER) return false;
|
|
1016
1013
|
const base = manager.getArg(expr, 0);
|
|
1017
1014
|
const exponent = manager.getArg(expr, 1);
|
|
1018
|
-
if (manager.isNumeral(exponent)) {
|
|
1015
|
+
if (manager.isNumeral(exponent) && manager.isInt(exponent)) {
|
|
1019
1016
|
const value = this.getValue(exponent);
|
|
1020
1017
|
if (value.isInt() && value.num >= 0n && value.num < 2n ** 32n && value.num % 2n === 0n)
|
|
1021
1018
|
return true;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/array_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtUnsupportedError } from "../../../errors";
|
|
3
2
|
import { mkArrayApp } from "./array-decl-plugin";
|
|
4
3
|
import {
|
|
@@ -15,12 +14,10 @@ import {
|
|
|
15
14
|
SORT_BOOL,
|
|
16
15
|
} from "./ast";
|
|
17
16
|
import { isAstLess } from "./ast-lt";
|
|
17
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
18
18
|
import { InvVarShifter, type Rewrite, VarShifter } from "./rewriter-tpl";
|
|
19
19
|
import { getFreeVarSorts, VarSubst } from "./var-subst";
|
|
20
20
|
|
|
21
|
-
const L_TRUE = 1;
|
|
22
|
-
const L_FALSE = -1;
|
|
23
|
-
const L_UNDEF = 0;
|
|
24
21
|
const MAX_SQUASH_ROUNDS = 10;
|
|
25
22
|
|
|
26
23
|
export class ArrayRewriter {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
2
|
import {
|
|
4
3
|
AstManager,
|
|
@@ -69,6 +68,43 @@ export class PatternInferenceRw extends RewriterTpl {
|
|
|
69
68
|
}
|
|
70
69
|
}
|
|
71
70
|
|
|
71
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
72
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
73
|
+
readonly definitions: RefVector;
|
|
74
|
+
private lims: number[] = [];
|
|
75
|
+
|
|
76
|
+
constructor(
|
|
77
|
+
manager: AstManager,
|
|
78
|
+
private names: DefinedNames,
|
|
79
|
+
) {
|
|
80
|
+
super(manager);
|
|
81
|
+
this.definitions = new RefVector(manager);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
85
|
+
const manager = this.manager;
|
|
86
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
87
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
88
|
+
manager.incRef(ite);
|
|
89
|
+
const named = this.names.mkName(ite);
|
|
90
|
+
manager.decRef(ite);
|
|
91
|
+
if (named.definition === -1) return -1;
|
|
92
|
+
this.definitions.push(named.definition);
|
|
93
|
+
manager.decRef(named.definition);
|
|
94
|
+
manager.incRef(named.name);
|
|
95
|
+
return named.name;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
push() {
|
|
99
|
+
this.lims.push(this.definitions.size);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
pop() {
|
|
103
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
104
|
+
this.lims.pop();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
72
108
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
73
109
|
if (left === right) return false;
|
|
74
110
|
const isLeftValue = manager.isValue(left);
|
|
@@ -125,7 +161,7 @@ class Substitution {
|
|
|
125
161
|
|
|
126
162
|
update(expr: number) {
|
|
127
163
|
const manager = this.manager;
|
|
128
|
-
if (manager.
|
|
164
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
129
165
|
const left = manager.getArg(expr, 0);
|
|
130
166
|
const right = manager.getArg(expr, 1);
|
|
131
167
|
if (isGreater(manager, left, right)) {
|
|
@@ -157,7 +193,9 @@ export class AssertedFormulas {
|
|
|
157
193
|
private isReducePending = true;
|
|
158
194
|
private isNnfCnf = true;
|
|
159
195
|
private isEq2Ineq = false;
|
|
196
|
+
private isEliminatingTermIte = false;
|
|
160
197
|
private names: DefinedNames;
|
|
198
|
+
private termIteElim: ElimTermIteRw;
|
|
161
199
|
private patternInference: PatternInferenceRw;
|
|
162
200
|
private bvSharing: MaxBvSharing;
|
|
163
201
|
hasQuantifiers = false;
|
|
@@ -178,6 +216,7 @@ export class AssertedFormulas {
|
|
|
178
216
|
// string literals reach the seq theory as concatenations of units.
|
|
179
217
|
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
180
218
|
this.names = new DefinedNames(manager);
|
|
219
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
181
220
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
182
221
|
this.bvSharing = new MaxBvSharing(manager);
|
|
183
222
|
}
|
|
@@ -197,6 +236,7 @@ export class AssertedFormulas {
|
|
|
197
236
|
this.bvSharing.popScope();
|
|
198
237
|
this.macros.popScope();
|
|
199
238
|
this.names.pop();
|
|
239
|
+
this.termIteElim.pop();
|
|
200
240
|
this.substitution.pop();
|
|
201
241
|
this.formulas.shrink(scope.numFormulas);
|
|
202
242
|
this.qhead = scope.numFormulas;
|
|
@@ -208,6 +248,7 @@ export class AssertedFormulas {
|
|
|
208
248
|
this.substitution.push();
|
|
209
249
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
210
250
|
this.names.push();
|
|
251
|
+
this.termIteElim.push();
|
|
211
252
|
this.macros.pushScope();
|
|
212
253
|
this.bvSharing.pushScope();
|
|
213
254
|
}
|
|
@@ -233,9 +274,18 @@ export class AssertedFormulas {
|
|
|
233
274
|
setup(config: SmtConfig) {
|
|
234
275
|
this.isNnfCnf = config.isNnfCnf;
|
|
235
276
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
277
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
236
278
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
237
279
|
}
|
|
238
280
|
|
|
281
|
+
updateParams(config: SmtConfig) {
|
|
282
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
283
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
284
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
285
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
286
|
+
this.isReducePending = true;
|
|
287
|
+
}
|
|
288
|
+
|
|
239
289
|
getNumFormulas() {
|
|
240
290
|
return this.formulas.size;
|
|
241
291
|
}
|
|
@@ -250,7 +300,7 @@ export class AssertedFormulas {
|
|
|
250
300
|
if (!this.isInconsistent && (this.hasQuantifiers || this.isPreprocessing)) this.reduceCore();
|
|
251
301
|
if (this.isInconsistent) return [];
|
|
252
302
|
const result = this.formulas.items.slice(this.qhead);
|
|
253
|
-
|
|
303
|
+
this.macros.markForbidden(result);
|
|
254
304
|
for (const formula of result) this.substitution.update(formula);
|
|
255
305
|
this.qhead = this.formulas.size;
|
|
256
306
|
return result;
|
|
@@ -271,6 +321,10 @@ export class AssertedFormulas {
|
|
|
271
321
|
this.setEliminateAnd(true);
|
|
272
322
|
this.reduceAsserted();
|
|
273
323
|
if (this.isInconsistent) return;
|
|
324
|
+
if (this.isEliminatingTermIte) {
|
|
325
|
+
this.elimTermIte();
|
|
326
|
+
if (this.isInconsistent) return;
|
|
327
|
+
}
|
|
274
328
|
if (this.hasQuantifiers && this.simplifyFormulas((formula) => this.refineInjAxiom(formula)))
|
|
275
329
|
this.isReducePending = true;
|
|
276
330
|
if (this.isInconsistent) return;
|
|
@@ -331,6 +385,16 @@ export class AssertedFormulas {
|
|
|
331
385
|
return formula;
|
|
332
386
|
}
|
|
333
387
|
|
|
388
|
+
private elimTermIte() {
|
|
389
|
+
const elim = this.termIteElim;
|
|
390
|
+
if (this.simplifyFormulas((formula) => elim.rewrite(formula))) this.isReducePending = true;
|
|
391
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
392
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
393
|
+
this.flushCache();
|
|
394
|
+
this.reduceAsserted();
|
|
395
|
+
elim.reset();
|
|
396
|
+
}
|
|
397
|
+
|
|
334
398
|
private findMacros() {
|
|
335
399
|
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
336
400
|
this.isReducePending = true;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
FAMILY_ARRAY,
|
|
4
3
|
FAMILY_BV,
|
|
@@ -43,7 +42,7 @@ const PARAM_INT = 0;
|
|
|
43
42
|
const PARAM_AST = 1;
|
|
44
43
|
const PARAM_SYMBOL = 2;
|
|
45
44
|
const PARAM_ZSTRING = 3;
|
|
46
|
-
const PARAM_RATIONAL =
|
|
45
|
+
const PARAM_RATIONAL = 4;
|
|
47
46
|
const PARAM_EXTERNAL = 6;
|
|
48
47
|
|
|
49
48
|
const compareValues = (first: number, second: number) =>
|
|
@@ -251,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
|
|
|
251
250
|
return compareSorts(manager, firstKey.range, secondKey.range);
|
|
252
251
|
};
|
|
253
252
|
|
|
254
|
-
|
|
253
|
+
const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
255
254
|
if (first === second) return 0;
|
|
256
255
|
const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
|
|
257
256
|
if (byKind !== 0) return byKind;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_util.cpp, src/ast/for_each_expr.cpp, src/ast/arith_decl_plugin.cpp),
|
|
2
|
-
// MIT license, see z3-license.txt.
|
|
3
1
|
import {
|
|
4
2
|
KIND_APP,
|
|
5
3
|
KIND_QUANTIFIER,
|
|
@@ -118,6 +116,8 @@ export const pushNotOwned = (manager: AstManager, expr: number): number => {
|
|
|
118
116
|
|
|
119
117
|
const ASSOCIATIVE_OPS = new Set([OP_AND, OP_OR, OP_XOR, OP_ADD, OP_MUL, OP_SEQ_CONCAT]);
|
|
120
118
|
|
|
119
|
+
export const isAssociativeOp = (op: number) => ASSOCIATIVE_OPS.has(op) || isAssociativeBvOp(op);
|
|
120
|
+
|
|
121
121
|
// Like Z3, marks only the expressions with several references, and counts an associative
|
|
122
122
|
// application of n arguments as n - 1 binary ones.
|
|
123
123
|
export const getNumExprs = (manager: AstManager, root: number) => {
|
|
@@ -145,7 +145,7 @@ export const getNumExprs = (manager: AstManager, root: number) => {
|
|
|
145
145
|
}
|
|
146
146
|
const op = manager.getOp(expr);
|
|
147
147
|
const numArgs = manager.getNumArgs(expr);
|
|
148
|
-
count +=
|
|
148
|
+
count += isAssociativeOp(op) ? numArgs - 1 : 1;
|
|
149
149
|
for (let index = 0; index < numArgs; index++) {
|
|
150
150
|
const arg = manager.getArg(expr, index);
|
|
151
151
|
if (isUnvisited(arg)) todo.push(arg);
|
|
@@ -158,8 +158,7 @@ export const getExtendedNumeral = (manager: AstManager, expr: number) => {
|
|
|
158
158
|
if (manager.isNumeral(expr)) return manager.getRationalValue(expr);
|
|
159
159
|
const todo = [{ term: expr, isVisited: false, isNegated: false }];
|
|
160
160
|
const values: Rational[] = [];
|
|
161
|
-
|
|
162
|
-
const frame = todo.pop()!;
|
|
161
|
+
for (let frame = todo.pop(); frame !== undefined; frame = todo.pop()) {
|
|
163
162
|
if (frame.isVisited) {
|
|
164
163
|
const op = manager.getOp(frame.term);
|
|
165
164
|
const numArgs = manager.getNumArgs(frame.term);
|