tla-ts 0.0.8 → 0.0.9-dev.0493be549
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -0
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +98 -19
- package/dist/index.d.ts +98 -19
- 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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +128 -106
- package/dist/transfer.js +128 -106
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +605 -311
- package/src/cli/options.ts +12 -6
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -0
- package/src/cli/tlc.ts +545 -218
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -69
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +314 -24
- package/src/dfid.ts +618 -0
- package/src/environment.ts +263 -129
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +734 -980
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +150 -70
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +122 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +31 -38
- package/src/parallel.ts +41 -17
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +128 -176
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +31 -29
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +536 -180
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +167 -49
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +269 -85
- package/src/symmetry.ts +59 -147
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +226 -151
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +56 -82
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +564 -212
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +910 -318
- package/src/worker.ts +7 -8
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/arith_rewriter.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// linear arithmetic and nonlinear factoring are ported, without powers, algebraic numbers or
|
|
3
|
-
// hoisting, which tlapm's encoding does not produce.
|
|
1
|
+
// Ported from Z3 (src/ast/rewriter/arith_rewriter.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
3
|
OP_ADD,
|
|
6
4
|
OP_GE,
|
|
@@ -23,7 +21,6 @@ import { type ArithRewriterOptions, PolyRewriter } from "./poly-rewriter";
|
|
|
23
21
|
import type { Rewrite } from "./rewriter-tpl";
|
|
24
22
|
import { shrink } from "./array";
|
|
25
23
|
|
|
26
|
-
// The parameters that asserted_formulas gives the kernel's rewriter, which also simplifies instances.
|
|
27
24
|
export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
28
25
|
isSom: true,
|
|
29
26
|
isSortSums: true,
|
|
@@ -31,7 +28,6 @@ export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
|
31
28
|
isGcdRounding: true,
|
|
32
29
|
};
|
|
33
30
|
|
|
34
|
-
// The defaults, which the simplify tactic uses.
|
|
35
31
|
export const TACTIC_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
36
32
|
isSom: false,
|
|
37
33
|
isSortSums: false,
|
|
@@ -39,16 +35,13 @@ export const TACTIC_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
|
39
35
|
isGcdRounding: false,
|
|
40
36
|
};
|
|
41
37
|
|
|
42
|
-
// The ceiling of the quotient by a positive divisor.
|
|
43
38
|
const getCeilDiv = (dividend: bigint, divisor: bigint) => -getEuclideanDiv(-dividend, divisor);
|
|
44
39
|
|
|
45
|
-
// symmod: the remainder closest to zero, for a positive modulus.
|
|
46
40
|
const getSymmetricMod = (value: bigint, modulus: bigint) => {
|
|
47
41
|
const remainder = getEuclideanMod(value, modulus);
|
|
48
42
|
return 2n * remainder > modulus ? remainder - modulus : remainder;
|
|
49
43
|
};
|
|
50
44
|
|
|
51
|
-
// The running gcd of the coefficients of an atom's sides, and the number of their constants.
|
|
52
45
|
interface GcdState {
|
|
53
46
|
gcd: bigint;
|
|
54
47
|
isFirst: boolean;
|
|
@@ -63,7 +56,6 @@ const getInverse = (kind: number) =>
|
|
|
63
56
|
kind === KIND_LE ? KIND_GE : kind === KIND_GE ? KIND_LE : KIND_EQ;
|
|
64
57
|
|
|
65
58
|
export class ArithRewriter extends PolyRewriter {
|
|
66
|
-
// The buffer of isNonNegative's factors.
|
|
67
59
|
private factors: number[] = [];
|
|
68
60
|
|
|
69
61
|
mkLe(left: number, right: number) {
|
|
@@ -87,7 +79,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
87
79
|
return this.mkLeGeEq(left, right, KIND_EQ);
|
|
88
80
|
}
|
|
89
81
|
|
|
90
|
-
// mk_idiv_core and mk_mod_core: SMT-LIB integer division, whose remainder is non-negative.
|
|
91
82
|
private mkIdivApp(left: number, right: number) {
|
|
92
83
|
return this.manager.mkApp(OP_IDIV, [left, right], SORT_INT);
|
|
93
84
|
}
|
|
@@ -96,7 +87,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
96
87
|
return this.manager.mkApp(OP_MOD, [left, right], SORT_INT);
|
|
97
88
|
}
|
|
98
89
|
|
|
99
|
-
// arith_util's mk_mul, which makes no product of one factor.
|
|
100
90
|
private mkFlatMulApp(args: number[]) {
|
|
101
91
|
return args.length === 1 ? args[0] : this.manager.mkApp(OP_MUL, args, SORT_INT);
|
|
102
92
|
}
|
|
@@ -105,7 +95,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
105
95
|
return this.manager.mkApp(OP_ITE, [condition, thenExpr, elseExpr], SORT_INT);
|
|
106
96
|
}
|
|
107
97
|
|
|
108
|
-
// flat_mul: the factors of nested products, in Z3's order.
|
|
109
98
|
private getFlatMul(expr: number) {
|
|
110
99
|
const args = [expr];
|
|
111
100
|
for (let index = 0; index < args.length; index++) {
|
|
@@ -124,7 +113,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
124
113
|
args.pop();
|
|
125
114
|
}
|
|
126
115
|
|
|
127
|
-
// remove_divisor: div ab ac is div b c when a is positive, and div -b -c when it is negative.
|
|
128
116
|
private removeDivisor(factor: number, dividend: number, divisor: number) {
|
|
129
117
|
const manager = this.manager;
|
|
130
118
|
const dividendArgs = this.getFlatMul(dividend);
|
|
@@ -150,7 +138,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
150
138
|
);
|
|
151
139
|
}
|
|
152
140
|
|
|
153
|
-
// get_divides: div ab ac is div b c, and common numeral factors cancel.
|
|
154
141
|
private getDivides(dividend: number, divisor: number) {
|
|
155
142
|
const manager = this.manager;
|
|
156
143
|
const dividendArgs = this.getFlatMul(dividend);
|
|
@@ -168,8 +155,7 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
168
155
|
}
|
|
169
156
|
for (const arg of divisorArgs) {
|
|
170
157
|
const value = manager.getNumeral(arg);
|
|
171
|
-
//
|
|
172
|
-
// check stores the -1 as the dividend's value.
|
|
158
|
+
// Z3 stores a common factor of -1 as the dividend's value, or (div (* -1 x) (* -1 y)) diverges.
|
|
173
159
|
if (marked.has(arg) && value !== -1n) return this.removeDivisor(arg, dividend, divisor);
|
|
174
160
|
if (marked.has(arg)) dividendValue = -1n;
|
|
175
161
|
if (value === undefined) continue;
|
|
@@ -189,7 +175,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
189
175
|
);
|
|
190
176
|
}
|
|
191
177
|
|
|
192
|
-
// mk_idiv_core.
|
|
193
178
|
mkIdiv(left: number, right: number) {
|
|
194
179
|
const manager = this.manager;
|
|
195
180
|
this.currSort = SORT_INT;
|
|
@@ -234,7 +219,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
234
219
|
);
|
|
235
220
|
}
|
|
236
221
|
|
|
237
|
-
// mk_mod_core.
|
|
238
222
|
mkMod(left: number, right: number) {
|
|
239
223
|
const manager = this.manager;
|
|
240
224
|
this.currSort = SORT_INT;
|
|
@@ -246,7 +230,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
246
230
|
const zero = manager.mkNumeral(0n);
|
|
247
231
|
if (left === right && divisor === undefined)
|
|
248
232
|
return this.mkIntIte(manager.mkEq(right, zero), this.mkModApp(zero, zero), zero);
|
|
249
|
-
// mod is idempotent on a nonzero modulus.
|
|
250
233
|
if (manager.getOp(left) === OP_MOD && manager.getArg(left, 1) === right) {
|
|
251
234
|
if (divisor !== undefined && divisor !== 0n) return left;
|
|
252
235
|
if (divisor === undefined)
|
|
@@ -259,7 +242,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
259
242
|
2,
|
|
260
243
|
);
|
|
261
244
|
}
|
|
262
|
-
// Propagates mod inside a sum or product only if there is something to reduce.
|
|
263
245
|
if (divisor !== undefined && divisor > 0n && (this.isAdd(left) || this.isMul(left))) {
|
|
264
246
|
let isChanged = false;
|
|
265
247
|
const args = manager.mapArgs(left, (arg) => {
|
|
@@ -292,7 +274,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
292
274
|
3,
|
|
293
275
|
);
|
|
294
276
|
}
|
|
295
|
-
// For a symbolic modulus, the summands that are multiples of it go: mod (a + k*y) y = mod a y.
|
|
296
277
|
if (divisor === undefined && this.isAdd(left)) {
|
|
297
278
|
const args: number[] = [];
|
|
298
279
|
for (let index = 0; index < manager.getNumArgs(left); index++) {
|
|
@@ -333,7 +314,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
333
314
|
),
|
|
334
315
|
1,
|
|
335
316
|
);
|
|
336
|
-
// mod x -y = mod x y.
|
|
337
317
|
if (
|
|
338
318
|
this.isMul(right) &&
|
|
339
319
|
manager.getNumArgs(right) === 2 &&
|
|
@@ -369,7 +349,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
369
349
|
);
|
|
370
350
|
}
|
|
371
351
|
|
|
372
|
-
// mk_div_core: division by a numeral other than 0 is a product.
|
|
373
352
|
mkDiv(left: number, right: number) {
|
|
374
353
|
const manager = this.manager;
|
|
375
354
|
this.currSort = manager.sorts[left];
|
|
@@ -382,7 +361,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
382
361
|
);
|
|
383
362
|
}
|
|
384
363
|
|
|
385
|
-
// mk_to_int_core: (to_int (+ 1.0 (to_real x) y)) is (+ 1 x (to_int y)).
|
|
386
364
|
mkToInt(arg: number) {
|
|
387
365
|
const manager = this.manager;
|
|
388
366
|
if (manager.isInt(arg)) return arg;
|
|
@@ -399,7 +377,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
399
377
|
else if (manager.getOp(child) === OP_TO_REAL) intArgs.push(manager.getArg(child, 0));
|
|
400
378
|
else realArgs.push(child);
|
|
401
379
|
}
|
|
402
|
-
// Z3 makes a sum of one argument, which the manager leaves out.
|
|
403
380
|
const mkSum = (args: number[], sort: number) =>
|
|
404
381
|
args.length === 1 ? args[0] : manager.mkApp(op, args, sort);
|
|
405
382
|
if (realArgs.length === 0) return this.reduce(mkSum(intArgs, SORT_INT), 1);
|
|
@@ -412,7 +389,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
412
389
|
);
|
|
413
390
|
}
|
|
414
391
|
|
|
415
|
-
// mk_to_real_core, with push_to_real: to_real distributes over sums and products.
|
|
416
392
|
mkToReal(arg: number) {
|
|
417
393
|
const manager = this.manager;
|
|
418
394
|
if (manager.isNumeral(arg)) return manager.mkRealNumeral(this.getValue(arg));
|
|
@@ -429,8 +405,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
429
405
|
);
|
|
430
406
|
}
|
|
431
407
|
|
|
432
|
-
// mk_is_int: a numeral is decided, and a term built from integers by sums and products is an
|
|
433
|
-
// integer. Any other term x is an integer when (to_real (to_int x)) is x.
|
|
434
408
|
mkIsInt(arg: number) {
|
|
435
409
|
const manager = this.manager;
|
|
436
410
|
if (manager.isNumeral(arg))
|
|
@@ -473,8 +447,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
473
447
|
else result.push(expr);
|
|
474
448
|
}
|
|
475
449
|
|
|
476
|
-
// is_non_negative, without powers and sequences. It counts each factor's occurrences by scanning
|
|
477
|
-
// the factors, which are few, rather than by sorting them.
|
|
478
450
|
private isNonNegative(expr: number) {
|
|
479
451
|
if (!this.isMul(expr)) return false;
|
|
480
452
|
const factors = this.factors;
|
|
@@ -502,13 +474,10 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
502
474
|
else return false;
|
|
503
475
|
}
|
|
504
476
|
if (numOdd === 0) return true;
|
|
505
|
-
// x * (x + 1) >= 0 holds for an integer x, as no integer lies strictly between -1 and 0, but
|
|
506
|
-
// not for a real one.
|
|
507
477
|
if (numOdd !== 2 || !this.manager.isInt(expr)) return false;
|
|
508
478
|
return this.isSuccessor(firstOdd, secondOdd) || this.isSuccessor(secondOdd, firstOdd);
|
|
509
479
|
}
|
|
510
480
|
|
|
511
|
-
// Whether sum is base plus or minus one.
|
|
512
481
|
private isSuccessor(base: number, sum: number) {
|
|
513
482
|
if (!this.isAdd(sum)) return false;
|
|
514
483
|
let offset = Rational.zero;
|
|
@@ -553,7 +522,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
553
522
|
);
|
|
554
523
|
}
|
|
555
524
|
|
|
556
|
-
// is_separated. Like narg, the last negated polynomial lives until is_separated returns.
|
|
557
525
|
private getSeparated(left: number, right: number, kind: number) {
|
|
558
526
|
const manager = this.manager;
|
|
559
527
|
if (kind === KIND_EQ || !this.manager.isNumeral(right)) return undefined;
|
|
@@ -613,7 +581,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
613
581
|
return this.reduce(manager.mkAnd(atoms), 2);
|
|
614
582
|
}
|
|
615
583
|
|
|
616
|
-
// is_bound.
|
|
617
584
|
private getBound(inputLeft: number, inputRight: number, inputKind: number) {
|
|
618
585
|
const manager = this.manager;
|
|
619
586
|
if (
|
|
@@ -658,9 +625,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
658
625
|
return undefined;
|
|
659
626
|
}
|
|
660
627
|
|
|
661
|
-
// div_polynomial: the quotient, with a reference the caller owns, or undefined when a constant is
|
|
662
|
-
// not divisible and the atom is an equality. new_args is an expr_ref_buffer, which Z3 releases
|
|
663
|
-
// first to last as it returns.
|
|
664
628
|
private dividePolynomial(expr: number, divisor: bigint, rounding: "floor" | "ceil" | "none") {
|
|
665
629
|
const manager = this.manager;
|
|
666
630
|
const newArgs: number[] = [];
|
|
@@ -695,8 +659,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
695
659
|
return quotient;
|
|
696
660
|
}
|
|
697
661
|
|
|
698
|
-
// get_coeffs_gcd: the gcd of the coefficients, or 0 when there is no monomial, and the number of
|
|
699
|
-
// non-zero constants.
|
|
700
662
|
private getCoeffsGcd(expr: number, state: GcdState) {
|
|
701
663
|
for (let index = 0; index < this.getNumMonomials(expr); index++) {
|
|
702
664
|
const arg = this.getMonomial(expr, index);
|
|
@@ -721,7 +683,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
721
683
|
: comparison === 0;
|
|
722
684
|
}
|
|
723
685
|
|
|
724
|
-
// mk_le_ge_eq_core. Z3 holds the rewritten sides, new_arg1 and new_arg2, until it returns.
|
|
725
686
|
private mkLeGeEq(originalLeft: number, originalRight: number, kind: number) {
|
|
726
687
|
const manager = this.manager;
|
|
727
688
|
const sides: number[] = [];
|
|
@@ -791,8 +752,7 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
791
752
|
const condition = manager.getArg(left, 0);
|
|
792
753
|
const rightValue = this.getValue(right);
|
|
793
754
|
const holds = (value: Rational) => this.isHolding(value, rightValue, kind);
|
|
794
|
-
// Z3 makes the negated condition
|
|
795
|
-
// conjunctions build an equality with arith_util::mk_eq but its disjunctions with m.mk_eq.
|
|
755
|
+
// Z3 makes the negated condition even when unused, and only its conjunctions use arith_util::mk_eq.
|
|
796
756
|
const mkConjunct = (other: number) =>
|
|
797
757
|
kind === KIND_EQ ? this.mkArithEq(other, right) : this.mkAtom(other, right, kind);
|
|
798
758
|
if (this.manager.isNumeral(manager.getArg(left, 1))) {
|
|
@@ -847,7 +807,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
847
807
|
return this.factorLeGeEq(left, right, kind);
|
|
848
808
|
}
|
|
849
809
|
|
|
850
|
-
// factor_le_ge_eq: a sum with a nonlinear factor f, fg >= 0, splits on the signs of f and g.
|
|
851
810
|
private factorLeGeEq(left: number, right: number, kind: number) {
|
|
852
811
|
if (!this.isZero(right)) return undefined;
|
|
853
812
|
const factor = this.findNlFactor(left);
|
|
@@ -868,7 +827,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
868
827
|
);
|
|
869
828
|
}
|
|
870
829
|
|
|
871
|
-
// arith_util::mk_eq: a numeral goes right, and otherwise the side with the smaller id goes left.
|
|
872
830
|
private mkArithEq(left: number, right: number) {
|
|
873
831
|
const manager = this.manager;
|
|
874
832
|
const isSwapped =
|
|
@@ -881,7 +839,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
881
839
|
return manager.mkEq(lhs, rhs);
|
|
882
840
|
}
|
|
883
841
|
|
|
884
|
-
// find_nl_factor: a factor of the first nonlinear product of a sum that divides every monomial.
|
|
885
842
|
private findNlFactor(expr: number) {
|
|
886
843
|
const sum = [expr];
|
|
887
844
|
for (let index = 0; index < sum.length; index++) {
|
|
@@ -899,7 +856,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
899
856
|
return undefined;
|
|
900
857
|
}
|
|
901
858
|
|
|
902
|
-
// get_nl_muls: the factors of a product that are not numerals.
|
|
903
859
|
private getNlMuls(expr: number, muls: number[]) {
|
|
904
860
|
if (this.isMul(expr))
|
|
905
861
|
for (let index = 0; index < this.manager.getNumArgs(expr); index++)
|
|
@@ -918,7 +874,6 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
918
874
|
return this.isMulFactor(factor, expr);
|
|
919
875
|
}
|
|
920
876
|
|
|
921
|
-
// remove_factor: the sum or product without one occurrence of the factor in each monomial.
|
|
922
877
|
private removeNlFactor(factor: number, expr: number): number {
|
|
923
878
|
const manager = this.manager;
|
|
924
879
|
const sort = manager.sorts[expr];
|
|
@@ -3,14 +3,12 @@ export const shrink = <T>(values: T[], size: number) => {
|
|
|
3
3
|
while (values.length > size) values.pop();
|
|
4
4
|
};
|
|
5
5
|
|
|
6
|
-
// Writing far past an array's end turns it into a dictionary in V8,
|
|
7
|
-
// lookup. So this fills the gap first.
|
|
6
|
+
// Writing far past an array's end turns it into a dictionary in V8, so this fills the gap first.
|
|
8
7
|
export const setAt = <T>(values: (T | undefined)[], index: number, value: T | undefined) => {
|
|
9
8
|
while (values.length < index) values.push(undefined);
|
|
10
9
|
values[index] = value;
|
|
11
10
|
};
|
|
12
11
|
|
|
13
|
-
// A typed array of twice the length with the same contents.
|
|
14
12
|
export const grow = <
|
|
15
13
|
T extends Uint8Array<ArrayBuffer> | Int32Array<ArrayBuffer> | Uint32Array<ArrayBuffer>,
|
|
16
14
|
>(
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// preprocessing that the SMT kernel runs on its assertions before search.
|
|
1
|
+
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt.
|
|
3
2
|
import { SmtInvariantError } from "../../../errors";
|
|
4
3
|
import { AstManager, KIND_APP, OP_AND, OP_EQ, OP_ITE, OP_NOT, OP_OR, SORT_BOOL } from "./ast";
|
|
5
4
|
import { mkNot } from "./ast-util";
|
|
@@ -11,8 +10,6 @@ import { RefVector } from "./ref-vector";
|
|
|
11
10
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
12
11
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
13
12
|
|
|
14
|
-
// pattern_inference_rw: infers the patterns of each universal quantifier without patterns. Its
|
|
15
|
-
// cache lives as long as the assertions, like Z3's.
|
|
16
13
|
class PatternInferenceRw extends RewriterTpl {
|
|
17
14
|
constructor(
|
|
18
15
|
manager: AstManager,
|
|
@@ -38,9 +35,6 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
38
35
|
});
|
|
39
36
|
});
|
|
40
37
|
if (manager.getQuantifier(quantifier).patterns.length > 0) return quantifier;
|
|
41
|
-
// pi_pull_quantifiers: pulling the nested quantifiers out may give the body a pattern. The
|
|
42
|
-
// quantifier with the new patterns replaces new_q at once, and the pulled quantifier and
|
|
43
|
-
// pull_quant's cache go when reduce_quantifier returns.
|
|
44
38
|
const pull = new PullQuant(manager);
|
|
45
39
|
const pulled = pull.rewrite(quantifier);
|
|
46
40
|
const pulledData = manager.getQuantifier(pulled);
|
|
@@ -61,8 +55,6 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
61
55
|
}
|
|
62
56
|
}
|
|
63
57
|
|
|
64
|
-
// Z3's Knuth-Bendix style order for propagate_values: values are smallest, then deeper terms are
|
|
65
|
-
// greater.
|
|
66
58
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
67
59
|
if (left === right) return false;
|
|
68
60
|
const isLeftValue = manager.isUniqueValue(left);
|
|
@@ -83,8 +75,6 @@ const isGreater = (manager: AstManager, left: number, right: number): boolean =>
|
|
|
83
75
|
return false;
|
|
84
76
|
};
|
|
85
77
|
|
|
86
|
-
// expr_substitution under scoped_expr_substitution: the first entry for a key wins, and pop removes
|
|
87
|
-
// the entries since the matching push. The map and the trail hold their keys and values.
|
|
88
78
|
class Substitution {
|
|
89
79
|
readonly map = new Map<number, number>();
|
|
90
80
|
private trail: RefVector;
|
|
@@ -119,8 +109,6 @@ class Substitution {
|
|
|
119
109
|
this.trail.shrink(size);
|
|
120
110
|
}
|
|
121
111
|
|
|
122
|
-
// update_substitution: a ground equality is oriented by the order, and any other formula maps to
|
|
123
|
-
// true, or its atom to false.
|
|
124
112
|
update(expr: number) {
|
|
125
113
|
const manager = this.manager;
|
|
126
114
|
if (manager.isGround(expr) && manager.getOp(expr) === OP_EQ) {
|
|
@@ -140,10 +128,6 @@ class Substitution {
|
|
|
140
128
|
}
|
|
141
129
|
}
|
|
142
130
|
|
|
143
|
-
// asserted_formulas: the assertions of a context. Each assertion is rewritten when it is asserted,
|
|
144
|
-
// and reduce preprocesses the new ones. Their units and oriented equalities then rewrite the later
|
|
145
|
-
// assertions. Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
146
|
-
// A pushed scope: the number of formulas when it began, and m_inconsistent_old.
|
|
147
131
|
interface AssertedScope {
|
|
148
132
|
numFormulas: number;
|
|
149
133
|
isInconsistent: boolean;
|
|
@@ -160,9 +144,7 @@ export class AssertedFormulas {
|
|
|
160
144
|
private patternInference: PatternInferenceRw;
|
|
161
145
|
private bvSharing: MaxBvSharing;
|
|
162
146
|
private hasQuantifiers = false;
|
|
163
|
-
// m_inconsistent: whether a formula is false, after which no formula is added or preprocessed.
|
|
164
147
|
isInconsistent = false;
|
|
165
|
-
// The scopes that are pushed only when a formula is asserted, and the pushed scopes.
|
|
166
148
|
private numLazyScopes = 0;
|
|
167
149
|
private scopes: AssertedScope[] = [];
|
|
168
150
|
|
|
@@ -175,12 +157,10 @@ export class AssertedFormulas {
|
|
|
175
157
|
this.bvSharing = new MaxBvSharing(manager);
|
|
176
158
|
}
|
|
177
159
|
|
|
178
|
-
// push_scope: the scope is pushed when a formula is asserted in it.
|
|
179
160
|
push() {
|
|
180
161
|
this.numLazyScopes++;
|
|
181
162
|
}
|
|
182
163
|
|
|
183
|
-
// pop_scope: removes the formulas, names and substitutions since the matching push.
|
|
184
164
|
pop() {
|
|
185
165
|
if (this.numLazyScopes > 0) {
|
|
186
166
|
this.numLazyScopes--;
|
|
@@ -197,7 +177,6 @@ export class AssertedFormulas {
|
|
|
197
177
|
this.flushCache();
|
|
198
178
|
}
|
|
199
179
|
|
|
200
|
-
// force_push: the pushed formulas are already reduced and committed.
|
|
201
180
|
private forcePush() {
|
|
202
181
|
for (; this.numLazyScopes > 0; this.numLazyScopes--) {
|
|
203
182
|
this.substitution.push();
|
|
@@ -223,8 +202,6 @@ export class AssertedFormulas {
|
|
|
223
202
|
return this.formulas.size;
|
|
224
203
|
}
|
|
225
204
|
|
|
226
|
-
// reduce and commit: the new formulas after preprocessing, which the context internalizes. Like
|
|
227
|
-
// internalize_assertions, nothing is committed once the formulas are inconsistent.
|
|
228
205
|
reduce() {
|
|
229
206
|
if (this.qhead === this.formulas.size) return [];
|
|
230
207
|
if (!this.isInconsistent) this.reduceCore();
|
|
@@ -235,8 +212,6 @@ export class AssertedFormulas {
|
|
|
235
212
|
return result;
|
|
236
213
|
}
|
|
237
214
|
|
|
238
|
-
// asserted_formulas::reduce: each step but the last stops the preprocessing when a formula is
|
|
239
|
-
// false.
|
|
240
215
|
private reduceCore() {
|
|
241
216
|
this.setEliminateAnd(false);
|
|
242
217
|
this.propagateValues();
|
|
@@ -253,7 +228,6 @@ export class AssertedFormulas {
|
|
|
253
228
|
)
|
|
254
229
|
this.isReducePending = true;
|
|
255
230
|
if (this.isInconsistent) return;
|
|
256
|
-
// max_bv_sharing, whose post_op reduces the formulas again.
|
|
257
231
|
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
258
232
|
this.isReducePending = true;
|
|
259
233
|
if (this.isInconsistent) return;
|
|
@@ -265,8 +239,6 @@ export class AssertedFormulas {
|
|
|
265
239
|
this.flushCache();
|
|
266
240
|
}
|
|
267
241
|
|
|
268
|
-
// push_assertion: splits conjunctions and negated disjunctions. A false formula makes the
|
|
269
|
-
// assertions inconsistent.
|
|
270
242
|
private pushAssertion(expr: number, result: RefVector) {
|
|
271
243
|
const manager = this.manager;
|
|
272
244
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -286,7 +258,6 @@ export class AssertedFormulas {
|
|
|
286
258
|
if (op === OP_NOT && manager.getOp(manager.getArg(expr, 0)) === OP_OR) {
|
|
287
259
|
const disjunction = manager.getArg(expr, 0);
|
|
288
260
|
for (let index = 0; index < manager.getNumArgs(disjunction); index++) {
|
|
289
|
-
// narg holds the negation while it is pushed.
|
|
290
261
|
const negation = mkNot(manager, manager.getArg(disjunction, index));
|
|
291
262
|
manager.incRef(negation);
|
|
292
263
|
this.pushAssertion(negation, result);
|
|
@@ -297,7 +268,6 @@ export class AssertedFormulas {
|
|
|
297
268
|
result.push(expr);
|
|
298
269
|
}
|
|
299
270
|
|
|
300
|
-
// flush_cache: the rewriter is reset, with the committed substitution.
|
|
301
271
|
private flushCache() {
|
|
302
272
|
this.rewriter.setSubstitution(this.substitution.map);
|
|
303
273
|
}
|
|
@@ -310,15 +280,12 @@ export class AssertedFormulas {
|
|
|
310
280
|
this.flushCache();
|
|
311
281
|
}
|
|
312
282
|
|
|
313
|
-
// swap_asserted_formulas: the new formulas replace those from qhead on.
|
|
314
283
|
private swapFormulas(formulas: RefVector) {
|
|
315
284
|
this.formulas.shrink(this.qhead);
|
|
316
285
|
for (const formula of formulas.items) this.formulas.push(formula);
|
|
317
286
|
formulas.reset();
|
|
318
287
|
}
|
|
319
288
|
|
|
320
|
-
// simplify_fmls: a formula that simplify changes is split again. simplify returns its result with
|
|
321
|
-
// a reference. Whether a formula changed.
|
|
322
289
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
323
290
|
const manager = this.manager;
|
|
324
291
|
const formulas = new RefVector(manager);
|
|
@@ -337,17 +304,12 @@ export class AssertedFormulas {
|
|
|
337
304
|
return isChanged;
|
|
338
305
|
}
|
|
339
306
|
|
|
340
|
-
// reduce_asserted_formulas: the rewriter rewrites the formulas, unless they are already in its
|
|
341
|
-
// normal form.
|
|
342
307
|
private reduceAsserted() {
|
|
343
308
|
if (!this.isReducePending) return;
|
|
344
309
|
this.simplifyFormulas((formula) => this.rewriter.rewrite(formula));
|
|
345
310
|
this.isReducePending = false;
|
|
346
311
|
}
|
|
347
312
|
|
|
348
|
-
// asserted_formulas::propagate_values: a forward and a backward pass that rewrite each formula with
|
|
349
|
-
// the committed substitution and the units of the formulas before it. Z3 stops after one round,
|
|
350
|
-
// since the passes add no formula. When a formula changed, reduce-asserted rewrites them all.
|
|
351
313
|
private propagateValues() {
|
|
352
314
|
const manager = this.manager;
|
|
353
315
|
const substitution = this.substitution;
|
|
@@ -376,8 +338,6 @@ export class AssertedFormulas {
|
|
|
376
338
|
if (numPropagated > 0) this.reduceAsserted();
|
|
377
339
|
}
|
|
378
340
|
|
|
379
|
-
// asserted_formulas::nnf_cnf: one NNF object normalizes every formula, and the rewriter, which does
|
|
380
|
-
// not eliminate and yet, rewrites each normal form and the definitions of the names it introduced.
|
|
381
341
|
private nnfCnf() {
|
|
382
342
|
const manager = this.manager;
|
|
383
343
|
const nnf = new Nnf(manager, this.names);
|
|
@@ -400,8 +360,6 @@ export class AssertedFormulas {
|
|
|
400
360
|
nnf.release();
|
|
401
361
|
}
|
|
402
362
|
|
|
403
|
-
// asserted_formulas::flatten_clauses: an ite at the top becomes two clauses, and a conjunction
|
|
404
|
-
// that occurs in one binary clause is distributed.
|
|
405
363
|
private flattenClauses() {
|
|
406
364
|
const manager = this.manager;
|
|
407
365
|
const mkNegation = (expr: number) =>
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// total order on expressions that does not depend on their ids. The rewriter sorts a disjunction
|
|
3
|
-
// only when its arguments are out of this order.
|
|
1
|
+
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
3
|
FAMILY_MODEL_VALUE,
|
|
6
4
|
FAMILY_USER,
|
|
@@ -16,7 +14,6 @@ import {
|
|
|
16
14
|
} from "./ast";
|
|
17
15
|
import { Rational } from "./rational";
|
|
18
16
|
|
|
19
|
-
// The parts of a func_decl that lt compares: its name, parameters, domain and range.
|
|
20
17
|
interface DeclKey {
|
|
21
18
|
name: SmtSymbol;
|
|
22
19
|
parameters: (number | Rational)[];
|
|
@@ -24,7 +21,6 @@ interface DeclKey {
|
|
|
24
21
|
range: number;
|
|
25
22
|
}
|
|
26
23
|
|
|
27
|
-
// Z3's PARAM_INT, PARAM_AST and PARAM_RATIONAL kinds order the parameters of builtin declarations.
|
|
28
24
|
const PARAM_INT = 0;
|
|
29
25
|
const PARAM_RATIONAL = 3;
|
|
30
26
|
|
|
@@ -38,7 +34,6 @@ const compareParameters = (first: number | Rational, second: number | Rational)
|
|
|
38
34
|
? compareValues(first, second)
|
|
39
35
|
: 0;
|
|
40
36
|
|
|
41
|
-
// lt on symbols: numerical symbols come first, by number, and other names compare by their bytes.
|
|
42
37
|
const compareNames = (first: SmtSymbol, second: SmtSymbol) => {
|
|
43
38
|
if (first === second) return 0;
|
|
44
39
|
if (typeof first === "number")
|
|
@@ -52,7 +47,6 @@ const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
|
52
47
|
const range = manager.sorts[expr];
|
|
53
48
|
if (decl.family === FAMILY_USER)
|
|
54
49
|
return { name: decl.name, parameters: [], domain: decl.domain, range };
|
|
55
|
-
// A numeral's declaration has the parameters (value, is_int), and a model value's (index, sort).
|
|
56
50
|
if (decl.op === OP_NUM) {
|
|
57
51
|
const isInt = range === SORT_INT;
|
|
58
52
|
return {
|
|
@@ -71,9 +65,6 @@ const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
|
71
65
|
const compareSorts = (manager: AstManager, first: number, second: number) =>
|
|
72
66
|
first === second ? 0 : compareNames(manager.sortNames[first], manager.sortNames[second]);
|
|
73
67
|
|
|
74
|
-
// Whether two applications of the same declaration have the same key: a user declaration's is its
|
|
75
|
-
// own, and a builtin's other than a numeral, model value or pattern follows from the sort of the
|
|
76
|
-
// argument that getBuiltinSignature reads and the range.
|
|
77
68
|
const isSameDeclKey = (manager: AstManager, first: number, second: number) => {
|
|
78
69
|
const decl = manager.funcDecls[manager.decls[first]];
|
|
79
70
|
if (decl.family === FAMILY_USER) return true;
|
|
@@ -152,6 +143,5 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
152
143
|
return 0;
|
|
153
144
|
};
|
|
154
145
|
|
|
155
|
-
// lt: whether the first expression comes before the second.
|
|
156
146
|
export const isAstLess = (manager: AstManager, first: number, second: number) =>
|
|
157
147
|
compareAsts(manager, first, second) < 0;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_util.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// and disjunctions in Z3's worklist order, and negation that strips a negation instead of nesting one.
|
|
1
|
+
// Ported from Z3 (src/ast/ast_util.cpp), MIT license, see z3-license.txt.
|
|
3
2
|
import { OP_AND, OP_IMPLIES, OP_NOT, OP_OR, type AstManager } from "./ast";
|
|
4
3
|
import { RefVector } from "./ref-vector";
|
|
5
4
|
|
|
6
|
-
// mk_not.
|
|
7
5
|
export const mkNot = (manager: AstManager, expr: number) =>
|
|
8
6
|
manager.isNot(expr)
|
|
9
7
|
? manager.getArg(expr, 0)
|
|
@@ -13,8 +11,6 @@ export const mkNot = (manager: AstManager, expr: number) =>
|
|
|
13
11
|
? manager.trueExpr
|
|
14
12
|
: manager.mkNot(expr);
|
|
15
13
|
|
|
16
|
-
// flatten_and and flatten_or on an expr_ref_vector, with Z3's references: the vector holds its
|
|
17
|
-
// expressions, and pin holds each visited one until the end.
|
|
18
14
|
const flattenVector = (manager: AstManager, result: RefVector, isAnd: boolean) => {
|
|
19
15
|
const pin = new RefVector(manager);
|
|
20
16
|
const seen = new Set<number>();
|
|
@@ -71,7 +67,6 @@ export const flattenAndVector = (manager: AstManager, result: RefVector) =>
|
|
|
71
67
|
export const flattenOrVector = (manager: AstManager, result: RefVector) =>
|
|
72
68
|
flattenVector(manager, result, false);
|
|
73
69
|
|
|
74
|
-
// push_not with Z3's references: the result comes with a reference, which the caller releases.
|
|
75
70
|
export const pushNotOwned = (manager: AstManager, expr: number): number => {
|
|
76
71
|
const op = manager.getOp(expr);
|
|
77
72
|
if (op !== OP_AND && op !== OP_OR) {
|