tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- 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 +797 -782
- 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 +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -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 +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -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 +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- 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 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- 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 +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -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 +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -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 +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- 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 +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- 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 +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -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/typed-tier.ts +6535 -0
- 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
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,8 +1,19 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt. The
|
|
2
|
-
// preprocessing that the SMT kernel runs on its assertions before search.
|
|
3
1
|
import { SmtInvariantError } from "../../../errors";
|
|
4
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
AstManager,
|
|
4
|
+
KIND_APP,
|
|
5
|
+
KIND_QUANTIFIER,
|
|
6
|
+
OP_AND,
|
|
7
|
+
OP_EQ,
|
|
8
|
+
OP_ITE,
|
|
9
|
+
OP_NOT,
|
|
10
|
+
OP_OR,
|
|
11
|
+
SORT_BOOL,
|
|
12
|
+
QUANTIFIER_FORALL,
|
|
13
|
+
} from "./ast";
|
|
5
14
|
import { mkNot } from "./ast-util";
|
|
15
|
+
import { simplifyInjAxiom } from "./inj-axiom";
|
|
16
|
+
import { MacroManager } from "./macro-finder";
|
|
6
17
|
import { DefinedNames, Nnf } from "./nnf";
|
|
7
18
|
import { PatternInference } from "./pattern-inference";
|
|
8
19
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
@@ -10,10 +21,9 @@ import { PullQuant } from "./pull-quant";
|
|
|
10
21
|
import { RefVector } from "./ref-vector";
|
|
11
22
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
12
23
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
24
|
+
import type { SmtConfig } from "./smt-setup";
|
|
13
25
|
|
|
14
|
-
|
|
15
|
-
// cache lives as long as the assertions, like Z3's.
|
|
16
|
-
class PatternInferenceRw extends RewriterTpl {
|
|
26
|
+
export class PatternInferenceRw extends RewriterTpl {
|
|
17
27
|
constructor(
|
|
18
28
|
manager: AstManager,
|
|
19
29
|
private inference: PatternInference,
|
|
@@ -24,9 +34,9 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
24
34
|
reduceQuantifier(expr: number, body: number) {
|
|
25
35
|
const manager = this.manager;
|
|
26
36
|
const data = manager.getQuantifier(expr);
|
|
27
|
-
if (
|
|
37
|
+
if (data.kind !== QUANTIFIER_FORALL || data.patterns.length > 0) return -1;
|
|
28
38
|
const quantifier = manager.withTemporaries(() => {
|
|
29
|
-
const inferred = this.inference.infer(data.sorts.length, body, data.weight);
|
|
39
|
+
const inferred = this.inference.infer(data.sorts.length, body, data.weight, data.noPatterns);
|
|
30
40
|
const withPatterns = manager.mkQuantifier({ ...data, body, patterns: inferred.patterns });
|
|
31
41
|
return inferred.weight === data.weight
|
|
32
42
|
? withPatterns
|
|
@@ -38,9 +48,6 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
38
48
|
});
|
|
39
49
|
});
|
|
40
50
|
if (manager.getQuantifier(quantifier).patterns.length > 0) return quantifier;
|
|
41
|
-
// pi_pull_quantifiers: pulling the nested quantifiers out may give the body a pattern. The
|
|
42
|
-
// quantifier with the new patterns replaces new_q at once, and the pulled quantifier and
|
|
43
|
-
// pull_quant's cache go when reduce_quantifier returns.
|
|
44
51
|
const pull = new PullQuant(manager);
|
|
45
52
|
const pulled = pull.rewrite(quantifier);
|
|
46
53
|
const pulledData = manager.getQuantifier(pulled);
|
|
@@ -61,12 +68,10 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
61
68
|
}
|
|
62
69
|
}
|
|
63
70
|
|
|
64
|
-
// Z3's Knuth-Bendix style order for propagate_values: values are smallest, then deeper terms are
|
|
65
|
-
// greater.
|
|
66
71
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
67
72
|
if (left === right) return false;
|
|
68
|
-
const isLeftValue = manager.
|
|
69
|
-
const isRightValue = manager.
|
|
73
|
+
const isLeftValue = manager.isValue(left);
|
|
74
|
+
const isRightValue = manager.isValue(right);
|
|
70
75
|
if (!isLeftValue && isRightValue) return true;
|
|
71
76
|
if (isLeftValue && !isRightValue) return false;
|
|
72
77
|
if (manager.depths[left] !== manager.depths[right])
|
|
@@ -83,8 +88,6 @@ const isGreater = (manager: AstManager, left: number, right: number): boolean =>
|
|
|
83
88
|
return false;
|
|
84
89
|
};
|
|
85
90
|
|
|
86
|
-
// expr_substitution under scoped_expr_substitution: the first entry for a key wins, and pop removes
|
|
87
|
-
// the entries since the matching push. The map and the trail hold their keys and values.
|
|
88
91
|
class Substitution {
|
|
89
92
|
readonly map = new Map<number, number>();
|
|
90
93
|
private trail: RefVector;
|
|
@@ -119,11 +122,9 @@ class Substitution {
|
|
|
119
122
|
this.trail.shrink(size);
|
|
120
123
|
}
|
|
121
124
|
|
|
122
|
-
// update_substitution: a ground equality is oriented by the order, and any other formula maps to
|
|
123
|
-
// true, or its atom to false.
|
|
124
125
|
update(expr: number) {
|
|
125
126
|
const manager = this.manager;
|
|
126
|
-
if (manager.
|
|
127
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
127
128
|
const left = manager.getArg(expr, 0);
|
|
128
129
|
const right = manager.getArg(expr, 1);
|
|
129
130
|
if (isGreater(manager, left, right)) {
|
|
@@ -140,15 +141,12 @@ class Substitution {
|
|
|
140
141
|
}
|
|
141
142
|
}
|
|
142
143
|
|
|
143
|
-
// asserted_formulas: the assertions of a context. Each assertion is rewritten when it is asserted,
|
|
144
|
-
// and reduce preprocesses the new ones. Their units and oriented equalities then rewrite the later
|
|
145
|
-
// assertions. Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
146
|
-
// A pushed scope: the number of formulas when it began, and m_inconsistent_old.
|
|
147
144
|
interface AssertedScope {
|
|
148
145
|
numFormulas: number;
|
|
149
146
|
isInconsistent: boolean;
|
|
150
147
|
}
|
|
151
148
|
|
|
149
|
+
// Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
152
150
|
export class AssertedFormulas {
|
|
153
151
|
private formulas: RefVector;
|
|
154
152
|
private qhead = 0;
|
|
@@ -156,31 +154,37 @@ export class AssertedFormulas {
|
|
|
156
154
|
private rewriter: Rewriter;
|
|
157
155
|
private isEliminatingAnd = false;
|
|
158
156
|
private isReducePending = true;
|
|
157
|
+
private isNnfCnf = true;
|
|
158
|
+
private isEq2Ineq = false;
|
|
159
159
|
private names: DefinedNames;
|
|
160
160
|
private patternInference: PatternInferenceRw;
|
|
161
161
|
private bvSharing: MaxBvSharing;
|
|
162
|
-
|
|
163
|
-
|
|
162
|
+
hasQuantifiers = false;
|
|
163
|
+
readonly macros: MacroManager;
|
|
164
164
|
isInconsistent = false;
|
|
165
|
-
|
|
165
|
+
isPreprocessing = true;
|
|
166
166
|
private numLazyScopes = 0;
|
|
167
167
|
private scopes: AssertedScope[] = [];
|
|
168
168
|
|
|
169
|
-
constructor(
|
|
169
|
+
constructor(
|
|
170
|
+
private manager: AstManager,
|
|
171
|
+
private isFindingMacros = false,
|
|
172
|
+
) {
|
|
170
173
|
this.formulas = new RefVector(manager);
|
|
174
|
+
this.macros = new MacroManager(manager);
|
|
171
175
|
this.substitution = new Substitution(manager);
|
|
172
|
-
|
|
176
|
+
// set_eliminate_and turns coalesce_chars off when smt.string_solver is seq, its default, so
|
|
177
|
+
// string literals reach the seq theory as concatenations of units.
|
|
178
|
+
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
173
179
|
this.names = new DefinedNames(manager);
|
|
174
180
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
175
181
|
this.bvSharing = new MaxBvSharing(manager);
|
|
176
182
|
}
|
|
177
183
|
|
|
178
|
-
// push_scope: the scope is pushed when a formula is asserted in it.
|
|
179
184
|
push() {
|
|
180
185
|
this.numLazyScopes++;
|
|
181
186
|
}
|
|
182
187
|
|
|
183
|
-
// pop_scope: removes the formulas, names and substitutions since the matching push.
|
|
184
188
|
pop() {
|
|
185
189
|
if (this.numLazyScopes > 0) {
|
|
186
190
|
this.numLazyScopes--;
|
|
@@ -190,6 +194,7 @@ export class AssertedFormulas {
|
|
|
190
194
|
this.scopes.pop();
|
|
191
195
|
this.isInconsistent = scope.isInconsistent;
|
|
192
196
|
this.bvSharing.popScope();
|
|
197
|
+
this.macros.popScope();
|
|
193
198
|
this.names.pop();
|
|
194
199
|
this.substitution.pop();
|
|
195
200
|
this.formulas.shrink(scope.numFormulas);
|
|
@@ -197,12 +202,12 @@ export class AssertedFormulas {
|
|
|
197
202
|
this.flushCache();
|
|
198
203
|
}
|
|
199
204
|
|
|
200
|
-
// force_push: the pushed formulas are already reduced and committed.
|
|
201
205
|
private forcePush() {
|
|
202
206
|
for (; this.numLazyScopes > 0; this.numLazyScopes--) {
|
|
203
207
|
this.substitution.push();
|
|
204
208
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
205
209
|
this.names.push();
|
|
210
|
+
this.macros.pushScope();
|
|
206
211
|
this.bvSharing.pushScope();
|
|
207
212
|
}
|
|
208
213
|
}
|
|
@@ -211,49 +216,71 @@ export class AssertedFormulas {
|
|
|
211
216
|
this.forcePush();
|
|
212
217
|
const manager = this.manager;
|
|
213
218
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
219
|
+
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
220
|
+
this.isReducePending = true;
|
|
221
|
+
if (!this.isPreprocessing) {
|
|
222
|
+
this.pushAssertion(expr, this.formulas);
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
214
225
|
this.setEliminateAnd(false);
|
|
215
226
|
const rewritten = this.rewriter.rewrite(expr);
|
|
216
|
-
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
217
227
|
this.pushAssertion(rewritten, this.formulas);
|
|
218
228
|
manager.decRef(rewritten);
|
|
219
|
-
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
// The setup's parameters, which set_eliminate_and gives the rewriter.
|
|
232
|
+
setup(config: SmtConfig) {
|
|
233
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
234
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
235
|
+
this.isFindingMacros ||= config.isFindingMacros;
|
|
220
236
|
}
|
|
221
237
|
|
|
222
238
|
getNumFormulas() {
|
|
223
239
|
return this.formulas.size;
|
|
224
240
|
}
|
|
225
241
|
|
|
226
|
-
|
|
227
|
-
|
|
242
|
+
getFormulas() {
|
|
243
|
+
return this.formulas.items;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
// Like internalize_assertions, nothing is committed once the formulas are inconsistent.
|
|
228
247
|
reduce() {
|
|
229
248
|
if (this.qhead === this.formulas.size) return [];
|
|
230
|
-
if (!this.isInconsistent) this.reduceCore();
|
|
249
|
+
if (!this.isInconsistent && (this.hasQuantifiers || this.isPreprocessing)) this.reduceCore();
|
|
231
250
|
if (this.isInconsistent) return [];
|
|
232
251
|
const result = this.formulas.items.slice(this.qhead);
|
|
252
|
+
if (this.isFindingMacros) this.macros.markForbidden(result);
|
|
233
253
|
for (const formula of result) this.substitution.update(formula);
|
|
234
254
|
this.qhead = this.formulas.size;
|
|
235
255
|
return result;
|
|
236
256
|
}
|
|
237
257
|
|
|
238
|
-
// asserted_formulas::reduce: each step but the last stops the preprocessing when a formula is
|
|
239
|
-
// false.
|
|
240
258
|
private reduceCore() {
|
|
259
|
+
if (this.macros.hasMacros()) this.findMacros();
|
|
241
260
|
this.setEliminateAnd(false);
|
|
242
261
|
this.propagateValues();
|
|
243
262
|
if (this.isInconsistent) return;
|
|
244
|
-
this.
|
|
245
|
-
this.nnfCnf();
|
|
263
|
+
this.findMacros();
|
|
246
264
|
if (this.isInconsistent) return;
|
|
265
|
+
if (this.isNnfCnf || this.hasQuantifiers) {
|
|
266
|
+
this.isReducePending = true;
|
|
267
|
+
this.nnfCnf();
|
|
268
|
+
if (this.isInconsistent) return;
|
|
269
|
+
}
|
|
247
270
|
this.setEliminateAnd(true);
|
|
248
271
|
this.reduceAsserted();
|
|
249
272
|
if (this.isInconsistent) return;
|
|
273
|
+
if (this.hasQuantifiers && this.simplifyFormulas((formula) => this.refineInjAxiom(formula)))
|
|
274
|
+
this.isReducePending = true;
|
|
275
|
+
if (this.isInconsistent) return;
|
|
276
|
+
this.findMacros();
|
|
277
|
+
if (this.isInconsistent) return;
|
|
250
278
|
if (
|
|
251
279
|
this.hasQuantifiers &&
|
|
252
280
|
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula))
|
|
253
281
|
)
|
|
254
282
|
this.isReducePending = true;
|
|
255
283
|
if (this.isInconsistent) return;
|
|
256
|
-
// max_bv_sharing, whose post_op reduces the formulas again.
|
|
257
284
|
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
258
285
|
this.isReducePending = true;
|
|
259
286
|
if (this.isInconsistent) return;
|
|
@@ -265,8 +292,6 @@ export class AssertedFormulas {
|
|
|
265
292
|
this.flushCache();
|
|
266
293
|
}
|
|
267
294
|
|
|
268
|
-
// push_assertion: splits conjunctions and negated disjunctions. A false formula makes the
|
|
269
|
-
// assertions inconsistent.
|
|
270
295
|
private pushAssertion(expr: number, result: RefVector) {
|
|
271
296
|
const manager = this.manager;
|
|
272
297
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -286,7 +311,6 @@ export class AssertedFormulas {
|
|
|
286
311
|
if (op === OP_NOT && manager.getOp(manager.getArg(expr, 0)) === OP_OR) {
|
|
287
312
|
const disjunction = manager.getArg(expr, 0);
|
|
288
313
|
for (let index = 0; index < manager.getNumArgs(disjunction); index++) {
|
|
289
|
-
// narg holds the negation while it is pushed.
|
|
290
314
|
const negation = mkNot(manager, manager.getArg(disjunction, index));
|
|
291
315
|
manager.incRef(negation);
|
|
292
316
|
this.pushAssertion(negation, result);
|
|
@@ -297,7 +321,23 @@ export class AssertedFormulas {
|
|
|
297
321
|
result.push(expr);
|
|
298
322
|
}
|
|
299
323
|
|
|
300
|
-
|
|
324
|
+
private refineInjAxiom(formula: number) {
|
|
325
|
+
const manager = this.manager;
|
|
326
|
+
const refined =
|
|
327
|
+
manager.kinds[formula] === KIND_QUANTIFIER ? simplifyInjAxiom(manager, formula) : undefined;
|
|
328
|
+
if (refined !== undefined) return refined;
|
|
329
|
+
manager.incRef(formula);
|
|
330
|
+
return formula;
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
private findMacros() {
|
|
334
|
+
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
335
|
+
this.isReducePending = true;
|
|
336
|
+
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
337
|
+
this.flushCache();
|
|
338
|
+
this.reduceAsserted();
|
|
339
|
+
}
|
|
340
|
+
|
|
301
341
|
private flushCache() {
|
|
302
342
|
this.rewriter.setSubstitution(this.substitution.map);
|
|
303
343
|
}
|
|
@@ -307,18 +347,16 @@ export class AssertedFormulas {
|
|
|
307
347
|
this.isEliminatingAnd = isEliminatingAnd;
|
|
308
348
|
this.isReducePending = true;
|
|
309
349
|
this.rewriter.setEliminatingAnd(isEliminatingAnd);
|
|
350
|
+
this.rewriter.setEq2Ineq(this.isEq2Ineq);
|
|
310
351
|
this.flushCache();
|
|
311
352
|
}
|
|
312
353
|
|
|
313
|
-
// swap_asserted_formulas: the new formulas replace those from qhead on.
|
|
314
354
|
private swapFormulas(formulas: RefVector) {
|
|
315
355
|
this.formulas.shrink(this.qhead);
|
|
316
356
|
for (const formula of formulas.items) this.formulas.push(formula);
|
|
317
357
|
formulas.reset();
|
|
318
358
|
}
|
|
319
359
|
|
|
320
|
-
// simplify_fmls: a formula that simplify changes is split again. simplify returns its result with
|
|
321
|
-
// a reference. Whether a formula changed.
|
|
322
360
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
323
361
|
const manager = this.manager;
|
|
324
362
|
const formulas = new RefVector(manager);
|
|
@@ -337,17 +375,12 @@ export class AssertedFormulas {
|
|
|
337
375
|
return isChanged;
|
|
338
376
|
}
|
|
339
377
|
|
|
340
|
-
// reduce_asserted_formulas: the rewriter rewrites the formulas, unless they are already in its
|
|
341
|
-
// normal form.
|
|
342
378
|
private reduceAsserted() {
|
|
343
379
|
if (!this.isReducePending) return;
|
|
344
380
|
this.simplifyFormulas((formula) => this.rewriter.rewrite(formula));
|
|
345
381
|
this.isReducePending = false;
|
|
346
382
|
}
|
|
347
383
|
|
|
348
|
-
// asserted_formulas::propagate_values: a forward and a backward pass that rewrite each formula with
|
|
349
|
-
// the committed substitution and the units of the formulas before it. Z3 stops after one round,
|
|
350
|
-
// since the passes add no formula. When a formula changed, reduce-asserted rewrites them all.
|
|
351
384
|
private propagateValues() {
|
|
352
385
|
const manager = this.manager;
|
|
353
386
|
const substitution = this.substitution;
|
|
@@ -376,8 +409,6 @@ export class AssertedFormulas {
|
|
|
376
409
|
if (numPropagated > 0) this.reduceAsserted();
|
|
377
410
|
}
|
|
378
411
|
|
|
379
|
-
// asserted_formulas::nnf_cnf: one NNF object normalizes every formula, and the rewriter, which does
|
|
380
|
-
// not eliminate and yet, rewrites each normal form and the definitions of the names it introduced.
|
|
381
412
|
private nnfCnf() {
|
|
382
413
|
const manager = this.manager;
|
|
383
414
|
const nnf = new Nnf(manager, this.names);
|
|
@@ -400,8 +431,6 @@ export class AssertedFormulas {
|
|
|
400
431
|
nnf.release();
|
|
401
432
|
}
|
|
402
433
|
|
|
403
|
-
// asserted_formulas::flatten_clauses: an ite at the top becomes two clauses, and a conjunction
|
|
404
|
-
// that occurs in one binary clause is distributed.
|
|
405
434
|
private flattenClauses() {
|
|
406
435
|
const manager = this.manager;
|
|
407
436
|
const mkNegation = (expr: number) =>
|
|
@@ -1,12 +1,26 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt. A
|
|
2
|
-
// total order on expressions that does not depend on their ids. The rewriter sorts a disjunction
|
|
3
|
-
// only when its arguments are out of this order.
|
|
4
1
|
import {
|
|
2
|
+
FAMILY_ARRAY,
|
|
3
|
+
FAMILY_BV,
|
|
4
|
+
FAMILY_CHAR,
|
|
5
|
+
FAMILY_DATATYPE,
|
|
6
|
+
FAMILY_FPA,
|
|
7
|
+
FAMILY_LABEL,
|
|
5
8
|
FAMILY_MODEL_VALUE,
|
|
9
|
+
FAMILY_RECFUN,
|
|
10
|
+
FAMILY_SEQ,
|
|
6
11
|
FAMILY_USER,
|
|
7
12
|
KIND_APP,
|
|
8
13
|
KIND_QUANTIFIER,
|
|
9
14
|
KIND_VAR,
|
|
15
|
+
OP_ALGEBRAIC_NUM,
|
|
16
|
+
OP_BV_NUM,
|
|
17
|
+
OP_DT_ACCESSOR,
|
|
18
|
+
OP_DT_CONSTRUCTOR,
|
|
19
|
+
OP_DT_RECOGNISER,
|
|
20
|
+
OP_SEQ_SKOLEM,
|
|
21
|
+
OP_FPA_NUM,
|
|
22
|
+
OP_FUN_CASE_PRED,
|
|
23
|
+
OP_LABEL,
|
|
10
24
|
OP_ITE,
|
|
11
25
|
OP_NUM,
|
|
12
26
|
OP_PATTERN,
|
|
@@ -14,31 +28,38 @@ import {
|
|
|
14
28
|
type AstManager,
|
|
15
29
|
type SmtSymbol,
|
|
16
30
|
} from "./ast";
|
|
31
|
+
import { getAccessorConstructor } from "./datatype-decl-plugin";
|
|
17
32
|
import { Rational } from "./rational";
|
|
18
33
|
|
|
19
|
-
// The parts of a func_decl that lt compares: its name, parameters, domain and range.
|
|
20
34
|
interface DeclKey {
|
|
21
35
|
name: SmtSymbol;
|
|
22
|
-
parameters: (number | Rational)[];
|
|
36
|
+
parameters: (number | Rational | SmtSymbol)[];
|
|
23
37
|
domain: number[];
|
|
24
38
|
range: number;
|
|
25
39
|
}
|
|
26
40
|
|
|
27
|
-
// Z3's PARAM_INT, PARAM_AST and PARAM_RATIONAL kinds order the parameters of builtin declarations.
|
|
28
41
|
const PARAM_INT = 0;
|
|
29
|
-
const
|
|
42
|
+
const PARAM_AST = 1;
|
|
43
|
+
const PARAM_SYMBOL = 2;
|
|
44
|
+
const PARAM_ZSTRING = 3;
|
|
45
|
+
const PARAM_RATIONAL = 4;
|
|
46
|
+
const PARAM_EXTERNAL = 6;
|
|
30
47
|
|
|
31
48
|
const compareValues = (first: number, second: number) =>
|
|
32
49
|
first === second ? 0 : first < second ? -1 : 1;
|
|
33
50
|
|
|
34
|
-
const compareParameters = (
|
|
51
|
+
const compareParameters = (
|
|
52
|
+
first: number | Rational | SmtSymbol,
|
|
53
|
+
second: number | Rational | SmtSymbol,
|
|
54
|
+
) =>
|
|
35
55
|
first instanceof Rational && second instanceof Rational
|
|
36
56
|
? first.compare(second)
|
|
37
57
|
: typeof first === "number" && typeof second === "number"
|
|
38
58
|
? compareValues(first, second)
|
|
39
|
-
:
|
|
59
|
+
: typeof first === "string" && typeof second === "string"
|
|
60
|
+
? compareNames(first, second)
|
|
61
|
+
: 0;
|
|
40
62
|
|
|
41
|
-
// lt on symbols: numerical symbols come first, by number, and other names compare by their bytes.
|
|
42
63
|
const compareNames = (first: SmtSymbol, second: SmtSymbol) => {
|
|
43
64
|
if (first === second) return 0;
|
|
44
65
|
if (typeof first === "number")
|
|
@@ -47,12 +68,36 @@ const compareNames = (first: SmtSymbol, second: SmtSymbol) => {
|
|
|
47
68
|
return first < second ? -1 : 1;
|
|
48
69
|
};
|
|
49
70
|
|
|
71
|
+
const getSeqParameters = (manager: AstManager, expr: number) => {
|
|
72
|
+
const decl = manager.funcDecls[manager.decls[expr]];
|
|
73
|
+
const chars = manager.getString(expr);
|
|
74
|
+
if (chars !== undefined) return [PARAM_ZSTRING, String.fromCodePoint(...chars)];
|
|
75
|
+
const numbers = decl.parameters.flatMap((parameter) => [PARAM_INT, parameter]);
|
|
76
|
+
return decl.op === OP_SEQ_SKOLEM ? [PARAM_SYMBOL, decl.name, ...numbers] : numbers;
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
const getDatatypeParameters = (manager: AstManager, decl: number) => {
|
|
80
|
+
const funcDecl = manager.funcDecls[decl];
|
|
81
|
+
const name = funcDecl.name;
|
|
82
|
+
if (funcDecl.op === OP_DT_CONSTRUCTOR) return [PARAM_SYMBOL, name];
|
|
83
|
+
if (funcDecl.op === OP_DT_ACCESSOR)
|
|
84
|
+
return [
|
|
85
|
+
PARAM_SYMBOL,
|
|
86
|
+
name,
|
|
87
|
+
PARAM_SYMBOL,
|
|
88
|
+
manager.funcDecls[getAccessorConstructor(manager, decl)].name,
|
|
89
|
+
];
|
|
90
|
+
const target = manager.funcDecls[funcDecl.parameters[0]].name;
|
|
91
|
+
return funcDecl.op === OP_DT_RECOGNISER
|
|
92
|
+
? [PARAM_AST, target, PARAM_SYMBOL, name]
|
|
93
|
+
: [PARAM_AST, target];
|
|
94
|
+
};
|
|
95
|
+
|
|
50
96
|
const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
51
97
|
const decl = manager.funcDecls[manager.decls[expr]];
|
|
52
98
|
const range = manager.sorts[expr];
|
|
53
99
|
if (decl.family === FAMILY_USER)
|
|
54
100
|
return { name: decl.name, parameters: [], domain: decl.domain, range };
|
|
55
|
-
// A numeral's declaration has the parameters (value, is_int), and a model value's (index, sort).
|
|
56
101
|
if (decl.op === OP_NUM) {
|
|
57
102
|
const isInt = range === SORT_INT;
|
|
58
103
|
return {
|
|
@@ -64,21 +109,118 @@ const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
|
64
109
|
}
|
|
65
110
|
if (decl.family === FAMILY_MODEL_VALUE)
|
|
66
111
|
return { name: decl.name, parameters: [PARAM_INT, manager.values[expr]], domain: [], range };
|
|
112
|
+
if (decl.op === OP_ALGEBRAIC_NUM)
|
|
113
|
+
return {
|
|
114
|
+
name: decl.name,
|
|
115
|
+
parameters: [PARAM_EXTERNAL, manager.getAlgebraicId(expr)],
|
|
116
|
+
domain: [],
|
|
117
|
+
range,
|
|
118
|
+
};
|
|
119
|
+
if (decl.op === OP_BV_NUM)
|
|
120
|
+
return {
|
|
121
|
+
name: decl.name,
|
|
122
|
+
parameters: [
|
|
123
|
+
PARAM_RATIONAL,
|
|
124
|
+
Rational.of(manager.getBvNumeralValue(expr)),
|
|
125
|
+
PARAM_INT,
|
|
126
|
+
manager.getBvSize(range),
|
|
127
|
+
],
|
|
128
|
+
domain: [],
|
|
129
|
+
range,
|
|
130
|
+
};
|
|
131
|
+
if (decl.family === FAMILY_ARRAY)
|
|
132
|
+
return { name: decl.name, parameters: [], domain: decl.domain, range };
|
|
133
|
+
// A case predicate has the parameters (index, definition), and the others an integer.
|
|
134
|
+
if (decl.family === FAMILY_RECFUN)
|
|
135
|
+
return {
|
|
136
|
+
name: decl.name,
|
|
137
|
+
parameters:
|
|
138
|
+
decl.op === OP_FUN_CASE_PRED
|
|
139
|
+
? [PARAM_INT, decl.parameters[0], PARAM_AST, manager.funcDecls[decl.parameters[1]].name]
|
|
140
|
+
: [PARAM_INT, decl.parameters[0]],
|
|
141
|
+
domain: decl.domain,
|
|
142
|
+
range,
|
|
143
|
+
};
|
|
144
|
+
if (decl.family === FAMILY_DATATYPE)
|
|
145
|
+
return {
|
|
146
|
+
name: decl.name,
|
|
147
|
+
parameters: getDatatypeParameters(manager, manager.decls[expr]),
|
|
148
|
+
domain: decl.domain,
|
|
149
|
+
range,
|
|
150
|
+
};
|
|
151
|
+
if (decl.family === FAMILY_BV || decl.family === FAMILY_FPA)
|
|
152
|
+
return {
|
|
153
|
+
name: decl.name,
|
|
154
|
+
parameters: decl.parameters.flatMap((parameter) => [
|
|
155
|
+
decl.op === OP_FPA_NUM ? PARAM_EXTERNAL : PARAM_INT,
|
|
156
|
+
parameter,
|
|
157
|
+
]),
|
|
158
|
+
domain: decl.domain,
|
|
159
|
+
range,
|
|
160
|
+
};
|
|
161
|
+
if (decl.family === FAMILY_SEQ || decl.family === FAMILY_CHAR)
|
|
162
|
+
return {
|
|
163
|
+
name: decl.name,
|
|
164
|
+
parameters: getSeqParameters(manager, expr),
|
|
165
|
+
domain: decl.domain,
|
|
166
|
+
range,
|
|
167
|
+
};
|
|
168
|
+
if (decl.family === FAMILY_LABEL) {
|
|
169
|
+
const names = manager
|
|
170
|
+
.getLabelNames(manager.decls[expr])
|
|
171
|
+
.flatMap((name) => [PARAM_SYMBOL, name]);
|
|
172
|
+
return {
|
|
173
|
+
name: decl.name,
|
|
174
|
+
parameters:
|
|
175
|
+
decl.op === OP_LABEL
|
|
176
|
+
? [PARAM_INT, manager.isLabelPositive(manager.decls[expr]) ? 1 : 0, ...names]
|
|
177
|
+
: names,
|
|
178
|
+
domain: decl.domain,
|
|
179
|
+
range,
|
|
180
|
+
};
|
|
181
|
+
}
|
|
67
182
|
const builtin = manager.getBuiltinSignature(decl.op, manager.getArgs(expr));
|
|
68
183
|
return { name: builtin.name, parameters: [], domain: builtin.domain, range };
|
|
69
184
|
};
|
|
70
185
|
|
|
71
|
-
const compareSorts = (manager: AstManager, first: number, second: number) =>
|
|
72
|
-
first === second
|
|
186
|
+
const compareSorts = (manager: AstManager, first: number, second: number): number => {
|
|
187
|
+
if (first === second) return 0;
|
|
188
|
+
const byName =
|
|
189
|
+
compareNames(manager.sortNames[first], manager.sortNames[second]) ||
|
|
190
|
+
compareValues(manager.getBvSize(first), manager.getBvSize(second)) ||
|
|
191
|
+
compareValues(manager.getSbits(first), manager.getSbits(second));
|
|
192
|
+
if (byName !== 0) return byName;
|
|
193
|
+
const firstParameters = manager.getSortParameters(first);
|
|
194
|
+
const secondParameters = manager.getSortParameters(second);
|
|
195
|
+
const byCount = compareValues(firstParameters.length, secondParameters.length);
|
|
196
|
+
if (byCount !== 0) return byCount;
|
|
197
|
+
for (let index = 0; index < firstParameters.length; index++) {
|
|
198
|
+
const byParameter = compareSorts(manager, firstParameters[index], secondParameters[index]);
|
|
199
|
+
if (byParameter !== 0) return byParameter;
|
|
200
|
+
}
|
|
201
|
+
return 0;
|
|
202
|
+
};
|
|
73
203
|
|
|
74
|
-
// Whether two applications of the same declaration have the same key: a user declaration's is its
|
|
75
|
-
// own, and a builtin's other than a numeral, model value or pattern follows from the sort of the
|
|
76
|
-
// argument that getBuiltinSignature reads and the range.
|
|
77
204
|
const isSameDeclKey = (manager: AstManager, first: number, second: number) => {
|
|
78
205
|
const decl = manager.funcDecls[manager.decls[first]];
|
|
79
206
|
if (decl.family === FAMILY_USER) return true;
|
|
80
|
-
if (
|
|
207
|
+
if (
|
|
208
|
+
decl.op === OP_NUM ||
|
|
209
|
+
decl.op === OP_BV_NUM ||
|
|
210
|
+
decl.op === OP_PATTERN ||
|
|
211
|
+
decl.family === FAMILY_MODEL_VALUE
|
|
212
|
+
)
|
|
81
213
|
return false;
|
|
214
|
+
if (
|
|
215
|
+
decl.family === FAMILY_BV ||
|
|
216
|
+
decl.family === FAMILY_ARRAY ||
|
|
217
|
+
decl.family === FAMILY_DATATYPE ||
|
|
218
|
+
decl.family === FAMILY_FPA ||
|
|
219
|
+
decl.family === FAMILY_SEQ ||
|
|
220
|
+
decl.family === FAMILY_CHAR ||
|
|
221
|
+
decl.family === FAMILY_RECFUN
|
|
222
|
+
)
|
|
223
|
+
return true;
|
|
82
224
|
const index = decl.op === OP_ITE ? 1 : 0;
|
|
83
225
|
return (
|
|
84
226
|
manager.sorts[first] === manager.sorts[second] &&
|
|
@@ -108,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
|
|
|
108
250
|
return compareSorts(manager, firstKey.range, secondKey.range);
|
|
109
251
|
};
|
|
110
252
|
|
|
111
|
-
const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
253
|
+
export const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
112
254
|
if (first === second) return 0;
|
|
113
255
|
const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
|
|
114
256
|
if (byKind !== 0) return byKind;
|
|
@@ -122,9 +264,10 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
122
264
|
const firstData = manager.getQuantifier(first);
|
|
123
265
|
const secondData = manager.getQuantifier(second);
|
|
124
266
|
const byHeader =
|
|
125
|
-
compareValues(firstData.
|
|
267
|
+
compareValues(firstData.kind, secondData.kind) ||
|
|
126
268
|
compareValues(firstData.sorts.length, secondData.sorts.length) ||
|
|
127
269
|
compareValues(firstData.patterns.length, secondData.patterns.length) ||
|
|
270
|
+
compareValues(firstData.noPatterns.length, secondData.noPatterns.length) ||
|
|
128
271
|
compareValues(firstData.weight, secondData.weight);
|
|
129
272
|
if (byHeader !== 0) return byHeader;
|
|
130
273
|
for (let index = 0; index < firstData.sorts.length; index++) {
|
|
@@ -133,8 +276,10 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
133
276
|
compareSorts(manager, firstData.sorts[index], secondData.sorts[index]);
|
|
134
277
|
if (byDecl !== 0) return byDecl;
|
|
135
278
|
}
|
|
136
|
-
|
|
137
|
-
|
|
279
|
+
const children = [...firstData.patterns, ...firstData.noPatterns];
|
|
280
|
+
const otherChildren = [...secondData.patterns, ...secondData.noPatterns];
|
|
281
|
+
for (let index = 0; index < children.length; index++) {
|
|
282
|
+
const byPattern = compareAsts(manager, children[index], otherChildren[index]);
|
|
138
283
|
if (byPattern !== 0) return byPattern;
|
|
139
284
|
}
|
|
140
285
|
return compareAsts(manager, firstData.body, secondData.body);
|
|
@@ -152,6 +297,5 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
152
297
|
return 0;
|
|
153
298
|
};
|
|
154
299
|
|
|
155
|
-
// lt: whether the first expression comes before the second.
|
|
156
300
|
export const isAstLess = (manager: AstManager, first: number, second: number) =>
|
|
157
301
|
compareAsts(manager, first, second) < 0;
|