tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +117 -37
- 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 +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- 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 +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- 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 +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- 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 +27 -47
- 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 +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- 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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- 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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- 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 +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- 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 +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- 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 +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -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 +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -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 +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// abstract machine and the compiler that builds them: each pattern becomes a sequence of
|
|
3
|
-
// instructions, and the patterns that start with the same label share the instructions they have
|
|
4
|
-
// in common, so a term is matched against all of them at once and the matches come in Z3's order.
|
|
1
|
+
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { KIND_VAR, type AstManager } from "./ast";
|
|
6
3
|
import type { Context } from "./context";
|
|
7
4
|
import type { Enode } from "./enode";
|
|
@@ -26,8 +23,6 @@ export const JOINT_GROUND = 1;
|
|
|
26
23
|
export const JOINT_VAR = 2;
|
|
27
24
|
export const JOINT_NESTED = 3;
|
|
28
25
|
|
|
29
|
-
// A joint of a CONTINUE argument: a ground term, the register of a bound variable, or a depth-2
|
|
30
|
-
// joint (f ... (g ... X ...) ...), with g, the position of X in it, and X's register.
|
|
31
26
|
export interface Joint {
|
|
32
27
|
kind: number;
|
|
33
28
|
enode: Enode | null;
|
|
@@ -36,9 +31,6 @@ export interface Joint {
|
|
|
36
31
|
argPos: number;
|
|
37
32
|
}
|
|
38
33
|
|
|
39
|
-
// instruction and its subclasses in one shape. The fields an opcode does not use keep their
|
|
40
|
-
// defaults. reg is the register of CHECK, COMPARE (m_reg1), the filters, and the input register of
|
|
41
|
-
// BIND and IS_CGR. regs holds the input registers of GET_CGR and IS_CGR and the bindings of YIELD.
|
|
42
34
|
export interface Instruction {
|
|
43
35
|
op: number;
|
|
44
36
|
next: Instruction | null;
|
|
@@ -57,24 +49,18 @@ export interface Instruction {
|
|
|
57
49
|
}
|
|
58
50
|
|
|
59
51
|
export interface CodeTree {
|
|
60
|
-
rootLabel: number;
|
|
61
52
|
numArgs: number;
|
|
62
53
|
isFilteringCandidates: boolean;
|
|
63
54
|
numRegs: number;
|
|
64
55
|
numChoices: number;
|
|
65
56
|
root: Instruction;
|
|
66
57
|
candidates: Enode[];
|
|
67
|
-
// code_tree::m_candidate_gc_threshold: the number of candidates at which duplicates are dropped.
|
|
68
58
|
candidateGcThreshold: number;
|
|
69
59
|
}
|
|
70
60
|
|
|
71
|
-
// What the compiler needs from the matching abstract machine.
|
|
72
61
|
export interface LabelHasher {
|
|
73
|
-
// label_hasher.
|
|
74
62
|
getLabelHash(decl: number): number;
|
|
75
|
-
// mk_enode: the enode of a ground term, internalized at the quantifier's generation if needed.
|
|
76
63
|
getGroundEnode(expr: number, quantifier: number): Enode | null;
|
|
77
|
-
// The label hash of a ground term's enode, which set_lbl_hash gives it if it has none.
|
|
78
64
|
getLblHash(node: Enode): number;
|
|
79
65
|
}
|
|
80
66
|
|
|
@@ -82,7 +68,6 @@ const NOT_CHECKED = 0;
|
|
|
82
68
|
const CHECK_SET = 1;
|
|
83
69
|
const CHECK_SINGLETON = 2;
|
|
84
70
|
|
|
85
|
-
// FIND_BEST_CHILD_THRESHOLD and SIMPLE_SEQ_THRESHOLD.
|
|
86
71
|
const FIND_BEST_CHILD_THRESHOLD = 64;
|
|
87
72
|
const SIMPLE_SEQ_THRESHOLD = 4;
|
|
88
73
|
|
|
@@ -103,7 +88,14 @@ const mkInstruction = (op: number): Instruction => ({
|
|
|
103
88
|
joints: [],
|
|
104
89
|
});
|
|
105
90
|
|
|
106
|
-
|
|
91
|
+
const mkNullJoint = (): Joint => ({
|
|
92
|
+
kind: JOINT_NULL,
|
|
93
|
+
enode: null,
|
|
94
|
+
reg: 0,
|
|
95
|
+
decl: -1,
|
|
96
|
+
argPos: 0,
|
|
97
|
+
});
|
|
98
|
+
|
|
107
99
|
export const hasHash = (low: number, high: number, hash: number) =>
|
|
108
100
|
((hash < 32 ? low : high) & (1 << hash)) !== 0;
|
|
109
101
|
|
|
@@ -158,19 +150,15 @@ const mkInit = (numArgs: number) => {
|
|
|
158
150
|
return instr;
|
|
159
151
|
};
|
|
160
152
|
|
|
161
|
-
// The patterns are the terms of a multi-pattern, and firstIndex picks the one the tree starts with.
|
|
162
153
|
export class Compiler {
|
|
163
|
-
|
|
154
|
+
private manager: AstManager;
|
|
164
155
|
private registers: number[] = [];
|
|
165
|
-
// m_todo: the registers whose patterns are still to be processed.
|
|
166
156
|
private todo: number[] = [];
|
|
167
157
|
private aux: number[] = [];
|
|
168
|
-
// The register of each variable by de Bruijn index, -1 while it is unbound.
|
|
169
158
|
private vars: number[] = [];
|
|
170
159
|
private quantifier = -1;
|
|
171
160
|
private patterns: number[] = [];
|
|
172
161
|
private tree: CodeTree = {
|
|
173
|
-
rootLabel: -1,
|
|
174
162
|
numArgs: 0,
|
|
175
163
|
isFilteringCandidates: false,
|
|
176
164
|
numRegs: 0,
|
|
@@ -190,10 +178,11 @@ export class Compiler {
|
|
|
190
178
|
private seq: Instruction[] = [];
|
|
191
179
|
|
|
192
180
|
constructor(
|
|
193
|
-
private manager: AstManager,
|
|
194
181
|
private context: Context,
|
|
195
182
|
private hasher: LabelHasher,
|
|
196
|
-
) {
|
|
183
|
+
) {
|
|
184
|
+
this.manager = context.manager;
|
|
185
|
+
}
|
|
197
186
|
|
|
198
187
|
private getRegister(reg: number) {
|
|
199
188
|
return this.registers[reg] ?? -1;
|
|
@@ -229,7 +218,6 @@ export class Compiler {
|
|
|
229
218
|
this.vars.fill(-1, 0, numDecls);
|
|
230
219
|
}
|
|
231
220
|
|
|
232
|
-
// all_args_are_bound_vars.
|
|
233
221
|
private isAllArgsBoundVars(expr: number) {
|
|
234
222
|
const manager = this.manager;
|
|
235
223
|
return manager.everyArg(
|
|
@@ -238,7 +226,6 @@ export class Compiler {
|
|
|
238
226
|
);
|
|
239
227
|
}
|
|
240
228
|
|
|
241
|
-
// get_stats: the size of a pattern and its number of unbound variables.
|
|
242
229
|
private getStats(expr: number) {
|
|
243
230
|
const manager = this.manager;
|
|
244
231
|
let size = 0;
|
|
@@ -258,8 +245,6 @@ export class Compiler {
|
|
|
258
245
|
return { size, numUnboundVars };
|
|
259
246
|
}
|
|
260
247
|
|
|
261
|
-
// linearise_core: the registers in m_todo that do not need a BIND are processed first, then a
|
|
262
|
-
// single BIND or IS_CGR is produced, and the registers left and the new ones become m_todo.
|
|
263
248
|
private lineariseCore() {
|
|
264
249
|
const manager = this.manager;
|
|
265
250
|
const hasher = this.hasher;
|
|
@@ -348,7 +333,6 @@ export class Compiler {
|
|
|
348
333
|
this.aux = todo;
|
|
349
334
|
}
|
|
350
335
|
|
|
351
|
-
// get_num_bound_vars: the number of bound variables in a pattern, and whether it has unbound ones.
|
|
352
336
|
private getNumBoundVars(expr: number) {
|
|
353
337
|
const manager = this.manager;
|
|
354
338
|
let count = 0;
|
|
@@ -366,8 +350,6 @@ export class Compiler {
|
|
|
366
350
|
return { count, hasUnboundVars };
|
|
367
351
|
}
|
|
368
352
|
|
|
369
|
-
// gen_mp_filter: compiles a pattern whose variables are all bound, and returns the register that
|
|
370
|
-
// gets the enode congruent to it.
|
|
371
353
|
private genMpFilter(expr: number): number {
|
|
372
354
|
const manager = this.manager;
|
|
373
355
|
if (manager.isGround(expr)) {
|
|
@@ -394,8 +376,6 @@ export class Compiler {
|
|
|
394
376
|
return oreg;
|
|
395
377
|
}
|
|
396
378
|
|
|
397
|
-
// linearise_multi_pattern: the other patterns of a multi-pattern, the one with the most bound
|
|
398
|
-
// variables first.
|
|
399
379
|
private lineariseMultiPattern() {
|
|
400
380
|
const manager = this.manager;
|
|
401
381
|
const patterns = this.patterns;
|
|
@@ -439,35 +419,28 @@ export class Compiler {
|
|
|
439
419
|
)
|
|
440
420
|
hasDepth1Joint = true;
|
|
441
421
|
}
|
|
442
|
-
const nullJoint = (): Joint => ({
|
|
443
|
-
kind: JOINT_NULL,
|
|
444
|
-
enode: null,
|
|
445
|
-
reg: 0,
|
|
446
|
-
decl: -1,
|
|
447
|
-
argPos: 0,
|
|
448
|
-
});
|
|
449
422
|
const joints = manager.mapArgs(best, (arg): Joint => {
|
|
450
423
|
if (hasDepth1Joint) {
|
|
451
424
|
if (manager.kinds[arg] === KIND_VAR) {
|
|
452
425
|
const reg = this.vars[manager.values[arg]];
|
|
453
|
-
return reg >= 0 ? { ...
|
|
426
|
+
return reg >= 0 ? { ...mkNullJoint(), kind: JOINT_VAR, reg } : mkNullJoint();
|
|
454
427
|
}
|
|
455
428
|
if (manager.isGround(arg))
|
|
456
429
|
return {
|
|
457
|
-
...
|
|
430
|
+
...mkNullJoint(),
|
|
458
431
|
kind: JOINT_GROUND,
|
|
459
432
|
enode: this.hasher.getGroundEnode(arg, this.quantifier),
|
|
460
433
|
};
|
|
461
|
-
return
|
|
434
|
+
return mkNullJoint();
|
|
462
435
|
}
|
|
463
|
-
if (manager.kinds[arg] === KIND_VAR) return
|
|
436
|
+
if (manager.kinds[arg] === KIND_VAR) return mkNullJoint();
|
|
464
437
|
let argPos = -1;
|
|
465
438
|
for (let index = 0; index < manager.getNumArgs(arg) && argPos === -1; index++) {
|
|
466
439
|
const innerArg = manager.getArg(arg, index);
|
|
467
440
|
if (manager.kinds[innerArg] === KIND_VAR && this.vars[manager.values[innerArg]] >= 0)
|
|
468
441
|
argPos = index;
|
|
469
442
|
}
|
|
470
|
-
if (argPos === -1) return
|
|
443
|
+
if (argPos === -1) return mkNullJoint();
|
|
471
444
|
return {
|
|
472
445
|
kind: JOINT_NESTED,
|
|
473
446
|
enode: null,
|
|
@@ -488,7 +461,6 @@ export class Compiler {
|
|
|
488
461
|
}
|
|
489
462
|
}
|
|
490
463
|
|
|
491
|
-
// linearise: the instructions for the registers in m_todo, appended after head.
|
|
492
464
|
private linearise(head: Instruction, firstIndex: number) {
|
|
493
465
|
this.seq = [];
|
|
494
466
|
this.matchedExprs.clear();
|
|
@@ -562,7 +534,6 @@ export class Compiler {
|
|
|
562
534
|
return instr.enode !== null && node !== null && instr.enode.root === node.root;
|
|
563
535
|
}
|
|
564
536
|
|
|
565
|
-
// get_pat_lbl_hash: a ground pattern is a constant, hashed by its enode.
|
|
566
537
|
private getPatLblHash(reg: number) {
|
|
567
538
|
const expr = this.registers[reg];
|
|
568
539
|
if (this.manager.isGround(expr)) {
|
|
@@ -609,8 +580,6 @@ export class Compiler {
|
|
|
609
580
|
);
|
|
610
581
|
}
|
|
611
582
|
|
|
612
|
-
// get_compatibility_measure: how many instructions of the branch at child are compatible with the
|
|
613
|
-
// patterns in the registers, and whether the branch is too simple to look at.
|
|
614
583
|
private getCompatibilityMeasure(child: Instruction) {
|
|
615
584
|
const manager = this.manager;
|
|
616
585
|
this.toReset.length = 0;
|
|
@@ -660,8 +629,6 @@ export class Compiler {
|
|
|
660
629
|
if (index !== -1) this.todo.splice(index, 1);
|
|
661
630
|
}
|
|
662
631
|
|
|
663
|
-
// compiler::insert: follows the instructions compatible with the new pattern, then branches off
|
|
664
|
-
// with a CHOOSE where they stop.
|
|
665
632
|
private insertAt(start: Instruction, firstIndex: number) {
|
|
666
633
|
const manager = this.manager;
|
|
667
634
|
let head = start;
|
|
@@ -729,7 +696,6 @@ export class Compiler {
|
|
|
729
696
|
const hash = this.getPatLblHash(curr.reg);
|
|
730
697
|
this.setMark(curr.reg, CHECK_SET);
|
|
731
698
|
if (countBits(curr.lblLow) + countBits(curr.lblHigh) > 1) {
|
|
732
|
-
// insert_new_lbl_hash.
|
|
733
699
|
const filter = curr;
|
|
734
700
|
const low = filter.lblLow;
|
|
735
701
|
const high = filter.lblHigh;
|
|
@@ -757,7 +723,6 @@ export class Compiler {
|
|
|
757
723
|
if (curr === null) return;
|
|
758
724
|
const bestChild = this.findBestChild(curr);
|
|
759
725
|
if (bestChild === null) {
|
|
760
|
-
// head -> ... -> last -> new_child: CHOOSE(first_child) -> linearise.
|
|
761
726
|
const newChild = mkChoose(curr);
|
|
762
727
|
this.numChoices++;
|
|
763
728
|
this.setNext(last, newChild);
|
|
@@ -767,8 +732,6 @@ export class Compiler {
|
|
|
767
732
|
head = bestChild;
|
|
768
733
|
continue;
|
|
769
734
|
}
|
|
770
|
-
// head -> compatible -> new_child_head1: CHOOSE(new_child_head2) -> incompatible -> curr, and
|
|
771
|
-
// new_child_head2: NOOP -> linearise.
|
|
772
735
|
const firstChildHead = curr;
|
|
773
736
|
const newChildHead2 = mkInstruction(OP_NOOP);
|
|
774
737
|
const newChildHead1 = mkChoose(newChildHead2);
|
|
@@ -791,7 +754,6 @@ export class Compiler {
|
|
|
791
754
|
}
|
|
792
755
|
}
|
|
793
756
|
|
|
794
|
-
// mk_tree: a new code tree for a quantifier, which starts with the pattern at firstIndex.
|
|
795
757
|
mkTree(
|
|
796
758
|
quantifier: number,
|
|
797
759
|
patterns: number[],
|
|
@@ -801,7 +763,6 @@ export class Compiler {
|
|
|
801
763
|
const pattern = patterns[firstIndex];
|
|
802
764
|
const numArgs = this.manager.getNumArgs(pattern);
|
|
803
765
|
const tree: CodeTree = {
|
|
804
|
-
rootLabel: this.manager.decls[pattern],
|
|
805
766
|
numArgs,
|
|
806
767
|
isFilteringCandidates,
|
|
807
768
|
numRegs: numArgs + 1,
|
|
@@ -816,7 +777,6 @@ export class Compiler {
|
|
|
816
777
|
return tree;
|
|
817
778
|
}
|
|
818
779
|
|
|
819
|
-
// insert: adds a pattern to a code tree. A temporary tree records no trail.
|
|
820
780
|
insert(
|
|
821
781
|
tree: CodeTree,
|
|
822
782
|
quantifier: number,
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// matching abstract machine: it runs a code tree against a term, backtracking through the choices
|
|
3
|
-
// of BIND, CONTINUE and CHOOSE, and reports each match.
|
|
1
|
+
// Ported from Z3 (src/smt/mam.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import type { Context } from "./context";
|
|
5
3
|
import type { Enode } from "./enode";
|
|
6
4
|
import {
|
|
@@ -30,8 +28,6 @@ import { shrink } from "./array";
|
|
|
30
28
|
|
|
31
29
|
export type OnMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) => void;
|
|
32
30
|
|
|
33
|
-
// backtrack_point: the instruction to resume, the generation to restore, the term a BIND is at,
|
|
34
|
-
// and the terms a CONTINUE goes through.
|
|
35
31
|
interface BacktrackPoint {
|
|
36
32
|
instr: Instruction;
|
|
37
33
|
oldMaxGeneration: number;
|
|
@@ -41,16 +37,13 @@ interface BacktrackPoint {
|
|
|
41
37
|
end: number;
|
|
42
38
|
}
|
|
43
39
|
|
|
44
|
-
// GET_CGR1 to GET_CGR6 filter their arguments by the parent labels, GET_CGRN does not.
|
|
45
40
|
const MAX_FILTERED_GET_CGR_ARGS = 6;
|
|
46
41
|
|
|
47
42
|
export class Interpreter {
|
|
48
43
|
private registers: (Enode | null)[] = [];
|
|
49
|
-
// m_bindings: the terms a YIELD reports, which the match callback does not keep.
|
|
50
44
|
private bindings: Enode[] = [];
|
|
51
45
|
private backtrackStack: BacktrackPoint[] = [];
|
|
52
46
|
private top = 0;
|
|
53
|
-
// m_max_generation: the largest generation of a term the match went through.
|
|
54
47
|
private maxGeneration = 0;
|
|
55
48
|
|
|
56
49
|
constructor(
|
|
@@ -74,7 +67,6 @@ export class Interpreter {
|
|
|
74
67
|
return point;
|
|
75
68
|
}
|
|
76
69
|
|
|
77
|
-
// get_first_f_app and get_next_f_app: the next congruence root with the label in the class.
|
|
78
70
|
private getNextFApp(label: number, numArgs: number, first: Enode, start: Enode | null) {
|
|
79
71
|
let curr = start === null ? first : start.next;
|
|
80
72
|
if (start !== null && curr === first) return null;
|
|
@@ -88,7 +80,6 @@ export class Interpreter {
|
|
|
88
80
|
return null;
|
|
89
81
|
}
|
|
90
82
|
|
|
91
|
-
// exec_is_cgr: whether the class has a term with the label and the arguments of the registers.
|
|
92
83
|
private isCgr(instr: Instruction) {
|
|
93
84
|
const registers = this.registers;
|
|
94
85
|
const args: Enode[] = [];
|
|
@@ -124,8 +115,6 @@ export class Interpreter {
|
|
|
124
115
|
);
|
|
125
116
|
}
|
|
126
117
|
|
|
127
|
-
// mk_depth1_vector: the relevant decl-parents of the class of node where it is argument argIndex.
|
|
128
|
-
// init_continue drops a vector of limit terms or more, so this stops at limit and returns null.
|
|
129
118
|
private getDepth1Vector(node: Enode, decl: number, argIndex: number, limit: number) {
|
|
130
119
|
const root = node.root;
|
|
131
120
|
const result: Enode[] = [];
|
|
@@ -137,7 +126,6 @@ export class Interpreter {
|
|
|
137
126
|
return result;
|
|
138
127
|
}
|
|
139
128
|
|
|
140
|
-
// mk_depth2_vector, which stops at limit like getDepth1Vector.
|
|
141
129
|
private getDepth2Vector(joint: Joint, decl: number, argIndex: number, limit: number) {
|
|
142
130
|
const node = this.registers[joint.reg];
|
|
143
131
|
if (node === null || node === undefined) return null;
|
|
@@ -156,7 +144,6 @@ export class Interpreter {
|
|
|
156
144
|
return result;
|
|
157
145
|
}
|
|
158
146
|
|
|
159
|
-
// SET_VAR's filter: whether the class of each input register has a parent with the label.
|
|
160
147
|
private hasParentLabels(instr: Instruction) {
|
|
161
148
|
for (const reg of instr.regs) {
|
|
162
149
|
const root = (this.registers[reg] as Enode).root;
|
|
@@ -171,7 +158,6 @@ export class Interpreter {
|
|
|
171
158
|
return null;
|
|
172
159
|
}
|
|
173
160
|
|
|
174
|
-
// init_continue: the smallest candidate vector among the joints, or all terms with the label.
|
|
175
161
|
private initContinue(instr: Instruction) {
|
|
176
162
|
const context = this.context;
|
|
177
163
|
const label = instr.label;
|
|
@@ -224,8 +210,6 @@ export class Interpreter {
|
|
|
224
210
|
for (let index = 0; index < numArgs; index++) this.registers[oreg + index] = node.getArg(index);
|
|
225
211
|
}
|
|
226
212
|
|
|
227
|
-
// The backtracking step of execute_core: the instruction to resume at, or null when the top choice
|
|
228
|
-
// is exhausted and was popped.
|
|
229
213
|
private resume(point: BacktrackPoint): Instruction | null {
|
|
230
214
|
const instr = point.instr;
|
|
231
215
|
if (instr.op === OP_CHOOSE) {
|
|
@@ -260,8 +244,6 @@ export class Interpreter {
|
|
|
260
244
|
return null;
|
|
261
245
|
}
|
|
262
246
|
|
|
263
|
-
// execute_core: runs the tree against a term, one instruction at a time, and backtracks when an
|
|
264
|
-
// instruction fails. It returns false when the search is canceled.
|
|
265
247
|
executeCore(tree: CodeTree, node: Enode) {
|
|
266
248
|
const context = this.context;
|
|
267
249
|
const registers = this.registers;
|
|
@@ -385,8 +367,6 @@ export class Interpreter {
|
|
|
385
367
|
}
|
|
386
368
|
}
|
|
387
369
|
|
|
388
|
-
// execute: runs the tree against its candidates. A tree that filters its candidates runs each
|
|
389
|
-
// term once.
|
|
390
370
|
execute(tree: CodeTree) {
|
|
391
371
|
const context = this.context;
|
|
392
372
|
const seen = tree.isFilteringCandidates ? new Set<Enode>() : null;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
// Ported from Z3 (src/ast/rewriter/maximize_ac_sharing.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
|
|
3
|
-
// binary applications that reuses the pairs it made before.
|
|
4
|
-
import { OP_ADD, OP_OR, type AstManager } from "./ast";
|
|
2
|
+
import { OP_ADD, OP_OR } from "./ast";
|
|
5
3
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
6
4
|
import { shrink } from "./array";
|
|
7
5
|
|
|
@@ -11,32 +9,21 @@ interface SharingEntry {
|
|
|
11
9
|
second: number;
|
|
12
10
|
}
|
|
13
11
|
|
|
14
|
-
// MAX_NUM_ARGS_FOR_OPT: pairs are reused only for fewer arguments.
|
|
15
12
|
const MAX_NUM_ARGS_FOR_OPT = 128;
|
|
16
13
|
|
|
17
14
|
export class MaxBvSharing extends RewriterTpl {
|
|
18
|
-
// Z3
|
|
19
|
-
// compares the kind without the family. bvmul has the kind of or and of +, so those are shared.
|
|
15
|
+
// Z3 compares the kind without the family, and bvmul has the kind of or and of +, so those are shared.
|
|
20
16
|
private isInit = false;
|
|
21
|
-
// m_entries and m_cache: the pairs made, which hold their arguments. The cache maps a declaration
|
|
22
|
-
// and the lower of two arguments to the higher ones, so a pair matches in either order.
|
|
23
17
|
private entries: SharingEntry[] = [];
|
|
24
18
|
private pairCache = new Map<number, Map<number, Set<number>>>();
|
|
25
19
|
private pairScopes: number[] = [];
|
|
26
20
|
|
|
27
|
-
constructor(manager: AstManager) {
|
|
28
|
-
super(manager);
|
|
29
|
-
}
|
|
30
|
-
|
|
31
21
|
reduceApp(decl: number, args: number[], sort: number) {
|
|
32
22
|
const manager = this.manager;
|
|
33
23
|
const op = manager.funcDecls[decl].op;
|
|
34
24
|
if (!this.isInit || (op !== OP_OR && op !== OP_ADD) || args.length <= 2) return -1;
|
|
35
25
|
return manager.withTemporaries(() => {
|
|
36
26
|
const pending = [...args];
|
|
37
|
-
// Reuses the pairs made before, the first pair found first. Z3 scans every pair again after
|
|
38
|
-
// each reuse, but no pair is made meanwhile, so before the reused pair only the pairs with
|
|
39
|
-
// the argument it became can match.
|
|
40
27
|
for (let merged = 0; pending.length > 1 && pending.length < MAX_NUM_ARGS_FOR_OPT;) {
|
|
41
28
|
let pairFirst = -1;
|
|
42
29
|
let pairSecond = -1;
|
|
@@ -72,7 +59,6 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
72
59
|
});
|
|
73
60
|
}
|
|
74
61
|
|
|
75
|
-
// entry orders its arguments by id, and pop_scope releases them in that order.
|
|
76
62
|
private insert(decl: number, first: number, second: number) {
|
|
77
63
|
const isOrdered = this.manager.ids[first] <= this.manager.ids[second];
|
|
78
64
|
this.entries.push({
|
|
@@ -101,7 +87,6 @@ export class MaxBvSharing extends RewriterTpl {
|
|
|
101
87
|
this.pairScopes.push(this.entries.length);
|
|
102
88
|
}
|
|
103
89
|
|
|
104
|
-
// pop_scope: releases the pairs made since the matching push, the last first.
|
|
105
90
|
popScope() {
|
|
106
91
|
const size = this.pairScopes.pop() as number;
|
|
107
92
|
for (let index = this.entries.length - 1; index >= size; index--) {
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/smt_model_checker.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// the candidate model satisfies each relevant quantifier: the negated body, with the model's
|
|
3
|
-
// interpretations in place of the uninterpreted symbols, goes to an auxiliary context. A model of it
|
|
4
|
-
// is a counterexample that becomes an instance of the quantifier.
|
|
1
|
+
// Ported from Z3 (src/smt/smt_model_checker.cpp), MIT license, see z3-license.txt.
|
|
5
2
|
import { SmtInvariantError } from "../../../errors";
|
|
6
3
|
import { KIND_APP, OP_NOT, OP_OR, SORT_BOOL, type AstManager } from "./ast";
|
|
7
4
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
@@ -14,32 +11,21 @@ import type { DefaultQuantifierManager } from "./quantifier-manager";
|
|
|
14
11
|
import { RefVector } from "./ref-vector";
|
|
15
12
|
import { VarSubst } from "./var-subst";
|
|
16
13
|
|
|
17
|
-
// qi_params' mbqi_max_cexs and mbqi_max_iterations.
|
|
18
14
|
const MBQI_MAX_CEXS = 1;
|
|
19
15
|
const MBQI_MAX_ITERATIONS = 1000;
|
|
20
16
|
|
|
21
|
-
// An instance whose bindings start at offset in m_pinned_exprs.
|
|
22
17
|
interface Instance {
|
|
23
18
|
quantifier: number;
|
|
24
19
|
offset: number;
|
|
25
20
|
generation: number;
|
|
26
21
|
}
|
|
27
22
|
|
|
28
|
-
// The auxiliary context: Z3 keeps one context for every check and pushes a scope per check, so the
|
|
29
|
-
// restricted checks continue from the complete check, with its phases and activities. It runs without
|
|
30
|
-
// MBQI and with relevancy level 0, and preprocesses the assertions of a check together.
|
|
31
23
|
class AuxContext {
|
|
32
24
|
private context: Context;
|
|
33
25
|
private asserted: AssertedFormulas;
|
|
34
|
-
// theory_polymorphism's m_qhead: the number of formulas when it last added an assumption. Its
|
|
35
|
-
// trail restores it when the scope is popped, and no formula is asserted outside the scopes.
|
|
36
26
|
private polyQhead = 0;
|
|
37
|
-
// theory_polymorphism's m_assumption, which holds its last assumption.
|
|
38
27
|
private polyAssumption = -1;
|
|
39
28
|
|
|
40
|
-
// The context makes its asserted formulas first. Its theories hold only constants that exist by
|
|
41
|
-
// now, so setup_context can run at once. init_aux_context copies the kernel's smt_params, so the
|
|
42
|
-
// context has a model finder too, though it never sees a quantifier.
|
|
43
29
|
constructor(private manager: AstManager) {
|
|
44
30
|
this.asserted = new AssertedFormulas(manager);
|
|
45
31
|
this.context = new Context(manager, { isMbqi: true, relevancyLevel: 0 });
|
|
@@ -57,15 +43,11 @@ class AuxContext {
|
|
|
57
43
|
this.polyQhead = 0;
|
|
58
44
|
}
|
|
59
45
|
|
|
60
|
-
// assert_expr_core: outside the search, the scopes of the last search are popped first.
|
|
61
46
|
assert(formula: number) {
|
|
62
47
|
this.context.popToBaseLevel();
|
|
63
48
|
this.asserted.assertExpr(formula);
|
|
64
49
|
}
|
|
65
50
|
|
|
66
|
-
// A model of the assertions, or whether they are unsatisfiable or undecided. Z3 registers
|
|
67
|
-
// theory_polymorphism, which assumes a fresh constant whenever formulas were asserted since its
|
|
68
|
-
// last assumption.
|
|
69
51
|
check() {
|
|
70
52
|
const context = this.context;
|
|
71
53
|
context.popToBaseLevel();
|
|
@@ -90,7 +72,6 @@ export class ModelChecker {
|
|
|
90
72
|
private maxCexs = MBQI_MAX_CEXS;
|
|
91
73
|
private iterationIndex = 0;
|
|
92
74
|
private newInstances: Instance[] = [];
|
|
93
|
-
// m_pinned_exprs: the bindings and quantifier of each new instance, held until they are asserted.
|
|
94
75
|
private pinnedExprs: RefVector;
|
|
95
76
|
private root2value = new Map<Enode, number>();
|
|
96
77
|
private value2expr: Map<number, number> | null = null;
|
|
@@ -120,8 +101,6 @@ export class ModelChecker {
|
|
|
120
101
|
return value2expr;
|
|
121
102
|
}
|
|
122
103
|
|
|
123
|
-
// enode::get_eq_enode_with_min_gen: the first node of the class with generation 0, or else the
|
|
124
|
-
// first with the least generation.
|
|
125
104
|
private getEqEnodeWithMinGen(root: Enode) {
|
|
126
105
|
const context = this.context;
|
|
127
106
|
let result = root;
|
|
@@ -139,8 +118,6 @@ export class ModelChecker {
|
|
|
139
118
|
return result;
|
|
140
119
|
}
|
|
141
120
|
|
|
142
|
-
// get_type_compatible_term: a term of the context that stands for a value, which may be a fresh
|
|
143
|
-
// constant.
|
|
144
121
|
private getTypeCompatibleTerm(value: number): number {
|
|
145
122
|
const manager = this.manager;
|
|
146
123
|
let freshTerm: number;
|
|
@@ -164,8 +141,6 @@ export class ModelChecker {
|
|
|
164
141
|
return freshTerm;
|
|
165
142
|
}
|
|
166
143
|
|
|
167
|
-
// assert_neg_q_m: asserts the negated body under the model, with fresh constants for the
|
|
168
|
-
// variables, which sks holds.
|
|
169
144
|
private assertNegQM(aux: AuxContext, quantifier: number, model: ProtoModel, sks: RefVector) {
|
|
170
145
|
const manager = this.manager;
|
|
171
146
|
const data = manager.getQuantifier(quantifier);
|
|
@@ -177,8 +152,8 @@ export class ModelChecker {
|
|
|
177
152
|
const sk = manager.mkFreshConst(null, sort);
|
|
178
153
|
sks.set(numDecls - index - 1, sk);
|
|
179
154
|
if (model.isFinite(sort)) {
|
|
180
|
-
// restrict_to_universe: ast_manager::mk_or, which keeps a single disjunct in an or.
|
|
181
155
|
const universe = model.getKnownUniverse(sort).map((value) => manager.mkEq(sk, value));
|
|
156
|
+
// ast_manager::mk_or keeps a single disjunct in an or.
|
|
182
157
|
const constraint = manager.mkApp(OP_OR, universe, SORT_BOOL);
|
|
183
158
|
manager.incRef(constraint);
|
|
184
159
|
aux.assert(constraint);
|
|
@@ -207,7 +182,7 @@ export class ModelChecker {
|
|
|
207
182
|
const sk = sks[numDecls - index - 1];
|
|
208
183
|
let skValue = cex.getSomeConstInterp(manager.decls[sk]);
|
|
209
184
|
if (isUsingInv) {
|
|
210
|
-
const inv = this.modelFinder.getInv(quantifier, index, skValue
|
|
185
|
+
const inv = this.modelFinder.getInv(quantifier, index, skValue);
|
|
211
186
|
if (inv === null) return false;
|
|
212
187
|
maxGeneration = Math.max(maxGeneration, inv.generation);
|
|
213
188
|
skValue = inv.term;
|
|
@@ -226,13 +201,11 @@ export class ModelChecker {
|
|
|
226
201
|
return true;
|
|
227
202
|
}
|
|
228
203
|
|
|
229
|
-
// check(q): whether the model satisfies the quantifier. A counterexample becomes an instance.
|
|
230
204
|
private checkQuantifier(quantifier: number, model: ProtoModel) {
|
|
231
205
|
const manager = this.manager;
|
|
232
206
|
const aux = this.aux ?? new AuxContext(manager);
|
|
233
207
|
this.aux = aux;
|
|
234
208
|
aux.push();
|
|
235
|
-
// sks: the fresh constants of the variables, which are released before the scope is popped.
|
|
236
209
|
const sks = new RefVector(manager);
|
|
237
210
|
const isSatisfied = this.checkInScope(aux, quantifier, model, sks);
|
|
238
211
|
sks.reset();
|
|
@@ -247,9 +220,7 @@ export class ModelChecker {
|
|
|
247
220
|
const completeCex = aux.check();
|
|
248
221
|
if (completeCex === "unsat") return true;
|
|
249
222
|
if (completeCex === "unknown") return false;
|
|
250
|
-
// complete_cex and cex hold their models.
|
|
251
223
|
completeCex.incRef();
|
|
252
|
-
// Try to find instances from the instantiation sets first.
|
|
253
224
|
this.modelFinder.restrictSksToInstSet(quantifier, sks, (expr) => aux.assert(expr));
|
|
254
225
|
let numNewInstances = 0;
|
|
255
226
|
for (;;) {
|
|
@@ -267,7 +238,6 @@ export class ModelChecker {
|
|
|
267
238
|
return false;
|
|
268
239
|
}
|
|
269
240
|
|
|
270
|
-
// add_blocking_clause: diseqs and blocking_clause hold their terms until it is asserted.
|
|
271
241
|
private addBlockingClause(aux: AuxContext, cex: ProtoModel, sks: number[]) {
|
|
272
242
|
const manager = this.manager;
|
|
273
243
|
const diseqs = new RefVector(manager);
|
|
@@ -285,7 +255,6 @@ export class ModelChecker {
|
|
|
285
255
|
let isFoundRelevant = false;
|
|
286
256
|
let numFailures = 0;
|
|
287
257
|
for (const quantifier of this.qmanager.quantifiers) {
|
|
288
|
-
// Z3's resource limit cancels the checks, and the search gives up.
|
|
289
258
|
if (context.checkCanceled()) return { isFoundRelevant, numFailures: numFailures + 1 };
|
|
290
259
|
if (
|
|
291
260
|
!context.isRelevant(quantifier) ||
|
|
@@ -298,7 +267,6 @@ export class ModelChecker {
|
|
|
298
267
|
return { isFoundRelevant, numFailures };
|
|
299
268
|
}
|
|
300
269
|
|
|
301
|
-
// check(md, root2value): whether the model satisfies every relevant quantifier.
|
|
302
270
|
check(model: ProtoModel, root2value: Map<Enode, number>) {
|
|
303
271
|
this.root2value = root2value;
|
|
304
272
|
if (this.qmanager.quantifiers.length === 0) return true;
|
|
@@ -324,7 +292,6 @@ export class ModelChecker {
|
|
|
324
292
|
return this.newInstances.length > 0;
|
|
325
293
|
}
|
|
326
294
|
|
|
327
|
-
// restart_eh: assert_new_instances.
|
|
328
295
|
restartEh() {
|
|
329
296
|
const context = this.context;
|
|
330
297
|
for (const instance of this.newInstances) {
|
|
@@ -340,7 +307,6 @@ export class ModelChecker {
|
|
|
340
307
|
});
|
|
341
308
|
this.qmanager.addInstance(instance.quantifier, nodes, instance.generation);
|
|
342
309
|
}
|
|
343
|
-
// reset_new_instances.
|
|
344
310
|
this.pinnedExprs.reset();
|
|
345
311
|
this.newInstances = [];
|
|
346
312
|
}
|