tla-ts 0.0.9 → 0.0.10-dev.b4a856304
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 +29 -1
- 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 +72 -10
- package/dist/index.d.ts +72 -10
- 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 -103
- package/dist/transfer.js +128 -103
- 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 +576 -300
- package/src/cli/options.ts +11 -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 +538 -220
- 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 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +630 -297
- 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 +17 -26
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +121 -49
- 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 +29 -39
- package/src/parallel.ts +29 -13
- 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 +119 -169
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +1 -8
- 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 +494 -154
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +166 -48
- 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 +267 -77
- package/src/symmetry.ts +31 -8
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -61
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +33 -38
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +563 -211
- 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 +826 -276
- package/src/worker.ts +7 -8
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
// Ported from Z3 (src/ast/pattern/pattern_inference.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// Infers E-matching patterns for quantifiers that have none, with Z3's default parameters:
|
|
3
|
-
// pi.max_multi_patterns=0, pi.block_loop_patterns=true, pi.decompose_patterns=true,
|
|
4
|
-
// pi.arith=1 (conservative), pi.avoid_skolems=true.
|
|
5
2
|
import {
|
|
6
3
|
AstManager,
|
|
7
4
|
FAMILY_ARITH,
|
|
@@ -40,8 +37,6 @@ const isSameSet = (left: Set<number>, right: Set<number>) =>
|
|
|
40
37
|
const isSubset = (left: Set<number>, right: Set<number>) =>
|
|
41
38
|
[...left].every((element) => right.has(element));
|
|
42
39
|
|
|
43
|
-
// pattern_inference_cfg, which asserted_formulas keeps as long as it lives. m_candidates holds its
|
|
44
|
-
// candidates until the end of mk_patterns.
|
|
45
40
|
export class PatternInference {
|
|
46
41
|
private candidates: RefVector;
|
|
47
42
|
private candidateInfos = new Map<number, CandidateInfo>();
|
|
@@ -134,7 +129,6 @@ export class PatternInference {
|
|
|
134
129
|
this.candidates.push(expr);
|
|
135
130
|
}
|
|
136
131
|
|
|
137
|
-
// smaller_pattern: whether second is an instance of first.
|
|
138
132
|
private isSmaller(first: number, second: number) {
|
|
139
133
|
const manager = this.manager;
|
|
140
134
|
const bindings = Array.from({ length: this.numBindings }, () => -1);
|
|
@@ -282,7 +276,6 @@ export class PatternInference {
|
|
|
282
276
|
const looseCandidates = this.filterLoopingPatterns().filter(
|
|
283
277
|
(candidate) => !this.containsSubpattern(candidate),
|
|
284
278
|
);
|
|
285
|
-
// m_tmp1: the candidates that do not cover every variable, which may form a multi-pattern.
|
|
286
279
|
const partialCandidates: number[] = [];
|
|
287
280
|
for (const candidate of looseCandidates) {
|
|
288
281
|
const info = this.candidateInfos.get(candidate);
|
|
@@ -292,13 +285,11 @@ export class PatternInference {
|
|
|
292
285
|
}
|
|
293
286
|
const numExtraMultiPatterns = result.length === 0 ? 1 : 0;
|
|
294
287
|
if (numExtraMultiPatterns > 0 && partialCandidates.length > 0) {
|
|
295
|
-
// std::stable_sort with m_pattern_weight_lt.
|
|
296
|
-
const weightOf = (candidate: number) => this.candidateInfos.get(candidate);
|
|
297
288
|
const sorted = partialCandidates
|
|
298
289
|
.map((candidate, index) => ({ candidate, index }))
|
|
299
290
|
.sort((left, right) => {
|
|
300
|
-
const leftInfo =
|
|
301
|
-
const rightInfo =
|
|
291
|
+
const leftInfo = this.candidateInfos.get(left.candidate);
|
|
292
|
+
const rightInfo = this.candidateInfos.get(right.candidate);
|
|
302
293
|
if (leftInfo === undefined || rightInfo === undefined) return left.index - right.index;
|
|
303
294
|
if (leftInfo.freeVars.size !== rightInfo.freeVars.size)
|
|
304
295
|
return rightInfo.freeVars.size - leftInfo.freeVars.size;
|
|
@@ -314,8 +305,6 @@ export class PatternInference {
|
|
|
314
305
|
return result;
|
|
315
306
|
}
|
|
316
307
|
|
|
317
|
-
// reduce_quantifier for a quantifier without patterns: arithmetic, then looping and non-nested
|
|
318
|
-
// arithmetic patterns, are allowed when no pattern is found without them.
|
|
319
308
|
infer(numBindings: number, body: number, weight: number): InferredPatterns {
|
|
320
309
|
this.isArithForbidden = true;
|
|
321
310
|
this.isNestedArithOnly = true;
|
|
@@ -335,8 +324,6 @@ export class PatternInference {
|
|
|
335
324
|
};
|
|
336
325
|
}
|
|
337
326
|
|
|
338
|
-
// The patterns of a quantifier that pull_quant changed, found once with the settings that infer
|
|
339
|
-
// restores: arithmetic is allowed, but only nested, and looping patterns are blocked.
|
|
340
327
|
inferPulled(numBindings: number, body: number) {
|
|
341
328
|
this.isArithForbidden = false;
|
|
342
329
|
this.isNestedArithOnly = true;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see
|
|
2
|
-
// z3-license.txt. The rewrites of sums and products of monomials, which arith_rewriter extends.
|
|
3
|
-
// Powers are not ported, as tlapm's encoding does not produce them.
|
|
1
|
+
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see z3-license.txt.
|
|
4
2
|
import {
|
|
5
|
-
AstManager,
|
|
3
|
+
type AstManager,
|
|
6
4
|
KIND_APP,
|
|
7
5
|
OP_ABS,
|
|
8
6
|
OP_ADD,
|
|
@@ -26,13 +24,9 @@ import { Rational } from "./rational";
|
|
|
26
24
|
import type { Rewrite } from "./rewriter-tpl";
|
|
27
25
|
|
|
28
26
|
export interface ArithRewriterOptions {
|
|
29
|
-
// poly_rewriter's som: distributes products over sums.
|
|
30
27
|
readonly isSom: boolean;
|
|
31
|
-
// arith_rewriter's sort_sums: orders the monomials of a sum.
|
|
32
28
|
readonly isSortSums: boolean;
|
|
33
|
-
// arith_rewriter's arith_ineq_lhs: moves the monomials of an inequality to the left-hand side.
|
|
34
29
|
readonly isArithIneqLhs: boolean;
|
|
35
|
-
// arith_rewriter's gcd_rounding: divides integer atoms by the gcd of their coefficients.
|
|
36
30
|
readonly isGcdRounding: boolean;
|
|
37
31
|
}
|
|
38
32
|
|
|
@@ -56,10 +50,7 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
56
50
|
]);
|
|
57
51
|
|
|
58
52
|
export class PolyRewriter {
|
|
59
|
-
// m_curr_sort: the sort of the numerals and terms that the current rewrite makes.
|
|
60
53
|
protected currSort = SORT_INT;
|
|
61
|
-
// The expr_fast_mark1 and expr_fast_mark2 of mk_nflat_add_core: Z3 marks the power products in
|
|
62
|
-
// their nodes, and a stamp per expression marks them here for one call.
|
|
63
54
|
private visitedStamps = new Int32Array(0);
|
|
64
55
|
private multipleStamps = new Int32Array(0);
|
|
65
56
|
private stamp = 0;
|
|
@@ -77,7 +68,6 @@ export class PolyRewriter {
|
|
|
77
68
|
return this.manager.isNumeral(expr) && this.getValue(expr).isZero();
|
|
78
69
|
}
|
|
79
70
|
|
|
80
|
-
// The value of a numeral of either sort.
|
|
81
71
|
protected getValue(expr: number) {
|
|
82
72
|
return this.manager.getRationalValue(expr);
|
|
83
73
|
}
|
|
@@ -98,7 +88,6 @@ export class PolyRewriter {
|
|
|
98
88
|
return this.manager.kinds[expr] === KIND_APP && ARITH_OPS.has(this.manager.getOp(expr));
|
|
99
89
|
}
|
|
100
90
|
|
|
101
|
-
// get_monomials: the summands of a sum, and otherwise the term itself.
|
|
102
91
|
protected getNumMonomials(expr: number) {
|
|
103
92
|
return this.isAdd(expr) ? this.manager.getNumArgs(expr) : 1;
|
|
104
93
|
}
|
|
@@ -107,7 +96,6 @@ export class PolyRewriter {
|
|
|
107
96
|
return this.isAdd(expr) ? this.manager.getArg(expr, index) : expr;
|
|
108
97
|
}
|
|
109
98
|
|
|
110
|
-
// get_power_product: the monomial without its coefficient.
|
|
111
99
|
protected getPowerProduct(expr: number) {
|
|
112
100
|
return this.isMul(expr) &&
|
|
113
101
|
this.manager.getNumArgs(expr) === 2 &&
|
|
@@ -124,7 +112,6 @@ export class PolyRewriter {
|
|
|
124
112
|
: Rational.one;
|
|
125
113
|
}
|
|
126
114
|
|
|
127
|
-
// mon_lt::ordinal, without powers.
|
|
128
115
|
protected getOrdinal(expr: number) {
|
|
129
116
|
const manager = this.manager;
|
|
130
117
|
if (manager.kinds[expr] !== KIND_APP || !ARITH_OPS.has(manager.getOp(expr)))
|
|
@@ -137,8 +124,6 @@ export class PolyRewriter {
|
|
|
137
124
|
return manager.isNumeral(expr) ? -1 : manager.ids[expr];
|
|
138
125
|
}
|
|
139
126
|
|
|
140
|
-
// std::sort with mon_lt, of the monomials from start, in place. Insertion sort is stable, as
|
|
141
|
-
// Array.prototype.sort is, and allocates nothing for the short sums that are the common case.
|
|
142
127
|
protected sortMonomials(monomials: number[], start: number) {
|
|
143
128
|
for (let index = start + 1; index < monomials.length; index++) {
|
|
144
129
|
const monomial = monomials[index];
|
|
@@ -170,7 +155,6 @@ export class PolyRewriter {
|
|
|
170
155
|
return this.mkMulApp([this.mkNumeral(coefficient), arg]);
|
|
171
156
|
}
|
|
172
157
|
|
|
173
|
-
// The rewrites return undefined when they do not apply, like BR_FAILED.
|
|
174
158
|
mkAdd(args: number[]): number | undefined {
|
|
175
159
|
if (args.length < 2) return undefined;
|
|
176
160
|
this.currSort = this.manager.sorts[args[0]];
|
|
@@ -218,7 +202,6 @@ export class PolyRewriter {
|
|
|
218
202
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
219
203
|
}
|
|
220
204
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
221
|
-
// visited.reset(): a new stamp marks the power products already copied.
|
|
222
205
|
const copiedStamp = ++this.stamp;
|
|
223
206
|
for (const arg of args) {
|
|
224
207
|
if (manager.isNumeral(arg)) continue;
|
|
@@ -342,7 +325,6 @@ export class PolyRewriter {
|
|
|
342
325
|
}
|
|
343
326
|
const sums = args.map((arg) => (this.isAdd(arg) ? manager.getArgs(arg) : [arg]));
|
|
344
327
|
const positions = sums.map(() => 0);
|
|
345
|
-
// Like som's expr_ref_buffer, the products are released in order when it returns.
|
|
346
328
|
const products: number[] = [];
|
|
347
329
|
const isBlownUp = manager.withTemporaries(
|
|
348
330
|
() => {
|
|
@@ -381,7 +363,6 @@ export class PolyRewriter {
|
|
|
381
363
|
return this.reduce(this.mkMulAppWith(Rational.minusOne, arg), 1);
|
|
382
364
|
}
|
|
383
365
|
|
|
384
|
-
// poly_rewriter::cancel_monomials. The stamps stand for its visited, multiple and copied marks.
|
|
385
366
|
protected cancelMonomials(lhs: number, rhs: number, isMoving: boolean) {
|
|
386
367
|
const manager = this.manager;
|
|
387
368
|
this.currSort = manager.sorts[lhs];
|
|
@@ -471,7 +452,6 @@ export class PolyRewriter {
|
|
|
471
452
|
const isRhsConstant = isConstantAtRhs && (newRhs.length === 0 || !value.isZero());
|
|
472
453
|
if (isLhsConstant) sortedLhs.unshift(this.mkNumeral(value));
|
|
473
454
|
if (isRhsConstant) newRhs.unshift(this.mkNumeral(value));
|
|
474
|
-
|
|
475
|
-
return { lhs: lhsResult, rhs: this.mkAddApp(newRhs) };
|
|
455
|
+
return { lhs: this.mkAddApp(sortedLhs), rhs: this.mkAddApp(newRhs) };
|
|
476
456
|
}
|
|
477
457
|
}
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
// Ported from Z3 (src/tactic/core/propagate_values_tactic.cpp, src/ast/shared_occs.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt. The propagate-values tactic: a formula that is an atom, a negated atom or an
|
|
3
|
-
// equality with a value rewrites the other formulas, when its atom or term occurs more than once in
|
|
4
|
-
// the goal.
|
|
1
|
+
// Ported from Z3 (src/tactic/core/propagate_values_tactic.cpp, src/ast/shared_occs.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { KIND_APP, KIND_QUANTIFIER, OP_EQ, type AstManager } from "./ast";
|
|
6
3
|
import type { Goal } from "./goal";
|
|
7
4
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
8
5
|
|
|
9
|
-
// The max_rounds parameter's default.
|
|
10
6
|
const MAX_ROUNDS = 4;
|
|
11
7
|
|
|
12
|
-
// goal_shared_occs with atoms tracked: the terms that the goal's formulas reach more than once,
|
|
13
|
-
// quantifier bodies included and patterns excluded.
|
|
14
8
|
const getSharedOccs = (manager: AstManager, forms: number[]) => {
|
|
15
9
|
const visited = new Set<number>();
|
|
16
10
|
const shared = new Set<number>();
|
|
@@ -34,7 +28,6 @@ export const propagateValues = (manager: AstManager, goal: Goal) => {
|
|
|
34
28
|
rewriter.setSubstitution(substitution);
|
|
35
29
|
let occs = getSharedOccs(manager, goal.forms.items);
|
|
36
30
|
let isModified = false;
|
|
37
|
-
// process_current and push_result.
|
|
38
31
|
const process = (index: number) => {
|
|
39
32
|
const current = goal.forms.items[index];
|
|
40
33
|
const isRewriting = substitution.size !== 0;
|
|
@@ -57,8 +50,6 @@ export const propagateValues = (manager: AstManager, goal: Goal) => {
|
|
|
57
50
|
)
|
|
58
51
|
substitution.set(manager.getArg(rewritten, 0), manager.getArg(rewritten, 1));
|
|
59
52
|
};
|
|
60
|
-
// Each pass is a round: a forward pass, which stops when it found nothing, then a backward pass,
|
|
61
|
-
// which stops when it changed nothing.
|
|
62
53
|
for (let round = 0; round < MAX_ROUNDS; round += 2) {
|
|
63
54
|
const size = goal.forms.size;
|
|
64
55
|
for (let index = 0; index < size; index++) {
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/proto_model/proto_model.cpp, src/model/func_interp.cpp,
|
|
2
|
-
// src/model/value_factory.cpp, src/model/model_core.cpp), MIT license, see z3-license.txt. The
|
|
3
|
-
// model that the SMT kernel builds from a satisfying assignment, and that model-based quantifier
|
|
4
|
-
// instantiation completes and checks.
|
|
1
|
+
// Ported from Z3 (src/smt/proto_model/proto_model.cpp, src/model/func_interp.cpp, src/model/value_factory.cpp, src/model/model_core.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import {
|
|
6
|
-
AstManager,
|
|
3
|
+
type AstManager,
|
|
7
4
|
KIND_APP,
|
|
8
5
|
KIND_VAR,
|
|
9
6
|
OP_AND,
|
|
@@ -24,9 +21,6 @@ interface FuncEntry {
|
|
|
24
21
|
result: number;
|
|
25
22
|
}
|
|
26
23
|
|
|
27
|
-
// func_interp: a finite table of entries and an else expression over the variables (:var i) for
|
|
28
|
-
// argument i. It holds the arguments and result of each entry, the else expression and the cached
|
|
29
|
-
// interpretation.
|
|
30
24
|
export class FuncInterp {
|
|
31
25
|
entries: FuncEntry[] = [];
|
|
32
26
|
private entryTable = new Map<string, FuncEntry>();
|
|
@@ -49,7 +43,6 @@ export class FuncInterp {
|
|
|
49
43
|
insertNewEntry(args: number[], result: number) {
|
|
50
44
|
const manager = this.manager;
|
|
51
45
|
this.resetInterpCache();
|
|
52
|
-
// func_entry: the result is held first, then the arguments.
|
|
53
46
|
manager.incRef(result);
|
|
54
47
|
for (const arg of args) manager.incRef(arg);
|
|
55
48
|
const entry = { args: [...args], result };
|
|
@@ -64,7 +57,6 @@ export class FuncInterp {
|
|
|
64
57
|
this.insertNewEntry(args, result);
|
|
65
58
|
return;
|
|
66
59
|
}
|
|
67
|
-
// func_entry::set_result.
|
|
68
60
|
this.manager.incRef(result);
|
|
69
61
|
this.manager.decRef(entry.result);
|
|
70
62
|
entry.result = result;
|
|
@@ -75,20 +67,17 @@ export class FuncInterp {
|
|
|
75
67
|
this.interp = null;
|
|
76
68
|
}
|
|
77
69
|
|
|
78
|
-
// func_entry::deallocate.
|
|
79
70
|
private releaseEntry(entry: FuncEntry) {
|
|
80
71
|
for (const arg of entry.args) this.manager.decRef(arg);
|
|
81
72
|
this.manager.decRef(entry.result);
|
|
82
73
|
}
|
|
83
74
|
|
|
84
|
-
// ~func_interp.
|
|
85
75
|
release() {
|
|
86
76
|
for (const entry of this.entries) this.releaseEntry(entry);
|
|
87
77
|
if (this.elseExpr !== null) this.manager.decRef(this.elseExpr);
|
|
88
78
|
this.resetInterpCache();
|
|
89
79
|
}
|
|
90
80
|
|
|
91
|
-
// is_fi_entry_expr: (ite (and (= (:var 0) a0) ...) t e) with a ground t.
|
|
92
81
|
private getEntryArgs(expr: number) {
|
|
93
82
|
const manager = this.manager;
|
|
94
83
|
if (manager.getOp(expr) !== OP_ITE) return undefined;
|
|
@@ -150,7 +139,6 @@ export class FuncInterp {
|
|
|
150
139
|
return best;
|
|
151
140
|
}
|
|
152
141
|
|
|
153
|
-
// compress: drops the entries whose result is the else value, and recognizes the identity.
|
|
154
142
|
compress() {
|
|
155
143
|
const manager = this.manager;
|
|
156
144
|
const elseExpr = this.elseExpr;
|
|
@@ -177,7 +165,6 @@ export class FuncInterp {
|
|
|
177
165
|
}
|
|
178
166
|
}
|
|
179
167
|
|
|
180
|
-
// is_identity: only Bool has a finite number of elements among tlapm's sorts.
|
|
181
168
|
private isIdentity() {
|
|
182
169
|
const manager = this.manager;
|
|
183
170
|
const elseExpr = this.elseExpr;
|
|
@@ -189,7 +176,6 @@ export class FuncInterp {
|
|
|
189
176
|
return this.entries.length + 1 === 2;
|
|
190
177
|
}
|
|
191
178
|
|
|
192
|
-
// get_interp: the interpretation as an expression over the argument variables, which it caches.
|
|
193
179
|
getInterp() {
|
|
194
180
|
if (this.interp !== null) return this.interp;
|
|
195
181
|
const manager = this.manager;
|
|
@@ -219,16 +205,11 @@ export class FuncInterp {
|
|
|
219
205
|
}
|
|
220
206
|
|
|
221
207
|
export class ProtoModel {
|
|
222
|
-
// m_interp and m_const_decls: the value of each constant, and the constants in the order they were
|
|
223
|
-
// registered.
|
|
224
208
|
readonly constInterps: ObjMap<number>;
|
|
225
209
|
private constDecls: number[] = [];
|
|
226
|
-
// m_finterp, in Z3's slot order, and m_func_decls, in the order they were registered.
|
|
227
210
|
readonly funcInterps: ObjMap<FuncInterp>;
|
|
228
211
|
private funcDecls: number[] = [];
|
|
229
212
|
private auxDecls: ObjHashtable;
|
|
230
|
-
// user_sort_factory and the arith_factory: the values of each sort, in Z3's hash order, and the
|
|
231
|
-
// values each factory holds, in the order it made or registered them.
|
|
232
213
|
private values = new Map<number, ObjHashtable>();
|
|
233
214
|
private userSortValues: RefVector;
|
|
234
215
|
private arithValues: RefVector;
|
|
@@ -236,9 +217,7 @@ export class ProtoModel {
|
|
|
236
217
|
private finiteSorts = new Set<number>();
|
|
237
218
|
private boolRandom: RandomGen;
|
|
238
219
|
private evaluator: ModelEvaluator;
|
|
239
|
-
// m_rewrite: the th_rewriter that cleanup simplifies the interpretations with.
|
|
240
220
|
private rewriter: Rewriter;
|
|
241
|
-
// The holders of a proto_model and a model are counted, and the last one releases it.
|
|
242
221
|
private refCount = 0;
|
|
243
222
|
|
|
244
223
|
constructor(readonly manager: AstManager) {
|
|
@@ -252,7 +231,6 @@ export class ProtoModel {
|
|
|
252
231
|
this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
|
|
253
232
|
}
|
|
254
233
|
|
|
255
|
-
// model_core::register_decl: the model holds the declaration and the value.
|
|
256
234
|
registerConst(decl: number, value: number) {
|
|
257
235
|
const old = this.constInterps.get(decl);
|
|
258
236
|
if (old === undefined) this.manager.incDeclRef(decl);
|
|
@@ -262,8 +240,6 @@ export class ProtoModel {
|
|
|
262
240
|
this.constInterps.set(decl, value);
|
|
263
241
|
}
|
|
264
242
|
|
|
265
|
-
// model_core::register_decl: the interpretation replaces the old one, which is released. The model
|
|
266
|
-
// holds the declaration.
|
|
267
243
|
registerFunc(decl: number, interp: FuncInterp) {
|
|
268
244
|
const old = this.funcInterps.get(decl);
|
|
269
245
|
if (old === undefined) {
|
|
@@ -279,7 +255,6 @@ export class ProtoModel {
|
|
|
279
255
|
this.auxDecls.add(decl);
|
|
280
256
|
}
|
|
281
257
|
|
|
282
|
-
// reregister_decl: the old interpretation of decl moves to auxDecl.
|
|
283
258
|
reregisterDecl(decl: number, interp: FuncInterp, auxDecl: number) {
|
|
284
259
|
const old = this.funcInterps.get(decl);
|
|
285
260
|
if (old === undefined) {
|
|
@@ -291,11 +266,9 @@ export class ProtoModel {
|
|
|
291
266
|
this.funcInterps.set(decl, interp);
|
|
292
267
|
}
|
|
293
268
|
|
|
294
|
-
// eval: the result comes with a reference, which the caller releases.
|
|
295
269
|
eval(expr: number, isModelCompletion: boolean) {
|
|
296
270
|
this.evaluator.setModelCompletion(isModelCompletion);
|
|
297
|
-
|
|
298
|
-
return result;
|
|
271
|
+
return this.evaluator.rewrite(expr);
|
|
299
272
|
}
|
|
300
273
|
|
|
301
274
|
private getValueSet(sort: number) {
|
|
@@ -306,15 +279,12 @@ export class ProtoModel {
|
|
|
306
279
|
return created;
|
|
307
280
|
}
|
|
308
281
|
|
|
309
|
-
// arith_factory's values are the integers, of either sort.
|
|
310
282
|
private mkIndexedValue(index: number, sort: number) {
|
|
311
283
|
return isArithSort(sort)
|
|
312
284
|
? this.manager.mkNumeralOfSort(Rational.of(BigInt(index)), sort)
|
|
313
285
|
: this.manager.mkModelValue(index, sort);
|
|
314
286
|
}
|
|
315
287
|
|
|
316
|
-
// mk_value and register_value: a value is inserted only when it is new, since inserting grows the
|
|
317
|
-
// table even for a value it has.
|
|
318
288
|
private addValue(sort: number, value: number) {
|
|
319
289
|
const set = this.getValueSet(sort);
|
|
320
290
|
if (set.has(value)) return;
|
|
@@ -396,14 +366,10 @@ export class ProtoModel {
|
|
|
396
366
|
}
|
|
397
367
|
|
|
398
368
|
completePartialFuncs(isUsingFresh: boolean) {
|
|
399
|
-
// get_some_value may register more declarations, which the loop then completes too.
|
|
400
369
|
for (let index = 0; index < this.funcDecls.length; index++)
|
|
401
370
|
this.completePartialFunc(this.funcDecls[index], isUsingFresh);
|
|
402
371
|
}
|
|
403
372
|
|
|
404
|
-
// cleanup_expr: replaces the uninterpreted constants in an else expression with their values. Like
|
|
405
|
-
// Z3, it walks a todo stack, so it rewrites the last argument of a term first. The trail holds the
|
|
406
|
-
// terms it rewrote until the next call.
|
|
407
373
|
private cleanupExpr(trail: RefVector, expr: number, foundAuxDecls: ObjHashtable) {
|
|
408
374
|
const manager = this.manager;
|
|
409
375
|
trail.reset();
|
|
@@ -448,12 +414,10 @@ export class ProtoModel {
|
|
|
448
414
|
return cache.get(expr) ?? expr;
|
|
449
415
|
}
|
|
450
416
|
|
|
451
|
-
// cleanup: also removes the auxiliary declarations that no interpretation uses.
|
|
452
417
|
cleanup() {
|
|
453
418
|
const manager = this.manager;
|
|
454
419
|
const foundAuxDecls = new ObjHashtable((decl) => manager.getDeclHash(decl));
|
|
455
420
|
const trail = new RefVector(manager);
|
|
456
|
-
// Like Z3, it collects the interpretations before it cleans them up.
|
|
457
421
|
const interps = Array.from(this.funcInterps, (entry) => entry[1]);
|
|
458
422
|
for (const interp of interps)
|
|
459
423
|
if (interp.elseExpr !== null)
|
|
@@ -465,7 +429,6 @@ export class ProtoModel {
|
|
|
465
429
|
if (cleaned !== value) this.registerConst(decl, cleaned);
|
|
466
430
|
}
|
|
467
431
|
if (foundAuxDecls.size !== this.auxDecls.size) {
|
|
468
|
-
// remove_aux_decls_not_in_set.
|
|
469
432
|
this.funcDecls = this.funcDecls.filter(
|
|
470
433
|
(decl) => !this.auxDecls.has(decl) || foundAuxDecls.has(decl),
|
|
471
434
|
);
|
|
@@ -475,8 +438,6 @@ export class ProtoModel {
|
|
|
475
438
|
trail.reset();
|
|
476
439
|
}
|
|
477
440
|
|
|
478
|
-
// model_core::unregister_decl: releases the value or the interpretation. The last constant takes
|
|
479
|
-
// the place of a removed one.
|
|
480
441
|
private unregisterDecl(decl: number) {
|
|
481
442
|
const value = this.constInterps.get(decl);
|
|
482
443
|
if (value !== undefined) {
|
|
@@ -506,8 +467,6 @@ export class ProtoModel {
|
|
|
506
467
|
if (this.refCount === 0) this.release();
|
|
507
468
|
}
|
|
508
469
|
|
|
509
|
-
// ~proto_model: the rewriter, the evaluator and the factories go before the interpretations, and
|
|
510
|
-
// the user sort factory before the arith_factory.
|
|
511
470
|
private release() {
|
|
512
471
|
this.rewriter.release();
|
|
513
472
|
this.evaluator.release();
|
|
@@ -523,8 +482,6 @@ export class ProtoModel {
|
|
|
523
482
|
}
|
|
524
483
|
}
|
|
525
484
|
|
|
526
|
-
// mk_model: the model holds the values of the constants and the universes of the uninterpreted
|
|
527
|
-
// sorts, and takes the interpretations of the functions.
|
|
528
485
|
mkModel() {
|
|
529
486
|
const model = new ProtoModel(this.manager);
|
|
530
487
|
for (const entry of this.constInterps) model.registerConst(entry[0], entry[1]);
|
|
@@ -539,12 +496,10 @@ export class ProtoModel {
|
|
|
539
496
|
return model;
|
|
540
497
|
}
|
|
541
498
|
|
|
542
|
-
// model::get_some_const_interp.
|
|
543
499
|
getSomeConstInterp(decl: number) {
|
|
544
500
|
return this.constInterps.get(decl) ?? this.getSomeValue(this.manager.funcDecls[decl].range);
|
|
545
501
|
}
|
|
546
502
|
|
|
547
|
-
// model::are_equal for values.
|
|
548
503
|
areEqual(first: number, second: number) {
|
|
549
504
|
return first === second;
|
|
550
505
|
}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/normal_forms/pull_quant.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// the universal quantifiers nested in a formula in Skolem normal form to the top, so the model
|
|
3
|
-
// finder sees one flat quantifier.
|
|
1
|
+
// Ported from Z3 (src/ast/normal_forms/pull_quant.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import { KIND_QUANTIFIER, OP_AND, OP_NOT, OP_OR, type AstManager, type SmtSymbol } from "./ast";
|
|
5
3
|
import { mkNot } from "./ast-util";
|
|
6
4
|
import { type Rewrite, RewriterTpl, VarShifter } from "./rewriter-tpl";
|
|
7
5
|
|
|
8
|
-
// rewriter_tpl with pull_quant's rw_cfg.
|
|
9
6
|
export class PullQuant extends RewriterTpl {
|
|
10
|
-
// rw_cfg::m_shift.
|
|
11
7
|
private varShifter: VarShifter;
|
|
12
8
|
|
|
13
9
|
constructor(manager: AstManager) {
|
|
@@ -15,7 +11,6 @@ export class PullQuant extends RewriterTpl {
|
|
|
15
11
|
this.varShifter = new VarShifter(manager);
|
|
16
12
|
}
|
|
17
13
|
|
|
18
|
-
// pull_quant1_core for an application of not, and or or. The result comes with a reference.
|
|
19
14
|
private pullFromApp(decl: number, args: number[], sort: number) {
|
|
20
15
|
const manager = this.manager;
|
|
21
16
|
if (manager.funcDecls[decl].op === OP_NOT) {
|
|
@@ -31,8 +26,6 @@ export class PullQuant extends RewriterTpl {
|
|
|
31
26
|
return result;
|
|
32
27
|
}
|
|
33
28
|
let isForall: boolean | undefined;
|
|
34
|
-
// The variables in reverse, the last variable of the first quantifier first. A name that repeats
|
|
35
|
-
// becomes a fresh one.
|
|
36
29
|
const sorts: number[] = [];
|
|
37
30
|
const names: SmtSymbol[] = [];
|
|
38
31
|
let weight = Number.POSITIVE_INFINITY;
|
|
@@ -57,7 +50,6 @@ export class PullQuant extends RewriterTpl {
|
|
|
57
50
|
if (isForall === undefined) return -1;
|
|
58
51
|
const numDecls = sorts.length;
|
|
59
52
|
let shiftAmount = 0;
|
|
60
|
-
// new_adjusted_children, which holds each shifted child.
|
|
61
53
|
const adjusted = args.map((child) => {
|
|
62
54
|
if (manager.kinds[child] !== KIND_QUANTIFIER)
|
|
63
55
|
return this.varShifter.shift(child, 0, numDecls, 0);
|
|
@@ -122,15 +114,12 @@ export class PullQuant extends RewriterTpl {
|
|
|
122
114
|
return result;
|
|
123
115
|
}
|
|
124
116
|
|
|
125
|
-
// ~rw: the configuration's shifter goes first, then the rewriter.
|
|
126
117
|
release() {
|
|
127
118
|
this.varShifter.release();
|
|
128
119
|
super.release();
|
|
129
120
|
}
|
|
130
121
|
}
|
|
131
122
|
|
|
132
|
-
// pull_quant's operator(), with a pull_quant of its own. The result comes with a reference, which
|
|
133
|
-
// the caller releases.
|
|
134
123
|
export const pullQuant = (manager: AstManager, expr: number) => {
|
|
135
124
|
const pull = new PullQuant(manager);
|
|
136
125
|
const result = pull.rewrite(expr);
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license,
|
|
2
|
-
// see z3-license.txt. The eq_der of qe-lite: destructive equality resolution, which removes the
|
|
3
|
-
// variables of a quantifier that its body defines by an equality, with the solve plugins for
|
|
4
|
-
// Booleans and integer arithmetic.
|
|
1
|
+
// Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import {
|
|
6
3
|
KIND_VAR,
|
|
7
4
|
OP_ADD,
|
|
@@ -24,7 +21,6 @@ import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
|
24
21
|
import { BetaReducer } from "./rewriter-tpl";
|
|
25
22
|
import { assign, assignOwned, release } from "./expr-ref";
|
|
26
23
|
|
|
27
|
-
// A summand of a linear equation and whether it is on the left-hand side.
|
|
28
24
|
interface SignedExpr {
|
|
29
25
|
isLeft: boolean;
|
|
30
26
|
expr: number;
|
|
@@ -32,11 +28,9 @@ interface SignedExpr {
|
|
|
32
28
|
|
|
33
29
|
interface SolvedVar {
|
|
34
30
|
variable: number;
|
|
35
|
-
// Held by a reference that the receiver releases.
|
|
36
31
|
term: number;
|
|
37
32
|
}
|
|
38
33
|
|
|
39
|
-
// eq_der: destructive equality resolution on a conjunction.
|
|
40
34
|
export class EqDer {
|
|
41
35
|
private subst: BetaReducer;
|
|
42
36
|
private substMap: RefVector;
|
|
@@ -47,7 +41,6 @@ export class EqDer {
|
|
|
47
41
|
private var2pos: number[] = [];
|
|
48
42
|
private inx2var: number[] = [];
|
|
49
43
|
private order: number[] = [];
|
|
50
|
-
// is_variable_test: the variables of the quantifier at hand are those below this index.
|
|
51
44
|
numVars = 0;
|
|
52
45
|
|
|
53
46
|
constructor(private manager: AstManager) {
|
|
@@ -62,13 +55,11 @@ export class EqDer {
|
|
|
62
55
|
return manager.kinds[expr] === KIND_VAR && manager.values[expr] < this.numVars;
|
|
63
56
|
}
|
|
64
57
|
|
|
65
|
-
// operator(): reduce_var_set until nothing changes.
|
|
66
58
|
apply(conjs: RefVector) {
|
|
67
59
|
while (this.reduceVarSet(conjs));
|
|
68
60
|
this.newExprs.reset();
|
|
69
61
|
}
|
|
70
62
|
|
|
71
|
-
// ~eq_der.
|
|
72
63
|
release() {
|
|
73
64
|
this.rewriter.release();
|
|
74
65
|
this.newExprs.reset();
|
|
@@ -78,7 +69,6 @@ export class EqDer {
|
|
|
78
69
|
|
|
79
70
|
private reduceVarSet(conjs: RefVector) {
|
|
80
71
|
const manager = this.manager;
|
|
81
|
-
// flatten_definitions: a false conjunct is the whole conjunction.
|
|
82
72
|
const falseConj = conjs.items.find((conj) => manager.isFalse(conj));
|
|
83
73
|
if (falseConj !== undefined) {
|
|
84
74
|
conjs.set(0, falseConj);
|
|
@@ -105,8 +95,6 @@ export class EqDer {
|
|
|
105
95
|
return this.removeUnconstrained(conjs) || isReduced;
|
|
106
96
|
}
|
|
107
97
|
|
|
108
|
-
// find_definitions: one definition per variable, preferring values, then ground terms, then
|
|
109
|
-
// constants.
|
|
110
98
|
private findDefinitions(args: number[]) {
|
|
111
99
|
const manager = this.manager;
|
|
112
100
|
let numDefs = 0;
|
|
@@ -158,7 +146,6 @@ export class EqDer {
|
|
|
158
146
|
return { numDefs, largestIndex };
|
|
159
147
|
}
|
|
160
148
|
|
|
161
|
-
// is_var_eq: a variable and its definition from a literal, through the solve plugin of the sort.
|
|
162
149
|
private getVarEq(expr: number, vars: number[], terms: RefVector) {
|
|
163
150
|
const manager = this.manager;
|
|
164
151
|
const isEq = manager.getOp(expr) === OP_EQ;
|
|
@@ -174,7 +161,6 @@ export class EqDer {
|
|
|
174
161
|
}
|
|
175
162
|
const sort = isEq ? manager.sorts[manager.getArg(expr, 0)] : manager.sorts[expr];
|
|
176
163
|
if (sort !== SORT_BOOL && sort !== SORT_INT) return false;
|
|
177
|
-
// solve_plugin::operator(): the arithmetic plugin only sees positive equalities.
|
|
178
164
|
const isNegated = manager.isNot(expr);
|
|
179
165
|
const solved =
|
|
180
166
|
sort === SORT_INT
|
|
@@ -192,7 +178,6 @@ export class EqDer {
|
|
|
192
178
|
return isFound;
|
|
193
179
|
}
|
|
194
180
|
|
|
195
|
-
// arith_solve_plugin::is_invertible_const: a numeral that a variable's coefficient may be.
|
|
196
181
|
private getInvertibleConst(expr: number): bigint | undefined {
|
|
197
182
|
const manager = this.manager;
|
|
198
183
|
if (manager.getOp(expr) === OP_UMINUS) {
|
|
@@ -203,7 +188,6 @@ export class EqDer {
|
|
|
203
188
|
return value === 1n || value === -1n ? value : undefined;
|
|
204
189
|
}
|
|
205
190
|
|
|
206
|
-
// arith_solve_plugin::is_invertible_mul: a variable times an invertible coefficient.
|
|
207
191
|
private getInvertibleMul(expr: number) {
|
|
208
192
|
const manager = this.manager;
|
|
209
193
|
if (this.isVariable(expr)) return { variable: expr, coefficient: 1n };
|
|
@@ -219,7 +203,6 @@ export class EqDer {
|
|
|
219
203
|
return undefined;
|
|
220
204
|
}
|
|
221
205
|
|
|
222
|
-
// arith_solve_plugin::solve: lhs = rhs as variable = term.
|
|
223
206
|
private solveLinear(lhs: number, rhs: number): SolvedVar | undefined {
|
|
224
207
|
const manager = this.manager;
|
|
225
208
|
if (manager.sorts[lhs] !== SORT_INT) return undefined;
|
|
@@ -246,8 +229,6 @@ export class EqDer {
|
|
|
246
229
|
continue;
|
|
247
230
|
}
|
|
248
231
|
done.push(...todo);
|
|
249
|
-
// mk_term: the other summands times the inverse of the coefficient, negated on the
|
|
250
|
-
// variable's side.
|
|
251
232
|
const coefficient = 1n / mul.coefficient;
|
|
252
233
|
const isLeft = item.isLeft;
|
|
253
234
|
const terms = new RefVector(manager);
|
|
@@ -273,7 +254,6 @@ export class EqDer {
|
|
|
273
254
|
return undefined;
|
|
274
255
|
}
|
|
275
256
|
|
|
276
|
-
// arith_solve_plugin::mk_eq_core.
|
|
277
257
|
private mkArithEqCore(inputLeft: number, inputRight: number) {
|
|
278
258
|
const manager = this.manager;
|
|
279
259
|
const solved = this.solveLinear(inputLeft, inputRight);
|
|
@@ -306,8 +286,6 @@ export class EqDer {
|
|
|
306
286
|
return result;
|
|
307
287
|
}
|
|
308
288
|
|
|
309
|
-
// arith_solve_plugin::try_int_mul_solve: k*y = x becomes y = x div k and x mod k = 0, or x = 0
|
|
310
|
-
// when k is zero.
|
|
311
289
|
private tryIntMulSolve(atom: number) {
|
|
312
290
|
const manager = this.manager;
|
|
313
291
|
if (manager.sorts[manager.getArg(atom, 0)] !== SORT_INT) return -1;
|
|
@@ -341,7 +319,6 @@ export class EqDer {
|
|
|
341
319
|
return result;
|
|
342
320
|
}
|
|
343
321
|
|
|
344
|
-
// arith_solve_plugin::solve on a positive equality.
|
|
345
322
|
private solveArithEq(atom: number) {
|
|
346
323
|
const manager = this.manager;
|
|
347
324
|
const mulSolved = this.tryIntMulSolve(atom);
|
|
@@ -361,7 +338,6 @@ export class EqDer {
|
|
|
361
338
|
return result;
|
|
362
339
|
}
|
|
363
340
|
|
|
364
|
-
// basic_solve_plugin::solve.
|
|
365
341
|
private solveBasic(atom: number, isPositive: boolean): number {
|
|
366
342
|
const manager = this.manager;
|
|
367
343
|
let result = assign(manager, -1, atom);
|
|
@@ -409,8 +385,6 @@ export class EqDer {
|
|
|
409
385
|
return negated;
|
|
410
386
|
}
|
|
411
387
|
|
|
412
|
-
// der_sort_vars: the definitions in an order where each only uses the ones before it, dropping
|
|
413
|
-
// the definitions on a cycle.
|
|
414
388
|
private sortVars() {
|
|
415
389
|
const manager = this.manager;
|
|
416
390
|
const definitions = this.map;
|
|
@@ -489,7 +463,6 @@ export class EqDer {
|
|
|
489
463
|
}
|
|
490
464
|
}
|
|
491
465
|
|
|
492
|
-
// is_unconstrained: an integer variable that no other conjunct mentions.
|
|
493
466
|
private isUnconstrained(variable: number, term: number, position: number, conjs: number[]) {
|
|
494
467
|
const manager = this.manager;
|
|
495
468
|
const index = manager.values[variable];
|
|
@@ -500,7 +473,6 @@ export class EqDer {
|
|
|
500
473
|
);
|
|
501
474
|
}
|
|
502
475
|
|
|
503
|
-
// remove_unconstrained: a disequality on an unconstrained integer variable holds.
|
|
504
476
|
private removeUnconstrained(conjs: RefVector) {
|
|
505
477
|
const manager = this.manager;
|
|
506
478
|
let isReduced = false;
|