tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 -1
- 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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -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 +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -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 +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +178 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +34 -16
- 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 +111 -39
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +30 -11
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -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 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -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 +219 -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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -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 +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -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 +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -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 +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2176 -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 +1210 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -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 +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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,16 +1,31 @@
|
|
|
1
|
-
// Ported from Z3 (src/solver/assertions/asserted_formulas.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import { SmtInvariantError } from "../../../errors";
|
|
3
|
-
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";
|
|
4
14
|
import { mkNot } from "./ast-util";
|
|
15
|
+
import { simplifyInjAxiom } from "./inj-axiom";
|
|
16
|
+
import { MacroManager } from "./macro-finder";
|
|
17
|
+
import { ElimBoundsRw } from "./elim-bounds";
|
|
5
18
|
import { DefinedNames, Nnf } from "./nnf";
|
|
6
19
|
import { PatternInference } from "./pattern-inference";
|
|
7
20
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
8
21
|
import { PullQuant } from "./pull-quant";
|
|
22
|
+
import { NgPushAppIteRw } from "./push-app-ite";
|
|
9
23
|
import { RefVector } from "./ref-vector";
|
|
10
24
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
11
25
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
26
|
+
import type { SmtConfig } from "./smt-setup";
|
|
12
27
|
|
|
13
|
-
class PatternInferenceRw extends RewriterTpl {
|
|
28
|
+
export class PatternInferenceRw extends RewriterTpl {
|
|
14
29
|
constructor(
|
|
15
30
|
manager: AstManager,
|
|
16
31
|
private inference: PatternInference,
|
|
@@ -21,9 +36,9 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
21
36
|
reduceQuantifier(expr: number, body: number) {
|
|
22
37
|
const manager = this.manager;
|
|
23
38
|
const data = manager.getQuantifier(expr);
|
|
24
|
-
if (
|
|
39
|
+
if (data.kind !== QUANTIFIER_FORALL || data.patterns.length > 0) return -1;
|
|
25
40
|
const quantifier = manager.withTemporaries(() => {
|
|
26
|
-
const inferred = this.inference.infer(data.sorts.length, body, data.weight);
|
|
41
|
+
const inferred = this.inference.infer(data.sorts.length, body, data.weight, data.noPatterns);
|
|
27
42
|
const withPatterns = manager.mkQuantifier({ ...data, body, patterns: inferred.patterns });
|
|
28
43
|
return inferred.weight === data.weight
|
|
29
44
|
? withPatterns
|
|
@@ -55,10 +70,47 @@ class PatternInferenceRw extends RewriterTpl {
|
|
|
55
70
|
}
|
|
56
71
|
}
|
|
57
72
|
|
|
73
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
74
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
75
|
+
readonly definitions: RefVector;
|
|
76
|
+
private lims: number[] = [];
|
|
77
|
+
|
|
78
|
+
constructor(
|
|
79
|
+
manager: AstManager,
|
|
80
|
+
private names: DefinedNames,
|
|
81
|
+
) {
|
|
82
|
+
super(manager);
|
|
83
|
+
this.definitions = new RefVector(manager);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
87
|
+
const manager = this.manager;
|
|
88
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
89
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
90
|
+
manager.incRef(ite);
|
|
91
|
+
const named = this.names.mkName(ite);
|
|
92
|
+
manager.decRef(ite);
|
|
93
|
+
if (named.definition === -1) return -1;
|
|
94
|
+
this.definitions.push(named.definition);
|
|
95
|
+
manager.decRef(named.definition);
|
|
96
|
+
manager.incRef(named.name);
|
|
97
|
+
return named.name;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
push() {
|
|
101
|
+
this.lims.push(this.definitions.size);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pop() {
|
|
105
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
106
|
+
this.lims.pop();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
58
110
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
59
111
|
if (left === right) return false;
|
|
60
|
-
const isLeftValue = manager.
|
|
61
|
-
const isRightValue = manager.
|
|
112
|
+
const isLeftValue = manager.isValue(left);
|
|
113
|
+
const isRightValue = manager.isValue(right);
|
|
62
114
|
if (!isLeftValue && isRightValue) return true;
|
|
63
115
|
if (isLeftValue && !isRightValue) return false;
|
|
64
116
|
if (manager.depths[left] !== manager.depths[right])
|
|
@@ -111,7 +163,7 @@ class Substitution {
|
|
|
111
163
|
|
|
112
164
|
update(expr: number) {
|
|
113
165
|
const manager = this.manager;
|
|
114
|
-
if (manager.
|
|
166
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
115
167
|
const left = manager.getArg(expr, 0);
|
|
116
168
|
const right = manager.getArg(expr, 1);
|
|
117
169
|
if (isGreater(manager, left, right)) {
|
|
@@ -133,6 +185,7 @@ interface AssertedScope {
|
|
|
133
185
|
isInconsistent: boolean;
|
|
134
186
|
}
|
|
135
187
|
|
|
188
|
+
// Like Z3, it holds its formulas, so that expressions are deleted in Z3's order.
|
|
136
189
|
export class AssertedFormulas {
|
|
137
190
|
private formulas: RefVector;
|
|
138
191
|
private qhead = 0;
|
|
@@ -140,21 +193,40 @@ export class AssertedFormulas {
|
|
|
140
193
|
private rewriter: Rewriter;
|
|
141
194
|
private isEliminatingAnd = false;
|
|
142
195
|
private isReducePending = true;
|
|
196
|
+
private isNnfCnf = true;
|
|
197
|
+
private isEq2Ineq = false;
|
|
198
|
+
private isEliminatingTermIte = false;
|
|
199
|
+
private isLiftingNonGroundIte = false;
|
|
200
|
+
private isEliminatingBounds = false;
|
|
143
201
|
private names: DefinedNames;
|
|
202
|
+
private termIteElim: ElimTermIteRw;
|
|
144
203
|
private patternInference: PatternInferenceRw;
|
|
145
204
|
private bvSharing: MaxBvSharing;
|
|
146
|
-
private
|
|
205
|
+
private ngLiftIte: NgPushAppIteRw;
|
|
206
|
+
private boundsElim: ElimBoundsRw;
|
|
207
|
+
hasQuantifiers = false;
|
|
208
|
+
readonly macros: MacroManager;
|
|
147
209
|
isInconsistent = false;
|
|
210
|
+
isPreprocessing = true;
|
|
148
211
|
private numLazyScopes = 0;
|
|
149
212
|
private scopes: AssertedScope[] = [];
|
|
150
213
|
|
|
151
|
-
constructor(
|
|
214
|
+
constructor(
|
|
215
|
+
private manager: AstManager,
|
|
216
|
+
private isFindingMacros = false,
|
|
217
|
+
) {
|
|
152
218
|
this.formulas = new RefVector(manager);
|
|
219
|
+
this.macros = new MacroManager(manager);
|
|
153
220
|
this.substitution = new Substitution(manager);
|
|
154
|
-
|
|
221
|
+
// set_eliminate_and turns coalesce_chars off when smt.string_solver is seq, its default, so
|
|
222
|
+
// string literals reach the seq theory as concatenations of units.
|
|
223
|
+
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
155
224
|
this.names = new DefinedNames(manager);
|
|
225
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
156
226
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
157
227
|
this.bvSharing = new MaxBvSharing(manager);
|
|
228
|
+
this.ngLiftIte = new NgPushAppIteRw(manager);
|
|
229
|
+
this.boundsElim = new ElimBoundsRw(manager);
|
|
158
230
|
}
|
|
159
231
|
|
|
160
232
|
push() {
|
|
@@ -170,7 +242,9 @@ export class AssertedFormulas {
|
|
|
170
242
|
this.scopes.pop();
|
|
171
243
|
this.isInconsistent = scope.isInconsistent;
|
|
172
244
|
this.bvSharing.popScope();
|
|
245
|
+
this.macros.popScope();
|
|
173
246
|
this.names.pop();
|
|
247
|
+
this.termIteElim.pop();
|
|
174
248
|
this.substitution.pop();
|
|
175
249
|
this.formulas.shrink(scope.numFormulas);
|
|
176
250
|
this.qhead = scope.numFormulas;
|
|
@@ -179,9 +253,13 @@ export class AssertedFormulas {
|
|
|
179
253
|
|
|
180
254
|
private forcePush() {
|
|
181
255
|
for (; this.numLazyScopes > 0; this.numLazyScopes--) {
|
|
256
|
+
this.reduce();
|
|
257
|
+
this.commit();
|
|
182
258
|
this.substitution.push();
|
|
183
259
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
184
260
|
this.names.push();
|
|
261
|
+
this.termIteElim.push();
|
|
262
|
+
this.macros.pushScope();
|
|
185
263
|
this.bvSharing.pushScope();
|
|
186
264
|
}
|
|
187
265
|
}
|
|
@@ -190,11 +268,35 @@ export class AssertedFormulas {
|
|
|
190
268
|
this.forcePush();
|
|
191
269
|
const manager = this.manager;
|
|
192
270
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
271
|
+
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
272
|
+
this.isReducePending = true;
|
|
273
|
+
if (!this.isPreprocessing) {
|
|
274
|
+
this.pushAssertion(expr, this.formulas);
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
193
277
|
this.setEliminateAnd(false);
|
|
194
278
|
const rewritten = this.rewriter.rewrite(expr);
|
|
195
|
-
if (manager.hasQuantifierFlags[expr]) this.hasQuantifiers = true;
|
|
196
279
|
this.pushAssertion(rewritten, this.formulas);
|
|
197
280
|
manager.decRef(rewritten);
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
// The setup's parameters, which set_eliminate_and gives the rewriter.
|
|
284
|
+
setup(config: SmtConfig) {
|
|
285
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
286
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
287
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
288
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
289
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
290
|
+
this.isFindingMacros ||= config.isFindingMacros;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
updateParams(config: SmtConfig) {
|
|
294
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
295
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
296
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
297
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
298
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
299
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
198
300
|
this.isReducePending = true;
|
|
199
301
|
}
|
|
200
302
|
|
|
@@ -202,43 +304,55 @@ export class AssertedFormulas {
|
|
|
202
304
|
return this.formulas.size;
|
|
203
305
|
}
|
|
204
306
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
this.qhead = this.formulas.size;
|
|
212
|
-
return result;
|
|
307
|
+
getFormulas() {
|
|
308
|
+
return this.formulas.items;
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
getQhead() {
|
|
312
|
+
return this.qhead;
|
|
213
313
|
}
|
|
214
314
|
|
|
215
|
-
|
|
315
|
+
commit(qhead = this.formulas.size) {
|
|
316
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
317
|
+
this.macros.markForbidden(committed);
|
|
318
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
319
|
+
this.qhead = qhead;
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
reduce() {
|
|
323
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
324
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
325
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
326
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
216
327
|
this.setEliminateAnd(false);
|
|
217
|
-
this.propagateValues();
|
|
218
|
-
if (this.
|
|
219
|
-
this.
|
|
220
|
-
this.nnfCnf();
|
|
221
|
-
if (this.isInconsistent) return;
|
|
328
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
329
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
330
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
222
331
|
this.setEliminateAnd(true);
|
|
223
|
-
this.reduceAsserted();
|
|
224
|
-
if (this.
|
|
225
|
-
if (
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
)
|
|
229
|
-
|
|
230
|
-
if (this.
|
|
231
|
-
if (this.
|
|
232
|
-
|
|
233
|
-
if (this.
|
|
234
|
-
this.reduceAsserted();
|
|
235
|
-
if (this.isInconsistent) return;
|
|
236
|
-
this.isReducePending = true;
|
|
237
|
-
this.flattenClauses();
|
|
238
|
-
if (this.isInconsistent) return;
|
|
332
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
333
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
334
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
335
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
336
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
337
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
338
|
+
return;
|
|
339
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
341
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
342
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
239
343
|
this.flushCache();
|
|
240
344
|
}
|
|
241
345
|
|
|
346
|
+
private isCanceled() {
|
|
347
|
+
return !this.manager.limit.inc();
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
351
|
+
if (!isApplying) return true;
|
|
352
|
+
step();
|
|
353
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
354
|
+
}
|
|
355
|
+
|
|
242
356
|
private pushAssertion(expr: number, result: RefVector) {
|
|
243
357
|
const manager = this.manager;
|
|
244
358
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -268,6 +382,58 @@ export class AssertedFormulas {
|
|
|
268
382
|
result.push(expr);
|
|
269
383
|
}
|
|
270
384
|
|
|
385
|
+
private refineInjAxiom(formula: number) {
|
|
386
|
+
const manager = this.manager;
|
|
387
|
+
const refined =
|
|
388
|
+
manager.kinds[formula] === KIND_QUANTIFIER ? simplifyInjAxiom(manager, formula) : undefined;
|
|
389
|
+
if (refined !== undefined) return refined;
|
|
390
|
+
manager.incRef(formula);
|
|
391
|
+
return formula;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private elimTermIte() {
|
|
395
|
+
const elim = this.termIteElim;
|
|
396
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
397
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
398
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
399
|
+
this.flushCache();
|
|
400
|
+
this.reduceAsserted();
|
|
401
|
+
elim.reset();
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
405
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
406
|
+
this.flushCache();
|
|
407
|
+
this.reduceAsserted();
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
private liftNonGroundIte() {
|
|
411
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
private refineInjAxioms() {
|
|
415
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
private elimBounds() {
|
|
419
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
420
|
+
}
|
|
421
|
+
|
|
422
|
+
private inferPatterns() {
|
|
423
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
private maximizeBvSharing() {
|
|
427
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
private findMacros() {
|
|
431
|
+
this.isReducePending = true;
|
|
432
|
+
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
433
|
+
this.flushCache();
|
|
434
|
+
this.reduceAsserted();
|
|
435
|
+
}
|
|
436
|
+
|
|
271
437
|
private flushCache() {
|
|
272
438
|
this.rewriter.setSubstitution(this.substitution.map);
|
|
273
439
|
}
|
|
@@ -277,6 +443,7 @@ export class AssertedFormulas {
|
|
|
277
443
|
this.isEliminatingAnd = isEliminatingAnd;
|
|
278
444
|
this.isReducePending = true;
|
|
279
445
|
this.rewriter.setEliminatingAnd(isEliminatingAnd);
|
|
446
|
+
this.rewriter.setEq2Ineq(this.isEq2Ineq);
|
|
280
447
|
this.flushCache();
|
|
281
448
|
}
|
|
282
449
|
|
|
@@ -289,19 +456,22 @@ export class AssertedFormulas {
|
|
|
289
456
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
290
457
|
const manager = this.manager;
|
|
291
458
|
const formulas = new RefVector(manager);
|
|
292
|
-
let isChanged = false;
|
|
293
459
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
294
460
|
const formula = this.formulas.items[index];
|
|
295
461
|
const result = simplify(formula);
|
|
296
462
|
if (result === formula) formulas.push(formula);
|
|
297
463
|
else {
|
|
298
464
|
this.pushAssertion(result, formulas);
|
|
299
|
-
|
|
465
|
+
this.isReducePending = true;
|
|
300
466
|
}
|
|
301
467
|
manager.decRef(result);
|
|
468
|
+
if (this.isCanceled()) {
|
|
469
|
+
formulas.reset();
|
|
470
|
+
return false;
|
|
471
|
+
}
|
|
302
472
|
}
|
|
303
473
|
this.swapFormulas(formulas);
|
|
304
|
-
return
|
|
474
|
+
return true;
|
|
305
475
|
}
|
|
306
476
|
|
|
307
477
|
private reduceAsserted() {
|
|
@@ -339,28 +509,42 @@ export class AssertedFormulas {
|
|
|
339
509
|
}
|
|
340
510
|
|
|
341
511
|
private nnfCnf() {
|
|
512
|
+
this.isReducePending = true;
|
|
342
513
|
const manager = this.manager;
|
|
343
514
|
const nnf = new Nnf(manager, this.names);
|
|
344
515
|
const formulas = new RefVector(manager);
|
|
345
516
|
const todo = new RefVector(manager);
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
517
|
+
const isFinished = (() => {
|
|
518
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
519
|
+
todo.reset();
|
|
520
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
521
|
+
todo.push(result);
|
|
522
|
+
if (this.isCanceled()) {
|
|
523
|
+
manager.decRef(result);
|
|
524
|
+
return false;
|
|
525
|
+
}
|
|
526
|
+
for (let position = 0; position < todo.size; position++) {
|
|
527
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
528
|
+
manager.decRef(result);
|
|
529
|
+
result = rewritten;
|
|
530
|
+
if (this.isCanceled()) {
|
|
531
|
+
manager.decRef(result);
|
|
532
|
+
return false;
|
|
533
|
+
}
|
|
534
|
+
this.pushAssertion(result, formulas);
|
|
535
|
+
}
|
|
352
536
|
manager.decRef(result);
|
|
353
|
-
result = rewritten;
|
|
354
|
-
this.pushAssertion(result, formulas);
|
|
355
537
|
}
|
|
356
|
-
|
|
357
|
-
}
|
|
358
|
-
this.swapFormulas(formulas);
|
|
538
|
+
return true;
|
|
539
|
+
})();
|
|
540
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
359
541
|
todo.reset();
|
|
542
|
+
formulas.reset();
|
|
360
543
|
nnf.release();
|
|
361
544
|
}
|
|
362
545
|
|
|
363
546
|
private flattenClauses() {
|
|
547
|
+
this.isReducePending = true;
|
|
364
548
|
const manager = this.manager;
|
|
365
549
|
const mkNegation = (expr: number) =>
|
|
366
550
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
|
|
@@ -1,10 +1,26 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/ast_lt.cpp, src/util/symbol.cpp), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
2
|
+
FAMILY_ARRAY,
|
|
3
|
+
FAMILY_BV,
|
|
4
|
+
FAMILY_CHAR,
|
|
5
|
+
FAMILY_DATATYPE,
|
|
6
|
+
FAMILY_FPA,
|
|
7
|
+
FAMILY_LABEL,
|
|
3
8
|
FAMILY_MODEL_VALUE,
|
|
9
|
+
FAMILY_RECFUN,
|
|
10
|
+
FAMILY_SEQ,
|
|
4
11
|
FAMILY_USER,
|
|
5
12
|
KIND_APP,
|
|
6
13
|
KIND_QUANTIFIER,
|
|
7
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,
|
|
8
24
|
OP_ITE,
|
|
9
25
|
OP_NUM,
|
|
10
26
|
OP_PATTERN,
|
|
@@ -12,27 +28,37 @@ import {
|
|
|
12
28
|
type AstManager,
|
|
13
29
|
type SmtSymbol,
|
|
14
30
|
} from "./ast";
|
|
31
|
+
import { getAccessorConstructor } from "./datatype-decl-plugin";
|
|
15
32
|
import { Rational } from "./rational";
|
|
16
33
|
|
|
17
34
|
interface DeclKey {
|
|
18
35
|
name: SmtSymbol;
|
|
19
|
-
parameters: (number | Rational)[];
|
|
36
|
+
parameters: (number | Rational | SmtSymbol)[];
|
|
20
37
|
domain: number[];
|
|
21
38
|
range: number;
|
|
22
39
|
}
|
|
23
40
|
|
|
24
41
|
const PARAM_INT = 0;
|
|
25
|
-
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;
|
|
26
47
|
|
|
27
48
|
const compareValues = (first: number, second: number) =>
|
|
28
49
|
first === second ? 0 : first < second ? -1 : 1;
|
|
29
50
|
|
|
30
|
-
const compareParameters = (
|
|
51
|
+
const compareParameters = (
|
|
52
|
+
first: number | Rational | SmtSymbol,
|
|
53
|
+
second: number | Rational | SmtSymbol,
|
|
54
|
+
) =>
|
|
31
55
|
first instanceof Rational && second instanceof Rational
|
|
32
56
|
? first.compare(second)
|
|
33
57
|
: typeof first === "number" && typeof second === "number"
|
|
34
58
|
? compareValues(first, second)
|
|
35
|
-
:
|
|
59
|
+
: typeof first === "string" && typeof second === "string"
|
|
60
|
+
? compareNames(first, second)
|
|
61
|
+
: 0;
|
|
36
62
|
|
|
37
63
|
const compareNames = (first: SmtSymbol, second: SmtSymbol) => {
|
|
38
64
|
if (first === second) return 0;
|
|
@@ -42,6 +68,31 @@ const compareNames = (first: SmtSymbol, second: SmtSymbol) => {
|
|
|
42
68
|
return first < second ? -1 : 1;
|
|
43
69
|
};
|
|
44
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
|
+
|
|
45
96
|
const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
46
97
|
const decl = manager.funcDecls[manager.decls[expr]];
|
|
47
98
|
const range = manager.sorts[expr];
|
|
@@ -58,18 +109,118 @@ const getDeclKey = (manager: AstManager, expr: number): DeclKey => {
|
|
|
58
109
|
}
|
|
59
110
|
if (decl.family === FAMILY_MODEL_VALUE)
|
|
60
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
|
+
}
|
|
61
182
|
const builtin = manager.getBuiltinSignature(decl.op, manager.getArgs(expr));
|
|
62
183
|
return { name: builtin.name, parameters: [], domain: builtin.domain, range };
|
|
63
184
|
};
|
|
64
185
|
|
|
65
|
-
const compareSorts = (manager: AstManager, first: number, second: number) =>
|
|
66
|
-
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
|
+
};
|
|
67
203
|
|
|
68
204
|
const isSameDeclKey = (manager: AstManager, first: number, second: number) => {
|
|
69
205
|
const decl = manager.funcDecls[manager.decls[first]];
|
|
70
206
|
if (decl.family === FAMILY_USER) return true;
|
|
71
|
-
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
|
+
)
|
|
72
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;
|
|
73
224
|
const index = decl.op === OP_ITE ? 1 : 0;
|
|
74
225
|
return (
|
|
75
226
|
manager.sorts[first] === manager.sorts[second] &&
|
|
@@ -113,9 +264,10 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
113
264
|
const firstData = manager.getQuantifier(first);
|
|
114
265
|
const secondData = manager.getQuantifier(second);
|
|
115
266
|
const byHeader =
|
|
116
|
-
compareValues(firstData.
|
|
267
|
+
compareValues(firstData.kind, secondData.kind) ||
|
|
117
268
|
compareValues(firstData.sorts.length, secondData.sorts.length) ||
|
|
118
269
|
compareValues(firstData.patterns.length, secondData.patterns.length) ||
|
|
270
|
+
compareValues(firstData.noPatterns.length, secondData.noPatterns.length) ||
|
|
119
271
|
compareValues(firstData.weight, secondData.weight);
|
|
120
272
|
if (byHeader !== 0) return byHeader;
|
|
121
273
|
for (let index = 0; index < firstData.sorts.length; index++) {
|
|
@@ -124,8 +276,10 @@ const compareAsts = (manager: AstManager, first: number, second: number): number
|
|
|
124
276
|
compareSorts(manager, firstData.sorts[index], secondData.sorts[index]);
|
|
125
277
|
if (byDecl !== 0) return byDecl;
|
|
126
278
|
}
|
|
127
|
-
|
|
128
|
-
|
|
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]);
|
|
129
283
|
if (byPattern !== 0) return byPattern;
|
|
130
284
|
}
|
|
131
285
|
return compareAsts(manager, firstData.body, secondData.body);
|