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,4 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/poly_rewriter.h, poly_rewriter_def.h), MIT license, see z3-license.txt.
|
|
2
1
|
import {
|
|
3
2
|
type AstManager,
|
|
4
3
|
KIND_APP,
|
|
@@ -8,26 +7,59 @@ import {
|
|
|
8
7
|
OP_GE,
|
|
9
8
|
OP_GT,
|
|
10
9
|
OP_IDIV,
|
|
10
|
+
OP_ITE,
|
|
11
11
|
OP_IS_INT,
|
|
12
12
|
OP_LE,
|
|
13
13
|
OP_LT,
|
|
14
14
|
OP_MOD,
|
|
15
|
+
OP_REM,
|
|
15
16
|
OP_MUL,
|
|
16
17
|
OP_NUM,
|
|
17
18
|
OP_SUB,
|
|
18
19
|
OP_TO_INT,
|
|
19
20
|
OP_TO_REAL,
|
|
20
21
|
OP_UMINUS,
|
|
22
|
+
OP_POWER,
|
|
23
|
+
OP_POWER0,
|
|
24
|
+
OP_SIN,
|
|
25
|
+
OP_COS,
|
|
26
|
+
OP_TAN,
|
|
27
|
+
OP_ASIN,
|
|
28
|
+
OP_ACOS,
|
|
29
|
+
OP_ATAN,
|
|
30
|
+
OP_SINH,
|
|
31
|
+
OP_COSH,
|
|
32
|
+
OP_TANH,
|
|
33
|
+
OP_ASINH,
|
|
34
|
+
OP_ACOSH,
|
|
35
|
+
OP_ATANH,
|
|
36
|
+
OP_EXP,
|
|
37
|
+
OP_ATAN2,
|
|
38
|
+
OP_LOG,
|
|
39
|
+
OP_PI,
|
|
40
|
+
OP_E,
|
|
41
|
+
OP_ALGEBRAIC_NUM,
|
|
21
42
|
SORT_INT,
|
|
22
43
|
} from "./ast";
|
|
44
|
+
import { isAstLess } from "./ast-lt";
|
|
45
|
+
import { ObjHashtable } from "./hashtable";
|
|
23
46
|
import { Rational } from "./rational";
|
|
24
47
|
import type { Rewrite } from "./rewriter-tpl";
|
|
25
48
|
|
|
26
49
|
export interface ArithRewriterOptions {
|
|
27
50
|
readonly isSom: boolean;
|
|
28
51
|
readonly isSortSums: boolean;
|
|
52
|
+
readonly isArithLhs: boolean;
|
|
29
53
|
readonly isArithIneqLhs: boolean;
|
|
30
54
|
readonly isGcdRounding: boolean;
|
|
55
|
+
readonly isAnumSimp: boolean;
|
|
56
|
+
readonly isExpandPower: boolean;
|
|
57
|
+
readonly isExpandTan: boolean;
|
|
58
|
+
readonly maxDegree: number;
|
|
59
|
+
readonly isHoistIte?: boolean;
|
|
60
|
+
readonly isHoistMul?: boolean;
|
|
61
|
+
readonly isFlat?: boolean;
|
|
62
|
+
readonly isElimRem?: boolean;
|
|
31
63
|
}
|
|
32
64
|
|
|
33
65
|
const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
@@ -38,6 +70,7 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
38
70
|
OP_MUL,
|
|
39
71
|
OP_IDIV,
|
|
40
72
|
OP_MOD,
|
|
73
|
+
OP_REM,
|
|
41
74
|
OP_ABS,
|
|
42
75
|
OP_LE,
|
|
43
76
|
OP_GE,
|
|
@@ -47,6 +80,26 @@ const ARITH_OPS: ReadonlySet<number> = new Set([
|
|
|
47
80
|
OP_TO_REAL,
|
|
48
81
|
OP_TO_INT,
|
|
49
82
|
OP_IS_INT,
|
|
83
|
+
OP_POWER,
|
|
84
|
+
OP_POWER0,
|
|
85
|
+
OP_SIN,
|
|
86
|
+
OP_COS,
|
|
87
|
+
OP_TAN,
|
|
88
|
+
OP_ASIN,
|
|
89
|
+
OP_ACOS,
|
|
90
|
+
OP_ATAN,
|
|
91
|
+
OP_SINH,
|
|
92
|
+
OP_COSH,
|
|
93
|
+
OP_TANH,
|
|
94
|
+
OP_ASINH,
|
|
95
|
+
OP_ACOSH,
|
|
96
|
+
OP_ATANH,
|
|
97
|
+
OP_EXP,
|
|
98
|
+
OP_ATAN2,
|
|
99
|
+
OP_LOG,
|
|
100
|
+
OP_PI,
|
|
101
|
+
OP_E,
|
|
102
|
+
OP_ALGEBRAIC_NUM,
|
|
50
103
|
]);
|
|
51
104
|
|
|
52
105
|
export class PolyRewriter {
|
|
@@ -64,14 +117,22 @@ export class PolyRewriter {
|
|
|
64
117
|
return { expr, depth };
|
|
65
118
|
}
|
|
66
119
|
|
|
120
|
+
protected isNumeral(expr: number) {
|
|
121
|
+
return this.manager.isNumeral(expr);
|
|
122
|
+
}
|
|
123
|
+
|
|
67
124
|
protected isZero(expr: number) {
|
|
68
|
-
return this.
|
|
125
|
+
return this.isNumeral(expr) && this.getValue(expr).isZero();
|
|
69
126
|
}
|
|
70
127
|
|
|
71
128
|
protected getValue(expr: number) {
|
|
72
129
|
return this.manager.getRationalValue(expr);
|
|
73
130
|
}
|
|
74
131
|
|
|
132
|
+
protected normalize(value: Rational) {
|
|
133
|
+
return value;
|
|
134
|
+
}
|
|
135
|
+
|
|
75
136
|
protected mkNumeral(value: Rational) {
|
|
76
137
|
return this.manager.mkNumeralOfSort(value, this.currSort);
|
|
77
138
|
}
|
|
@@ -88,6 +149,14 @@ export class PolyRewriter {
|
|
|
88
149
|
return this.manager.kinds[expr] === KIND_APP && ARITH_OPS.has(this.manager.getOp(expr));
|
|
89
150
|
}
|
|
90
151
|
|
|
152
|
+
protected mkAddTerm(args: number[]) {
|
|
153
|
+
return this.manager.mkApp(OP_ADD, args, this.currSort);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
protected mkMulTerm(args: number[]) {
|
|
157
|
+
return this.manager.mkApp(OP_MUL, args, this.currSort);
|
|
158
|
+
}
|
|
159
|
+
|
|
91
160
|
protected getNumMonomials(expr: number) {
|
|
92
161
|
return this.isAdd(expr) ? this.manager.getNumArgs(expr) : 1;
|
|
93
162
|
}
|
|
@@ -99,7 +168,7 @@ export class PolyRewriter {
|
|
|
99
168
|
protected getPowerProduct(expr: number) {
|
|
100
169
|
return this.isMul(expr) &&
|
|
101
170
|
this.manager.getNumArgs(expr) === 2 &&
|
|
102
|
-
this.
|
|
171
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
103
172
|
? this.manager.getArg(expr, 1)
|
|
104
173
|
: expr;
|
|
105
174
|
}
|
|
@@ -107,29 +176,31 @@ export class PolyRewriter {
|
|
|
107
176
|
protected getCoefficient(expr: number) {
|
|
108
177
|
return this.isMul(expr) &&
|
|
109
178
|
this.manager.getNumArgs(expr) === 2 &&
|
|
110
|
-
this.
|
|
179
|
+
this.isNumeral(this.manager.getArg(expr, 0))
|
|
111
180
|
? this.getValue(this.manager.getArg(expr, 0))
|
|
112
181
|
: Rational.one;
|
|
113
182
|
}
|
|
114
183
|
|
|
115
184
|
protected getOrdinal(expr: number) {
|
|
116
185
|
const manager = this.manager;
|
|
117
|
-
if (
|
|
118
|
-
return manager.ids[expr];
|
|
186
|
+
if (!this.isArithTerm(expr)) return manager.ids[expr];
|
|
119
187
|
if (this.isMul(expr)) {
|
|
120
|
-
return manager.ids[
|
|
121
|
-
manager.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr
|
|
122
|
-
];
|
|
188
|
+
return manager.ids[this.isNumeral(manager.getArg(expr, 0)) ? manager.getArg(expr, 1) : expr];
|
|
123
189
|
}
|
|
124
|
-
return
|
|
190
|
+
return this.isNumeral(expr) ? -1 : manager.ids[expr];
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
private isMonomialLess(first: number, second: number) {
|
|
194
|
+
return this.options.isArithIneqLhs
|
|
195
|
+
? this.getOrdinal(first) < this.getOrdinal(second)
|
|
196
|
+
: isAstLess(this.manager, first, second);
|
|
125
197
|
}
|
|
126
198
|
|
|
127
199
|
protected sortMonomials(monomials: number[], start: number) {
|
|
128
200
|
for (let index = start + 1; index < monomials.length; index++) {
|
|
129
201
|
const monomial = monomials[index];
|
|
130
|
-
const ordinal = this.getOrdinal(monomial);
|
|
131
202
|
let position = index;
|
|
132
|
-
for (; position > start && this.
|
|
203
|
+
for (; position > start && this.isMonomialLess(monomial, monomials[position - 1]); position--)
|
|
133
204
|
monomials[position] = monomials[position - 1];
|
|
134
205
|
monomials[position] = monomial;
|
|
135
206
|
}
|
|
@@ -139,15 +210,15 @@ export class PolyRewriter {
|
|
|
139
210
|
mkAddApp(args: number[]) {
|
|
140
211
|
if (args.length === 0) return this.mkNumeral(Rational.zero);
|
|
141
212
|
if (args.length === 1) return args[0];
|
|
142
|
-
return this.
|
|
213
|
+
return this.mkAddTerm(args);
|
|
143
214
|
}
|
|
144
215
|
|
|
145
216
|
mkMulApp(args: number[]): number {
|
|
146
217
|
if (args.length === 0) return this.mkNumeral(Rational.one);
|
|
147
218
|
if (args.length === 1) return args[0];
|
|
148
|
-
if (args.length > 2 && this.
|
|
219
|
+
if (args.length > 2 && this.isNumeral(args[0]))
|
|
149
220
|
return this.mkMulAppWith(this.getValue(args[0]), this.mkMulApp(args.slice(1)));
|
|
150
|
-
return this.
|
|
221
|
+
return this.mkMulTerm(args);
|
|
151
222
|
}
|
|
152
223
|
|
|
153
224
|
protected mkMulAppWith(coefficient: Rational, arg: number) {
|
|
@@ -155,10 +226,16 @@ export class PolyRewriter {
|
|
|
155
226
|
return this.mkMulApp([this.mkNumeral(coefficient), arg]);
|
|
156
227
|
}
|
|
157
228
|
|
|
158
|
-
mkAdd(args: number[])
|
|
159
|
-
|
|
229
|
+
mkAdd(args: number[]) {
|
|
230
|
+
const result = this.mkAddCore(args);
|
|
231
|
+
return typeof result === "object" ? result.expr : result;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
mkAddCore(args: number[]): number | Rewrite | undefined {
|
|
235
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
160
236
|
this.currSort = this.manager.sorts[args[0]];
|
|
161
|
-
if (!args.some((arg) => this.isAdd(arg)))
|
|
237
|
+
if (this.options.isFlat === false || !args.some((arg) => this.isAdd(arg)))
|
|
238
|
+
return this.mkNflatAdd(args);
|
|
162
239
|
const flat: number[] = [];
|
|
163
240
|
for (const arg of args) {
|
|
164
241
|
if (this.isAdd(arg)) this.manager.pushArgs(arg, flat);
|
|
@@ -168,7 +245,6 @@ export class PolyRewriter {
|
|
|
168
245
|
}
|
|
169
246
|
|
|
170
247
|
private mkNflatAdd(args: number[]) {
|
|
171
|
-
const manager = this.manager;
|
|
172
248
|
const isSortSums = this.options.isSortSums;
|
|
173
249
|
let constant = Rational.zero;
|
|
174
250
|
let numCoeffs = 0;
|
|
@@ -178,12 +254,12 @@ export class PolyRewriter {
|
|
|
178
254
|
const stamp = ++this.stamp;
|
|
179
255
|
for (let index = 0; index < args.length; index++) {
|
|
180
256
|
const arg = args[index];
|
|
181
|
-
if (
|
|
257
|
+
if (this.isNumeral(arg)) {
|
|
182
258
|
numCoeffs++;
|
|
183
259
|
constant = constant.add(this.getValue(arg));
|
|
184
260
|
isOrdered = !isSortSums || index === 0;
|
|
185
261
|
} else if (isSortSums && isOrdered) {
|
|
186
|
-
if (previous !== -1 && this.
|
|
262
|
+
if (previous !== -1 && this.isMonomialLess(arg, previous)) isOrdered = false;
|
|
187
263
|
previous = arg;
|
|
188
264
|
}
|
|
189
265
|
const product = this.getPowerProduct(arg);
|
|
@@ -193,10 +269,11 @@ export class PolyRewriter {
|
|
|
193
269
|
isMultiple = true;
|
|
194
270
|
} else this.visitedStamps[product] = stamp;
|
|
195
271
|
}
|
|
272
|
+
constant = this.normalize(constant);
|
|
196
273
|
if (isMultiple) {
|
|
197
274
|
const coeffs = new Map<number, Rational>();
|
|
198
275
|
for (const arg of args) {
|
|
199
|
-
if (
|
|
276
|
+
if (this.isNumeral(arg)) continue;
|
|
200
277
|
const product = this.getPowerProduct(arg);
|
|
201
278
|
if (this.multipleStamps[product] === stamp)
|
|
202
279
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
@@ -204,31 +281,157 @@ export class PolyRewriter {
|
|
|
204
281
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
205
282
|
const copiedStamp = ++this.stamp;
|
|
206
283
|
for (const arg of args) {
|
|
207
|
-
if (
|
|
284
|
+
if (this.isNumeral(arg)) continue;
|
|
208
285
|
const product = this.getPowerProduct(arg);
|
|
209
286
|
if (this.multipleStamps[product] !== stamp) newArgs.push(arg);
|
|
210
287
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
211
288
|
this.visitedStamps[product] = copiedStamp;
|
|
212
|
-
const coefficient = coeffs.get(product) ?? Rational.zero;
|
|
289
|
+
const coefficient = this.normalize(coeffs.get(product) ?? Rational.zero);
|
|
213
290
|
if (!coefficient.isZero()) newArgs.push(this.mkMulAppWith(coefficient, product));
|
|
214
291
|
}
|
|
215
292
|
}
|
|
216
|
-
return this.
|
|
217
|
-
|
|
293
|
+
return this.hoist(
|
|
294
|
+
this.mkAddApp(
|
|
295
|
+
isSortSums ? this.sortMonomials(newArgs, constant.isZero() ? 0 : 1) : newArgs,
|
|
296
|
+
),
|
|
218
297
|
);
|
|
219
298
|
}
|
|
220
|
-
if (isOrdered) {
|
|
299
|
+
if (isOrdered && this.options.isHoistMul !== true && this.options.isHoistIte !== true) {
|
|
221
300
|
if (numCoeffs === 0) return undefined;
|
|
222
|
-
if (numCoeffs === 1 &&
|
|
301
|
+
if (numCoeffs === 1 && this.isNumeral(args[0]) && !this.getValue(args[0]).isZero())
|
|
223
302
|
return undefined;
|
|
224
303
|
}
|
|
225
304
|
const newArgs: number[] = constant.isZero() ? [] : [this.mkNumeral(constant)];
|
|
226
|
-
for (const arg of args) if (!
|
|
227
|
-
return this.
|
|
228
|
-
isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1),
|
|
305
|
+
for (const arg of args) if (!this.isNumeral(arg)) newArgs.push(arg);
|
|
306
|
+
return this.hoist(
|
|
307
|
+
this.mkAddApp(isOrdered ? newArgs : this.sortMonomials(newArgs, constant.isZero() ? 0 : 1)),
|
|
229
308
|
);
|
|
230
309
|
}
|
|
231
310
|
|
|
311
|
+
private hoist(sum: number): number | Rewrite {
|
|
312
|
+
const hoisted = this.hoistMultiplication(sum) ?? this.hoistIte(sum);
|
|
313
|
+
return hoisted === undefined ? sum : this.reduce(hoisted, Infinity);
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// TO_BUFFER: the first argument takes the place of the term, and the others go at the end.
|
|
317
|
+
private getFlatArgs(expr: number, isSplit: (expr: number) => boolean) {
|
|
318
|
+
const manager = this.manager;
|
|
319
|
+
const buffer = [expr];
|
|
320
|
+
for (let index = 0; index < buffer.length;) {
|
|
321
|
+
const item = buffer[index];
|
|
322
|
+
if (!isSplit(item)) {
|
|
323
|
+
index++;
|
|
324
|
+
continue;
|
|
325
|
+
}
|
|
326
|
+
buffer[index] = manager.getArg(item, 0);
|
|
327
|
+
for (let arg = 1; arg < manager.getNumArgs(item); arg++)
|
|
328
|
+
buffer.push(manager.getArg(item, arg));
|
|
329
|
+
}
|
|
330
|
+
return buffer;
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
private hoistMultiplication(sum: number) {
|
|
334
|
+
if (this.options.isHoistMul !== true) return undefined;
|
|
335
|
+
const isMul = (expr: number) => this.isMul(expr);
|
|
336
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
337
|
+
const isValid = adds.map(() => true);
|
|
338
|
+
const positions = new Map<number, number>();
|
|
339
|
+
let isChanged = false;
|
|
340
|
+
for (let index = 0; index < adds.length; index++)
|
|
341
|
+
for (const factor of this.getFlatArgs(adds[index], isMul)) {
|
|
342
|
+
if (this.isNumeral(factor)) continue;
|
|
343
|
+
const position = positions.get(factor);
|
|
344
|
+
if (position === undefined || !isValid[position] || position === index) {
|
|
345
|
+
positions.set(factor, index);
|
|
346
|
+
continue;
|
|
347
|
+
}
|
|
348
|
+
this.currSort = this.manager.sorts[adds[index]];
|
|
349
|
+
const first = this.getFlatArgs(adds[position], isMul);
|
|
350
|
+
const second = this.getFlatArgs(adds[index], isMul);
|
|
351
|
+
let shared = 0;
|
|
352
|
+
for (let firstIndex = 0; firstIndex < first.length; firstIndex++) {
|
|
353
|
+
const match = second.indexOf(first[firstIndex], shared);
|
|
354
|
+
if (match === -1) continue;
|
|
355
|
+
[first[firstIndex], first[shared]] = [first[shared], first[firstIndex]];
|
|
356
|
+
[second[match], second[shared]] = [second[shared], second[match]];
|
|
357
|
+
shared++;
|
|
358
|
+
}
|
|
359
|
+
first[shared] = this.mkAddApp([
|
|
360
|
+
this.mkMulApp(first.slice(shared)),
|
|
361
|
+
this.mkMulApp(second.slice(shared)),
|
|
362
|
+
]);
|
|
363
|
+
adds[position] = this.mkMulApp(first.slice(0, shared + 1));
|
|
364
|
+
adds[index] = this.mkNumeral(Rational.zero);
|
|
365
|
+
isValid[position] = false;
|
|
366
|
+
isValid[index] = false;
|
|
367
|
+
isChanged = true;
|
|
368
|
+
break;
|
|
369
|
+
}
|
|
370
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
private hoistIte(sum: number) {
|
|
374
|
+
if (this.options.isHoistIte !== true) return undefined;
|
|
375
|
+
const manager = this.manager;
|
|
376
|
+
const shared = new ObjHashtable((expr) => manager.hashes[expr]);
|
|
377
|
+
const adds = this.getFlatArgs(sum, (expr) => this.isAdd(expr));
|
|
378
|
+
let isChanged = false;
|
|
379
|
+
for (let index = 0; index < adds.length; index++) {
|
|
380
|
+
const add = adds[index];
|
|
381
|
+
if (manager.getOp(add) !== OP_ITE) continue;
|
|
382
|
+
shared.clear();
|
|
383
|
+
if (!this.collectSharedSummands(add, shared)) continue;
|
|
384
|
+
const summands = [this.applyHoist(add, shared)];
|
|
385
|
+
for (const summand of shared) summands.push(summand);
|
|
386
|
+
const hoisted = this.mkAddApp(summands);
|
|
387
|
+
if (hoisted === add) continue;
|
|
388
|
+
adds[index] = hoisted;
|
|
389
|
+
isChanged = true;
|
|
390
|
+
}
|
|
391
|
+
return isChanged ? this.mkAddApp(adds) : undefined;
|
|
392
|
+
}
|
|
393
|
+
|
|
394
|
+
private collectSharedSummands(expr: number, shared: ObjHashtable): boolean {
|
|
395
|
+
const manager = this.manager;
|
|
396
|
+
if (manager.getOp(expr) === OP_ITE)
|
|
397
|
+
return (
|
|
398
|
+
this.collectSharedSummands(manager.getArg(expr, 1), shared) &&
|
|
399
|
+
this.collectSharedSummands(manager.getArg(expr, 2), shared)
|
|
400
|
+
);
|
|
401
|
+
if (this.isNumeral(expr) && this.getValue(expr).isInt()) return false;
|
|
402
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
403
|
+
if (shared.size === 0)
|
|
404
|
+
for (let index = 0; index < summands.length; index++) shared.add(summands[index]);
|
|
405
|
+
else {
|
|
406
|
+
const removed: number[] = [];
|
|
407
|
+
for (const summand of shared) if (!summands.includes(summand)) removed.push(summand);
|
|
408
|
+
for (let index = removed.length - 1; index >= 0; index--) shared.delete(removed[index]);
|
|
409
|
+
}
|
|
410
|
+
if (shared.size === 0) return false;
|
|
411
|
+
for (let index = 1; index < summands.length; index++)
|
|
412
|
+
if (summands.lastIndexOf(summands[index], index - 1) !== -1) return false;
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private applyHoist(expr: number, shared: ObjHashtable): number {
|
|
417
|
+
const manager = this.manager;
|
|
418
|
+
if (manager.getOp(expr) === OP_ITE) {
|
|
419
|
+
const thenExpr = this.applyHoist(manager.getArg(expr, 1), shared);
|
|
420
|
+
const elseExpr = this.applyHoist(manager.getArg(expr, 2), shared);
|
|
421
|
+
return manager.mkApp(
|
|
422
|
+
OP_ITE,
|
|
423
|
+
[manager.getArg(expr, 0), thenExpr, elseExpr],
|
|
424
|
+
manager.sorts[expr],
|
|
425
|
+
);
|
|
426
|
+
}
|
|
427
|
+
const summands = this.getFlatArgs(expr, (summand) => this.isAdd(summand));
|
|
428
|
+
let size = 0;
|
|
429
|
+
for (let index = 0; index < summands.length; index++)
|
|
430
|
+
if (!shared.has(summands[index])) summands[size++] = summands[index];
|
|
431
|
+
summands.length = size;
|
|
432
|
+
return this.mkAddApp(summands);
|
|
433
|
+
}
|
|
434
|
+
|
|
232
435
|
private growStamps(expr: number) {
|
|
233
436
|
const size = Math.max(2 * this.visitedStamps.length, expr + 1, 1024);
|
|
234
437
|
const visitedStamps = new Int32Array(size);
|
|
@@ -240,13 +443,14 @@ export class PolyRewriter {
|
|
|
240
443
|
}
|
|
241
444
|
|
|
242
445
|
mkMul(args: number[]): number | Rewrite | undefined {
|
|
243
|
-
if (args.length < 2) return undefined;
|
|
446
|
+
if (args.length < 2) return args.length === 1 ? args[0] : undefined;
|
|
244
447
|
this.currSort = this.manager.sorts[args[0]];
|
|
245
448
|
const isFlatMonomial =
|
|
246
449
|
args.length === 2 &&
|
|
247
|
-
this.
|
|
248
|
-
!(this.isMul(args[1]) && this.
|
|
249
|
-
if (isFlatMonomial || !args.some((arg) => this.isMul(arg)))
|
|
450
|
+
this.isNumeral(args[0]) &&
|
|
451
|
+
!(this.isMul(args[1]) && this.isNumeral(this.manager.getArg(args[1], 0)));
|
|
452
|
+
if (this.options.isFlat === false || isFlatMonomial || !args.some((arg) => this.isMul(arg)))
|
|
453
|
+
return this.mkNflatMul(args);
|
|
250
454
|
const flat: number[] = [];
|
|
251
455
|
const collect = (arg: number) => {
|
|
252
456
|
if (this.isMul(arg))
|
|
@@ -262,7 +466,7 @@ export class PolyRewriter {
|
|
|
262
466
|
const manager = this.manager;
|
|
263
467
|
if (
|
|
264
468
|
args.length === 2 &&
|
|
265
|
-
this.
|
|
469
|
+
this.isNumeral(args[0]) &&
|
|
266
470
|
!this.getValue(args[0]).equals(Rational.one) &&
|
|
267
471
|
!this.getValue(args[0]).isZero() &&
|
|
268
472
|
!this.isArithTerm(args[1])
|
|
@@ -273,7 +477,7 @@ export class PolyRewriter {
|
|
|
273
477
|
let numAdd = 0;
|
|
274
478
|
let factor = -1;
|
|
275
479
|
for (const arg of args) {
|
|
276
|
-
if (this.
|
|
480
|
+
if (this.isNumeral(arg)) {
|
|
277
481
|
numCoeffs++;
|
|
278
482
|
coefficient = coefficient.mul(this.getValue(arg));
|
|
279
483
|
} else {
|
|
@@ -281,15 +485,16 @@ export class PolyRewriter {
|
|
|
281
485
|
if (this.isAdd(arg)) numAdd++;
|
|
282
486
|
}
|
|
283
487
|
}
|
|
488
|
+
coefficient = this.normalize(coefficient);
|
|
284
489
|
if (numCoeffs === args.length || coefficient.isZero()) return this.mkNumeral(coefficient);
|
|
285
490
|
if (numCoeffs === args.length - 1) {
|
|
286
491
|
if (coefficient.equals(Rational.one)) return factor;
|
|
287
492
|
if (this.isMul(factor)) {
|
|
288
|
-
if (manager.getNumArgs(factor) !== 2 || !this.
|
|
493
|
+
if (manager.getNumArgs(factor) !== 2 || !this.isNumeral(manager.getArg(factor, 0)))
|
|
289
494
|
return undefined;
|
|
290
495
|
return this.reduce(
|
|
291
496
|
this.mkMulAppWith(
|
|
292
|
-
coefficient.mul(this.getValue(manager.getArg(factor, 0))),
|
|
497
|
+
this.normalize(coefficient.mul(this.getValue(manager.getArg(factor, 0)))),
|
|
293
498
|
manager.getArg(factor, 1),
|
|
294
499
|
),
|
|
295
500
|
1,
|
|
@@ -306,18 +511,15 @@ export class PolyRewriter {
|
|
|
306
511
|
2,
|
|
307
512
|
);
|
|
308
513
|
}
|
|
309
|
-
if (numCoeffs > 1 || (numCoeffs === 1 && !this.
|
|
514
|
+
if (numCoeffs > 1 || (numCoeffs === 1 && !this.isNumeral(args[0])))
|
|
310
515
|
return this.reduce(
|
|
311
|
-
this.mkMulAppWith(
|
|
312
|
-
coefficient,
|
|
313
|
-
this.mkMulApp(args.filter((arg) => !this.manager.isNumeral(arg))),
|
|
314
|
-
),
|
|
516
|
+
this.mkMulAppWith(coefficient, this.mkMulApp(args.filter((arg) => !this.isNumeral(arg)))),
|
|
315
517
|
2,
|
|
316
518
|
);
|
|
317
519
|
if (!this.options.isSom || numAdd === 0) {
|
|
318
|
-
const factors = args.filter((arg) => !this.
|
|
520
|
+
const factors = args.filter((arg) => !this.isNumeral(arg));
|
|
319
521
|
const isOrdered = factors.every(
|
|
320
|
-
(arg, index) => index === 0 || this.
|
|
522
|
+
(arg, index) => index === 0 || !this.isMonomialLess(arg, factors[index - 1]),
|
|
321
523
|
);
|
|
322
524
|
if (isOrdered && numCoeffs === 0) return undefined;
|
|
323
525
|
const ordered = isOrdered ? factors : this.sortMonomials(factors, 0);
|
|
@@ -359,7 +561,7 @@ export class PolyRewriter {
|
|
|
359
561
|
|
|
360
562
|
mkUminus(arg: number) {
|
|
361
563
|
this.currSort = this.manager.sorts[arg];
|
|
362
|
-
if (this.
|
|
564
|
+
if (this.isNumeral(arg)) return this.mkNumeral(this.getValue(arg).neg());
|
|
363
565
|
return this.reduce(this.mkMulAppWith(Rational.minusOne, arg), 1);
|
|
364
566
|
}
|
|
365
567
|
|
|
@@ -371,7 +573,7 @@ export class PolyRewriter {
|
|
|
371
573
|
let numCoeffs = 0;
|
|
372
574
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
373
575
|
const arg = this.getMonomial(lhs, index);
|
|
374
|
-
if (
|
|
576
|
+
if (this.isNumeral(arg)) {
|
|
375
577
|
constant = constant.add(this.getValue(arg));
|
|
376
578
|
numCoeffs++;
|
|
377
579
|
continue;
|
|
@@ -380,11 +582,11 @@ export class PolyRewriter {
|
|
|
380
582
|
if (product >= this.visitedStamps.length) this.growStamps(product);
|
|
381
583
|
this.visitedStamps[product] = stamp;
|
|
382
584
|
}
|
|
383
|
-
if (isMoving && numCoeffs === 0 &&
|
|
585
|
+
if (isMoving && numCoeffs === 0 && this.isNumeral(rhs)) return undefined;
|
|
384
586
|
let isMultiple = false;
|
|
385
587
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
386
588
|
const arg = this.getMonomial(rhs, index);
|
|
387
|
-
if (
|
|
589
|
+
if (this.isNumeral(arg)) {
|
|
388
590
|
constant = constant.sub(this.getValue(arg));
|
|
389
591
|
numCoeffs++;
|
|
390
592
|
continue;
|
|
@@ -395,9 +597,9 @@ export class PolyRewriter {
|
|
|
395
597
|
isMultiple = true;
|
|
396
598
|
}
|
|
397
599
|
}
|
|
600
|
+
constant = this.normalize(constant);
|
|
398
601
|
if (!isMultiple && numCoeffs <= 1) {
|
|
399
|
-
if (isMoving ?
|
|
400
|
-
return undefined;
|
|
602
|
+
if (isMoving ? this.isNumeral(rhs) : numCoeffs === 0 || this.isNumeral(rhs)) return undefined;
|
|
401
603
|
}
|
|
402
604
|
const isMultipleProduct = (product: number) =>
|
|
403
605
|
product < this.multipleStamps.length && this.multipleStamps[product] === stamp;
|
|
@@ -405,14 +607,14 @@ export class PolyRewriter {
|
|
|
405
607
|
if (isMultiple) {
|
|
406
608
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
407
609
|
const arg = this.getMonomial(lhs, index);
|
|
408
|
-
if (
|
|
610
|
+
if (this.isNumeral(arg)) continue;
|
|
409
611
|
const product = this.getPowerProduct(arg);
|
|
410
612
|
if (isMultipleProduct(product))
|
|
411
613
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).add(this.getCoefficient(arg)));
|
|
412
614
|
}
|
|
413
615
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
414
616
|
const arg = this.getMonomial(rhs, index);
|
|
415
|
-
if (
|
|
617
|
+
if (this.isNumeral(arg)) continue;
|
|
416
618
|
const product = this.getPowerProduct(arg);
|
|
417
619
|
if (isMultipleProduct(product))
|
|
418
620
|
coeffs.set(product, (coeffs.get(product) ?? Rational.zero).sub(this.getCoefficient(arg)));
|
|
@@ -422,7 +624,7 @@ export class PolyRewriter {
|
|
|
422
624
|
const copiedStamp = ++this.stamp;
|
|
423
625
|
for (let index = 0; index < this.getNumMonomials(lhs); index++) {
|
|
424
626
|
const arg = this.getMonomial(lhs, index);
|
|
425
|
-
if (
|
|
627
|
+
if (this.isNumeral(arg)) continue;
|
|
426
628
|
const product = this.getPowerProduct(arg);
|
|
427
629
|
if (!isMultipleProduct(product)) newLhs.push(arg);
|
|
428
630
|
else if (this.visitedStamps[product] !== copiedStamp) {
|
|
@@ -434,7 +636,7 @@ export class PolyRewriter {
|
|
|
434
636
|
const newRhs: number[] = [];
|
|
435
637
|
for (let index = 0; index < this.getNumMonomials(rhs); index++) {
|
|
436
638
|
const arg = this.getMonomial(rhs, index);
|
|
437
|
-
if (
|
|
639
|
+
if (this.isNumeral(arg)) continue;
|
|
438
640
|
const product = this.getPowerProduct(arg);
|
|
439
641
|
if (isMultipleProduct(product)) continue;
|
|
440
642
|
if (!isMoving) newRhs.push(arg);
|
|
@@ -447,7 +649,7 @@ export class PolyRewriter {
|
|
|
447
649
|
}
|
|
448
650
|
const sortedLhs = isMoving && this.options.isSortSums ? this.sortMonomials(newLhs, 0) : newLhs;
|
|
449
651
|
const isConstantAtRhs = isMoving || newRhs.length === 0 || newLhs.length > 0;
|
|
450
|
-
const value = isConstantAtRhs ? constant.neg() : constant;
|
|
652
|
+
const value = isConstantAtRhs ? this.normalize(constant.neg()) : constant;
|
|
451
653
|
const isLhsConstant = !isConstantAtRhs && (sortedLhs.length === 0 || !value.isZero());
|
|
452
654
|
const isRhsConstant = isConstantAtRhs && (newRhs.length === 0 || !value.isZero());
|
|
453
655
|
if (isLhsConstant) sortedLhs.unshift(this.mkNumeral(value));
|