tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- 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 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- 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 +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-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 +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +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 +179 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +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 +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/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 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- 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 -16
- 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 +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -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 +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- 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 +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/subexpressions.ts
CHANGED
|
@@ -2,6 +2,7 @@ import {
|
|
|
2
2
|
getChildren,
|
|
3
3
|
type AssumeProve,
|
|
4
4
|
type Bound,
|
|
5
|
+
type Declaration,
|
|
5
6
|
type Definition,
|
|
6
7
|
type Expression,
|
|
7
8
|
type Fact,
|
|
@@ -14,17 +15,30 @@ import {
|
|
|
14
15
|
type SourceRange,
|
|
15
16
|
type StepBody,
|
|
16
17
|
} from "./ast";
|
|
17
|
-
import { formatRange, TlaSyntaxError } from "./errors";
|
|
18
|
+
import { formatRange, TlaSyntaxError, type SanyError } from "./errors";
|
|
18
19
|
import { getSourceName, mapChildren, mapDefinition } from "./instances";
|
|
20
|
+
import { parenthesizedRanges } from "./parser";
|
|
21
|
+
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
19
23
|
import {
|
|
24
|
+
compareLocations,
|
|
20
25
|
getArity,
|
|
21
26
|
getBinder,
|
|
22
27
|
getNameSelectors,
|
|
23
28
|
getOperandIndex,
|
|
24
29
|
getOperands,
|
|
30
|
+
getParamArities,
|
|
31
|
+
isBefore,
|
|
25
32
|
LOCAL_RESOLUTION,
|
|
33
|
+
nullSelections,
|
|
34
|
+
operatorSelectionErrors,
|
|
26
35
|
selectionErrors,
|
|
36
|
+
selectionArguments,
|
|
27
37
|
selections,
|
|
38
|
+
SELECTION_NAME,
|
|
39
|
+
factReferences,
|
|
40
|
+
type NullSelection,
|
|
41
|
+
type SelectionArguments,
|
|
28
42
|
} from "./resolve";
|
|
29
43
|
|
|
30
44
|
type Lookup = (name: string) => Definition | undefined;
|
|
@@ -41,15 +55,55 @@ interface Selection {
|
|
|
41
55
|
location: SourceLocation;
|
|
42
56
|
}
|
|
43
57
|
|
|
44
|
-
// A name that selects a subexpression, with the range of each part and of the arguments of each
|
|
45
|
-
// part, where SANY reports an error in selecting that part.
|
|
46
58
|
interface SelectingName {
|
|
47
59
|
location: SourceLocation;
|
|
48
60
|
selectorRanges?: SourceRange[];
|
|
49
61
|
argumentRanges?: (SourceRange | undefined)[];
|
|
50
62
|
}
|
|
51
63
|
|
|
52
|
-
const
|
|
64
|
+
const declaredArities = new WeakMap<Definition, number>();
|
|
65
|
+
const generatedArgumentCounts = new WeakMap<Expression, number>();
|
|
66
|
+
|
|
67
|
+
const resolveDefinition = (
|
|
68
|
+
definition: Definition,
|
|
69
|
+
resolve: (expression: Expression) => Expression,
|
|
70
|
+
) => {
|
|
71
|
+
const resolved = mapDefinition(definition, resolve);
|
|
72
|
+
const arity = declaredArities.get(definition);
|
|
73
|
+
if (arity !== undefined) declaredArities.set(resolved, arity);
|
|
74
|
+
return resolved;
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
const setDeclaredArities = (declarations: Declaration[], definitions: Definition[]) =>
|
|
78
|
+
declarations.forEach((declaration) => {
|
|
79
|
+
const definition = definitions.find(
|
|
80
|
+
(candidate) => candidate.isRecursive && candidate.name === declaration.name,
|
|
81
|
+
);
|
|
82
|
+
if (definition) declaredArities.set(definition, declaration.arity);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
const getSelectorName = (selector: Selector) => {
|
|
86
|
+
switch (selector.kind) {
|
|
87
|
+
case "Name":
|
|
88
|
+
return selector.name;
|
|
89
|
+
case "Operand":
|
|
90
|
+
return typeof selector.operand === "number"
|
|
91
|
+
? `argument selector ${selector.operand}`
|
|
92
|
+
: selector.operand;
|
|
93
|
+
case "Bound":
|
|
94
|
+
return "!(...)";
|
|
95
|
+
case "At":
|
|
96
|
+
return "@";
|
|
97
|
+
case "Colon":
|
|
98
|
+
return ":";
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
|
|
102
|
+
const getExpressionArguments = (
|
|
103
|
+
operator: string,
|
|
104
|
+
range: SourceRange | undefined,
|
|
105
|
+
args: Expression[],
|
|
106
|
+
): SelectionArguments => ({ operator, range, args, params: args.map(() => 0) });
|
|
53
107
|
|
|
54
108
|
const createError = (message: string, location: SourceLocation) =>
|
|
55
109
|
new TlaSyntaxError(`${message} at line ${location.line}, column ${location.column}`);
|
|
@@ -64,24 +118,33 @@ const findLabel = (
|
|
|
64
118
|
}
|
|
65
119
|
if (expression.kind === "Let")
|
|
66
120
|
return findLabel(expression.body, name, [...lets, expression.definitions]);
|
|
67
|
-
if (expression.kind === "Lambda") return undefined;
|
|
68
|
-
for (const child of getChildren(expression)) {
|
|
121
|
+
if (expression.kind === "Lambda" || expression.kind === "Selection") return undefined;
|
|
122
|
+
for (const child of getChildren(expression).slice(0, generatedArgumentCounts.get(expression))) {
|
|
69
123
|
const found = findLabel(child, name, lets);
|
|
70
124
|
if (found) return found;
|
|
71
125
|
}
|
|
72
126
|
return undefined;
|
|
73
127
|
};
|
|
74
128
|
|
|
129
|
+
const getHiddenLocation = (location: SourceLocation) => ({
|
|
130
|
+
line: location.line,
|
|
131
|
+
column: location.column,
|
|
132
|
+
});
|
|
133
|
+
|
|
75
134
|
const wrapLets = (body: Expression, lets: Definition[][], location: SourceLocation) =>
|
|
76
135
|
lets.reduceRight<Expression>(
|
|
77
|
-
(inner, definitions) => ({
|
|
136
|
+
(inner, definitions) => ({
|
|
137
|
+
kind: "Let",
|
|
138
|
+
definitions,
|
|
139
|
+
body: inner,
|
|
140
|
+
location: getHiddenLocation(location),
|
|
141
|
+
}),
|
|
78
142
|
body,
|
|
79
143
|
);
|
|
80
144
|
|
|
81
145
|
const createApplication = (selection: Selection, body: Expression): Expression => {
|
|
82
146
|
const location = selection.location;
|
|
83
|
-
|
|
84
|
-
if (selection.params.length === 0) return wrapped;
|
|
147
|
+
if (selection.params.length === 0) return body;
|
|
85
148
|
if (selection.args.length === 0) {
|
|
86
149
|
if (selection.params.some((param) => param.arity > 0)) {
|
|
87
150
|
throw createError("Selected an operator with operator parameters as an argument", location);
|
|
@@ -89,7 +152,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
|
|
|
89
152
|
return {
|
|
90
153
|
kind: "Lambda",
|
|
91
154
|
params: selection.params.map((param) => param.name),
|
|
92
|
-
body
|
|
155
|
+
body,
|
|
93
156
|
location,
|
|
94
157
|
};
|
|
95
158
|
}
|
|
@@ -106,7 +169,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
|
|
|
106
169
|
kind: "Operator",
|
|
107
170
|
name: SELECTION_NAME,
|
|
108
171
|
params: selection.params,
|
|
109
|
-
body
|
|
172
|
+
body,
|
|
110
173
|
isLocal: true,
|
|
111
174
|
isRecursive: false,
|
|
112
175
|
location,
|
|
@@ -119,7 +182,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
|
|
|
119
182
|
location,
|
|
120
183
|
resolution: LOCAL_RESOLUTION,
|
|
121
184
|
},
|
|
122
|
-
location,
|
|
185
|
+
location: getHiddenLocation(location),
|
|
123
186
|
};
|
|
124
187
|
};
|
|
125
188
|
|
|
@@ -148,12 +211,12 @@ const applyDefinition = (definition: Definition, selection: Selection) => {
|
|
|
148
211
|
location,
|
|
149
212
|
resolution: LOCAL_RESOLUTION,
|
|
150
213
|
};
|
|
151
|
-
return createApplication(
|
|
214
|
+
return createApplication(
|
|
215
|
+
{ ...selection, params: [...selection.params, ...params] },
|
|
216
|
+
wrapLets(reference, selection.lets, location),
|
|
217
|
+
);
|
|
152
218
|
};
|
|
153
219
|
|
|
154
|
-
// Generator.selectorToNode reports the first part of a name that selects nothing, after it analyzes
|
|
155
|
-
// the arguments of the parts before, and goes on after the name. An operator or a label must be given
|
|
156
|
-
// all its arguments, except in a name that an operator argument may select whole.
|
|
157
220
|
const selectSubexpression = (
|
|
158
221
|
selectors: Selector[],
|
|
159
222
|
lookup: Lookup,
|
|
@@ -162,25 +225,43 @@ const selectSubexpression = (
|
|
|
162
225
|
): Expression => {
|
|
163
226
|
const location = reference.location;
|
|
164
227
|
const selection: Selection = { params: [], args: [], lets: [], location };
|
|
165
|
-
|
|
228
|
+
let selectorIndex = 0;
|
|
229
|
+
let operatorIndex = -1;
|
|
230
|
+
let current: Expression | undefined;
|
|
231
|
+
let unwrappedSelection: Expression | undefined;
|
|
232
|
+
let isFailed = false;
|
|
233
|
+
let generatedArguments = 0;
|
|
234
|
+
const nulls: NullSelection[] = [];
|
|
235
|
+
const applications: SelectionArguments[] = [];
|
|
236
|
+
let expressionError: SanyError | undefined;
|
|
237
|
+
const deferToExpression = (range: SourceRange | undefined, message: string) => {
|
|
238
|
+
if (!expressionError && range) expressionError = { location: formatRange(range), message };
|
|
239
|
+
};
|
|
240
|
+
const checkNull = (node: Expression | undefined, message: string, isEmpty = false) => {
|
|
241
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
242
|
+
if (node && range) {
|
|
243
|
+
nulls.push({ node, error: { location: formatRange(range), message }, isEmpty });
|
|
244
|
+
}
|
|
245
|
+
};
|
|
166
246
|
|
|
167
247
|
const report = (range: SourceRange | undefined, message: string) => {
|
|
168
248
|
if (!range) throw createError(message, location);
|
|
169
249
|
selectionErrors.set(reference, {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
.flatMap((selector) => ("args" in selector ? selector.args : [])),
|
|
250
|
+
applications,
|
|
251
|
+
nulls,
|
|
173
252
|
error: { location: formatRange(range), message },
|
|
174
253
|
});
|
|
175
|
-
|
|
254
|
+
generatedArgumentCounts.set(reference, generatedArguments);
|
|
255
|
+
isFailed = true;
|
|
176
256
|
return undefined;
|
|
177
257
|
};
|
|
178
258
|
|
|
179
259
|
const findDefinition = (local: Definition[] | undefined) => {
|
|
180
260
|
const names: string[] = [];
|
|
181
261
|
const args: Expression[] = [];
|
|
182
|
-
while (
|
|
183
|
-
const selector = selectors[
|
|
262
|
+
while (selectorIndex < selectors.length) {
|
|
263
|
+
const selector = selectors[selectorIndex];
|
|
264
|
+
if (selector.kind !== "Name" && !local) return undefined;
|
|
184
265
|
if (selector.kind !== "Name") throw createError("Expected an operator name", location);
|
|
185
266
|
names.push(selector.name);
|
|
186
267
|
args.push(...selector.args);
|
|
@@ -190,115 +271,231 @@ const selectSubexpression = (
|
|
|
190
271
|
: lookup(name);
|
|
191
272
|
if (definition)
|
|
192
273
|
return { definition, name, args, earlier: args.length - selector.args.length };
|
|
193
|
-
|
|
274
|
+
selectorIndex++;
|
|
194
275
|
}
|
|
195
276
|
throw createError(`Unknown operator ${names.join("!")}`, location);
|
|
196
277
|
};
|
|
197
278
|
|
|
198
279
|
const enterDefinition = (local: Definition[] | undefined) => {
|
|
199
280
|
const found = findDefinition(local);
|
|
281
|
+
if (!found) {
|
|
282
|
+
isFailed = true;
|
|
283
|
+
return undefined;
|
|
284
|
+
}
|
|
200
285
|
const definition = found.definition;
|
|
201
|
-
const arity = getArity(definition);
|
|
202
|
-
const isLast =
|
|
203
|
-
if (found.args.length !== arity
|
|
286
|
+
const arity = declaredArities.get(definition) ?? getArity(definition);
|
|
287
|
+
const isLast = selectorIndex === selectors.length - 1;
|
|
288
|
+
if (found.args.length !== arity) {
|
|
289
|
+
const range = reference.argumentRanges?.[selectorIndex] ?? location.range;
|
|
290
|
+
const message = `The operator ${resolveSynonym(found.name)} requires ${arity - found.earlier} arguments.`;
|
|
291
|
+
if (!isOperator || found.args.length !== 0) {
|
|
292
|
+
generatedArguments += found.earlier;
|
|
293
|
+
return report(range, message);
|
|
294
|
+
}
|
|
295
|
+
deferToExpression(range, message);
|
|
296
|
+
}
|
|
297
|
+
generatedArguments += found.args.length;
|
|
298
|
+
found.args.forEach((arg, index) =>
|
|
299
|
+
selectionArguments.set(arg, {
|
|
300
|
+
operator: found.name,
|
|
301
|
+
index,
|
|
302
|
+
range: reference.selectorRanges?.[selectorIndex],
|
|
303
|
+
}),
|
|
304
|
+
);
|
|
305
|
+
if (isLast) return { definition, args: found.args };
|
|
306
|
+
const range = definition.location.range;
|
|
307
|
+
const isUndefined =
|
|
308
|
+
declaredArities.has(definition) &&
|
|
309
|
+
range?.module === location.range?.module &&
|
|
310
|
+
isBefore(location, definition.location);
|
|
311
|
+
applications.push({
|
|
312
|
+
operator: found.name,
|
|
313
|
+
range: reference.selectorRanges?.[selectorIndex],
|
|
314
|
+
args: found.args,
|
|
315
|
+
params: isUndefined ? Array(arity).fill(0) : getParamArities(definition),
|
|
316
|
+
});
|
|
317
|
+
if (
|
|
318
|
+
definition.isRecursive &&
|
|
319
|
+
range &&
|
|
320
|
+
range.module === location.range?.module &&
|
|
321
|
+
isBefore(location, range.end)
|
|
322
|
+
) {
|
|
204
323
|
return report(
|
|
205
|
-
reference.
|
|
206
|
-
`
|
|
324
|
+
reference.selectorRanges?.[selectorIndex],
|
|
325
|
+
`Subexpression of \`${found.name}' used inside the operator's definition.`,
|
|
207
326
|
);
|
|
208
327
|
}
|
|
209
|
-
if (isLast) return { definition, args: found.args };
|
|
210
328
|
if (definition.kind !== "Operator") {
|
|
211
329
|
throw createError(`Cannot select a subexpression of ${definition.name}`, location);
|
|
212
330
|
}
|
|
213
331
|
selection.params.push(...definition.params);
|
|
214
332
|
selection.args.push(...found.args);
|
|
215
|
-
|
|
216
|
-
|
|
333
|
+
current = definition.body;
|
|
334
|
+
operatorIndex = selectorIndex;
|
|
335
|
+
selectorIndex++;
|
|
217
336
|
return undefined;
|
|
218
337
|
};
|
|
219
338
|
|
|
220
339
|
const followLabels = () => {
|
|
221
|
-
while (
|
|
222
|
-
const selector = selectors[
|
|
340
|
+
while (selectorIndex < selectors.length && !isFailed) {
|
|
341
|
+
const selector = selectors[selectorIndex];
|
|
223
342
|
if (selector.kind !== "Name") return;
|
|
224
|
-
const range = reference.selectorRanges?.[
|
|
225
|
-
const found =
|
|
343
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
344
|
+
const found = current && findLabel(current, selector.name, []);
|
|
226
345
|
if (!found) return report(range, `Cannot find label \`${selector.name}'.`);
|
|
227
346
|
const params = found.label.params;
|
|
228
|
-
if (
|
|
229
|
-
|
|
347
|
+
if (selector.args.length !== params.length) {
|
|
348
|
+
const message = `Label \`${selector.name}' used with wrong number of arguments.`;
|
|
349
|
+
if (!isOperator) return report(range, message);
|
|
350
|
+
deferToExpression(range, message);
|
|
230
351
|
}
|
|
352
|
+
generatedArguments += selector.args.length;
|
|
231
353
|
selection.lets.push(...found.lets);
|
|
232
354
|
selection.params.push(...params.map((name) => ({ name, arity: 0 })));
|
|
233
355
|
selection.args.push(...selector.args);
|
|
234
|
-
|
|
235
|
-
|
|
356
|
+
applications.push(getExpressionArguments(selector.name, range, selector.args));
|
|
357
|
+
current = found.label.body;
|
|
358
|
+
selectorIndex++;
|
|
236
359
|
}
|
|
237
360
|
};
|
|
238
361
|
|
|
239
362
|
const selectOperand = (selector: Selector) => {
|
|
240
|
-
const current = state.current;
|
|
241
363
|
if (!current) throw createError("Subexpression selection failed", location);
|
|
242
364
|
if (selector.kind === "Colon") return;
|
|
365
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
366
|
+
const noOperands = `Choosing operand \`${getSelectorName(selector)}' of subexpression with no operands.`;
|
|
367
|
+
if (selectionErrors.has(current)) {
|
|
368
|
+
report(range, noOperands);
|
|
369
|
+
return;
|
|
370
|
+
}
|
|
371
|
+
if (selections.has(current) && current.kind !== "Lambda" && current !== unwrappedSelection) {
|
|
372
|
+
checkNull(current, noOperands, true);
|
|
373
|
+
unwrappedSelection = current;
|
|
374
|
+
current =
|
|
375
|
+
current.kind === "Let" &&
|
|
376
|
+
current.body.kind === "Apply" &&
|
|
377
|
+
current.body.operator === SELECTION_NAME
|
|
378
|
+
? current.body
|
|
379
|
+
: current.kind === "Selection"
|
|
380
|
+
? current
|
|
381
|
+
: // SANY wraps a selection without parameters in $Nop, whose only operand is the selection.
|
|
382
|
+
{ kind: "Tuple", elements: [current], location: current.location };
|
|
383
|
+
}
|
|
243
384
|
if (current.kind === "Label") {
|
|
244
|
-
|
|
385
|
+
current = current.body;
|
|
245
386
|
selectOperand(selector);
|
|
246
387
|
return;
|
|
247
388
|
}
|
|
389
|
+
const nonexistent = `Nonexistent operand specified by \`${getSelectorName(selector)}'.`;
|
|
248
390
|
if (current.kind === "Let") {
|
|
249
391
|
if (selector.kind !== "Operand" || getOperandIndex(selector.operand, 1) !== 0) {
|
|
250
|
-
|
|
392
|
+
report(range, "A LET/IN expression has only one operand.");
|
|
393
|
+
return;
|
|
251
394
|
}
|
|
252
395
|
selection.lets.push(current.definitions);
|
|
253
|
-
|
|
396
|
+
current = current.body;
|
|
254
397
|
return;
|
|
255
398
|
}
|
|
256
399
|
const binder = getBinder(current);
|
|
257
400
|
if (binder && (selector.kind === "Bound" || selector.kind === "At")) {
|
|
401
|
+
if (selector.kind === "Bound" && selector.args.length !== binder.names.length) {
|
|
402
|
+
report(
|
|
403
|
+
range,
|
|
404
|
+
`Selector with ${selector.args.length} argument(s) used for quantifier with ${binder.names.length} bound identifier(s).`,
|
|
405
|
+
);
|
|
406
|
+
return;
|
|
407
|
+
}
|
|
258
408
|
selection.params.push(...binder.names.map((name) => ({ name, arity: 0 })));
|
|
259
|
-
if (selector.kind === "Bound")
|
|
260
|
-
|
|
409
|
+
if (selector.kind === "Bound") {
|
|
410
|
+
generatedArguments += selector.args.length;
|
|
411
|
+
selection.args.push(...selector.args);
|
|
412
|
+
applications.push(getExpressionArguments("", range, selector.args));
|
|
413
|
+
}
|
|
414
|
+
current =
|
|
415
|
+
selections.has(current) && binder.body.kind === "Selection"
|
|
416
|
+
? binder.body.expression
|
|
417
|
+
: binder.body;
|
|
261
418
|
return;
|
|
262
419
|
}
|
|
263
|
-
if (current.kind === "Case"
|
|
420
|
+
if (current.kind === "Case") {
|
|
264
421
|
const arms = [
|
|
265
422
|
...current.arms,
|
|
266
423
|
...(current.other ? [{ condition: undefined, body: current.other }] : []),
|
|
267
424
|
];
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
425
|
+
if (selectorIndex === selectors.length - 1) {
|
|
426
|
+
report(range, "Subexpression of CASE must have form !i!j.");
|
|
427
|
+
return;
|
|
428
|
+
}
|
|
429
|
+
const arm =
|
|
430
|
+
selector.kind === "Operand"
|
|
431
|
+
? arms[getOperandIndex(selector.operand, arms.length)]
|
|
432
|
+
: undefined;
|
|
433
|
+
if (!arm) {
|
|
434
|
+
report(range, nonexistent);
|
|
435
|
+
return;
|
|
436
|
+
}
|
|
437
|
+
selectorIndex++;
|
|
438
|
+
const next = selectors[selectorIndex];
|
|
439
|
+
const part = next.kind === "Operand" ? getOperandIndex(next.operand, 2) : -1;
|
|
440
|
+
const nextRange = reference.selectorRanges?.[selectorIndex];
|
|
441
|
+
if (part === -1) {
|
|
442
|
+
report(
|
|
443
|
+
nextRange,
|
|
444
|
+
"Second selector for CASE subexpression must specify one of two operands.",
|
|
445
|
+
);
|
|
446
|
+
return;
|
|
447
|
+
}
|
|
448
|
+
const chosen = part === 0 ? arm.condition : arm.body;
|
|
449
|
+
if (!chosen) {
|
|
450
|
+
report(nextRange, "Selecting OTHER in a CASE statement.");
|
|
451
|
+
return;
|
|
272
452
|
}
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
453
|
+
current = chosen;
|
|
454
|
+
return;
|
|
455
|
+
}
|
|
456
|
+
if (
|
|
457
|
+
current.kind === "Except" &&
|
|
458
|
+
selector.kind === "Operand" &&
|
|
459
|
+
getOperandIndex(selector.operand, current.updates.length + 1) > 0
|
|
460
|
+
) {
|
|
461
|
+
report(range, "Selecting subexpression of an EXCEPT not yet implemented.");
|
|
278
462
|
return;
|
|
279
463
|
}
|
|
280
|
-
if (selector.kind !== "Operand")
|
|
281
|
-
throw createError("Unexpected subexpression selector", location);
|
|
282
464
|
const operands = binder ? binder.sets : getOperands(current);
|
|
465
|
+
if (!operands && current.kind !== "Identifier") {
|
|
466
|
+
report(range, "Selecting subexpression of expression that has none.");
|
|
467
|
+
return;
|
|
468
|
+
}
|
|
469
|
+
if (selector.kind !== "Operand") {
|
|
470
|
+
report(range, nonexistent);
|
|
471
|
+
return;
|
|
472
|
+
}
|
|
283
473
|
const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
|
|
284
|
-
if (!operand)
|
|
285
|
-
|
|
474
|
+
if (!operand) {
|
|
475
|
+
report(range, nonexistent);
|
|
476
|
+
return;
|
|
477
|
+
}
|
|
478
|
+
current = operand;
|
|
286
479
|
};
|
|
287
480
|
|
|
288
481
|
const first = enterDefinition(undefined);
|
|
289
|
-
if (
|
|
482
|
+
if (isFailed) return reference;
|
|
290
483
|
if (first) return applyDefinition(first.definition, { ...selection, args: first.args });
|
|
291
484
|
followLabels();
|
|
292
|
-
while (
|
|
293
|
-
const selector = selectors[
|
|
485
|
+
while (selectorIndex < selectors.length && !isFailed) {
|
|
486
|
+
const selector = selectors[selectorIndex];
|
|
294
487
|
if (selector.kind === "Name") {
|
|
295
|
-
while (
|
|
296
|
-
if (
|
|
297
|
-
|
|
488
|
+
while (current?.kind === "Label") current = current.body;
|
|
489
|
+
if (current?.kind !== "Let") {
|
|
490
|
+
report(
|
|
491
|
+
reference.selectorRanges?.[selectorIndex - 1],
|
|
492
|
+
"A name selector here must be from a LET clause.",
|
|
493
|
+
);
|
|
494
|
+
return reference;
|
|
298
495
|
}
|
|
299
|
-
selection.lets.push(
|
|
300
|
-
const last = enterDefinition(
|
|
301
|
-
if (
|
|
496
|
+
selection.lets.push(current.definitions);
|
|
497
|
+
const last = enterDefinition(current.definitions);
|
|
498
|
+
if (isFailed) return reference;
|
|
302
499
|
if (last) {
|
|
303
500
|
return applyDefinition(last.definition, {
|
|
304
501
|
...selection,
|
|
@@ -308,15 +505,76 @@ const selectSubexpression = (
|
|
|
308
505
|
followLabels();
|
|
309
506
|
continue;
|
|
310
507
|
}
|
|
508
|
+
if (selector.kind === "Colon" && selectors[selectorIndex - 1].kind !== "Name") {
|
|
509
|
+
report(
|
|
510
|
+
reference.selectorRanges?.[selectorIndex - 1],
|
|
511
|
+
"!: should not follow an operand selector.",
|
|
512
|
+
);
|
|
513
|
+
return reference;
|
|
514
|
+
}
|
|
515
|
+
if (
|
|
516
|
+
selector.kind === "Colon" &&
|
|
517
|
+
selectors[selectorIndex + 1]?.kind !== "Name" &&
|
|
518
|
+
(operatorIndex !== selectorIndex - 1 || selectorIndex !== selectors.length - 1)
|
|
519
|
+
) {
|
|
520
|
+
report(
|
|
521
|
+
reference.selectorRanges?.[selectorIndex],
|
|
522
|
+
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
523
|
+
);
|
|
524
|
+
return reference;
|
|
525
|
+
}
|
|
526
|
+
if (selector.kind !== "Colon") {
|
|
527
|
+
checkNull(
|
|
528
|
+
current,
|
|
529
|
+
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
530
|
+
);
|
|
531
|
+
checkNull(
|
|
532
|
+
current,
|
|
533
|
+
`Choosing operand \`${getSelectorName(selector)}' of subexpression with no operands.`,
|
|
534
|
+
true,
|
|
535
|
+
);
|
|
536
|
+
}
|
|
311
537
|
selectOperand(selector);
|
|
312
|
-
|
|
538
|
+
checkNull(
|
|
539
|
+
current,
|
|
540
|
+
`An unexpected null node specified by '${getSelectorName(selectors[selectorIndex])}'.\nThis is probably due to a previous error.`,
|
|
541
|
+
);
|
|
542
|
+
selectorIndex++;
|
|
543
|
+
}
|
|
544
|
+
if (isFailed) return reference;
|
|
545
|
+
if (!current) throw createError("Subexpression selection failed", location);
|
|
546
|
+
const params = selection.params.length;
|
|
547
|
+
const args = selection.args.length;
|
|
548
|
+
if (params !== args) {
|
|
549
|
+
const message = `Expected ${params} arguments but found ${args}.`;
|
|
550
|
+
if (!isOperator || args > 0) {
|
|
551
|
+
report(location.range, message);
|
|
552
|
+
return reference;
|
|
553
|
+
}
|
|
554
|
+
deferToExpression(location.range, message);
|
|
313
555
|
}
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
556
|
+
const body = wrapLets(current, selection.lets, location);
|
|
557
|
+
const share = (expression: Expression): Expression => ({
|
|
558
|
+
kind: "Selection",
|
|
559
|
+
expression,
|
|
560
|
+
// SANY's $Nop, which TLC's call stack shows at the reference, wraps only a selection without parameters.
|
|
561
|
+
location:
|
|
562
|
+
selection.params.length === 0 && body.kind !== "Lambda"
|
|
563
|
+
? location
|
|
564
|
+
: getHiddenLocation(location),
|
|
565
|
+
});
|
|
566
|
+
// SANY selects a LAMBDA itself rather than wrapping it in $Nop, so the selection keeps its arity.
|
|
567
|
+
const selected = createApplication(
|
|
568
|
+
selection,
|
|
569
|
+
body.kind !== "Lambda"
|
|
570
|
+
? share(body)
|
|
571
|
+
: { ...body, body: selections.has(body) ? body.body : share(body.body), location },
|
|
572
|
+
);
|
|
573
|
+
nullSelections.set(selected, nulls);
|
|
574
|
+
if (expressionError) operatorSelectionErrors.set(selected, expressionError);
|
|
575
|
+
return selected;
|
|
317
576
|
};
|
|
318
577
|
|
|
319
|
-
// A name such as Op(1)!lab(2) whose first parts name a definition selects part of it.
|
|
320
578
|
const getQualifiedSelectors = (
|
|
321
579
|
name: string,
|
|
322
580
|
args: Expression[],
|
|
@@ -325,7 +583,7 @@ const getQualifiedSelectors = (
|
|
|
325
583
|
) => {
|
|
326
584
|
if (!name.includes("!") || lookup(name)) return undefined;
|
|
327
585
|
const parts = name.split("!");
|
|
328
|
-
if (!parts.some((
|
|
586
|
+
if (!parts.some((_part, index) => lookup(parts.slice(0, index + 1).join("!")))) return undefined;
|
|
329
587
|
return getNameSelectors(name, args, counts);
|
|
330
588
|
};
|
|
331
589
|
|
|
@@ -335,9 +593,6 @@ const containsReference = (expression: Expression): boolean =>
|
|
|
335
593
|
(expression.kind === "Apply" && expression.operator.includes("!")) ||
|
|
336
594
|
getChildren(expression).some(containsReference);
|
|
337
595
|
|
|
338
|
-
// A reference that starts with a name isGoal holds for, such as a theorem whose statement is an
|
|
339
|
-
// ASSUME/PROVE, stays for name resolution to check. isOperator holds where an operator may be given,
|
|
340
|
-
// as the argument of an operator that may take one.
|
|
341
596
|
const resolveSubexpressions = (
|
|
342
597
|
expression: Expression,
|
|
343
598
|
lookup: Lookup,
|
|
@@ -346,18 +601,43 @@ const resolveSubexpressions = (
|
|
|
346
601
|
): Expression => {
|
|
347
602
|
if (!containsReference(expression)) return expression;
|
|
348
603
|
if (expression.kind === "Let") {
|
|
604
|
+
if (expression.recursive) setDeclaredArities(expression.recursive, expression.definitions);
|
|
605
|
+
const resolved: Definition[] = [];
|
|
349
606
|
const local: Lookup = (name) =>
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
607
|
+
resolved.find((definition) => definition.name === name) ??
|
|
608
|
+
expression.definitions.find((definition) => definition.name === name) ??
|
|
609
|
+
lookup(name);
|
|
610
|
+
const isLocalGoal = (name: string) =>
|
|
611
|
+
!expression.definitions.some((definition) => definition.name === name) && isGoal(name);
|
|
612
|
+
expression.definitions.forEach((definition) =>
|
|
613
|
+
resolved.push(
|
|
614
|
+
resolveDefinition(definition, (child) => resolveSubexpressions(child, local, isLocalGoal)),
|
|
615
|
+
),
|
|
616
|
+
);
|
|
617
|
+
const mapped = {
|
|
618
|
+
...expression,
|
|
619
|
+
definitions: resolved,
|
|
620
|
+
body: resolveSubexpressions(expression.body, local, isLocalGoal),
|
|
621
|
+
};
|
|
622
|
+
return mapped.instances
|
|
353
623
|
? {
|
|
354
624
|
...mapped,
|
|
355
|
-
instances: mapped.instances.map((instance) =>
|
|
625
|
+
instances: mapped.instances.map((instance) =>
|
|
626
|
+
resolveInstance(instance, local, isLocalGoal),
|
|
627
|
+
),
|
|
356
628
|
}
|
|
357
629
|
: mapped;
|
|
358
630
|
}
|
|
359
631
|
const callee = expression.kind === "Apply" ? lookup(expression.operator) : undefined;
|
|
360
|
-
|
|
632
|
+
// SANY expects an operator argument only of a user-defined operator, which a standard module's built-in operators stand for.
|
|
633
|
+
const calleeParams =
|
|
634
|
+
callee?.kind === "Operator"
|
|
635
|
+
? callee.params
|
|
636
|
+
: expression.kind === "Apply"
|
|
637
|
+
? STANDARD_LEVELS.get(expression.operator.slice(expression.operator.lastIndexOf("!") + 1))
|
|
638
|
+
?.formals
|
|
639
|
+
: undefined;
|
|
640
|
+
const rebuilt =
|
|
361
641
|
expression.kind === "Apply"
|
|
362
642
|
? {
|
|
363
643
|
...expression,
|
|
@@ -366,11 +646,15 @@ const resolveSubexpressions = (
|
|
|
366
646
|
arg,
|
|
367
647
|
lookup,
|
|
368
648
|
isGoal,
|
|
369
|
-
|
|
649
|
+
calleeParams !== undefined && calleeParams[index]?.arity !== 0,
|
|
370
650
|
),
|
|
371
651
|
),
|
|
372
652
|
}
|
|
373
653
|
: mapChildren(expression, (child) => resolveSubexpressions(child, lookup, isGoal));
|
|
654
|
+
const children = getChildren(expression);
|
|
655
|
+
const mapped = getChildren(rebuilt).every((child, index) => child === children[index])
|
|
656
|
+
? expression
|
|
657
|
+
: rebuilt;
|
|
374
658
|
const selectors =
|
|
375
659
|
mapped.kind === "Subexpression"
|
|
376
660
|
? mapped.selectors
|
|
@@ -380,9 +664,39 @@ const resolveSubexpressions = (
|
|
|
380
664
|
? getQualifiedSelectors(mapped.operator, mapped.args, mapped.argumentCounts, lookup)
|
|
381
665
|
: undefined;
|
|
382
666
|
const first = selectors?.[0];
|
|
383
|
-
|
|
667
|
+
const setGeneratedArguments = (count: number) => {
|
|
668
|
+
generatedArgumentCounts.set(expression, count);
|
|
669
|
+
generatedArgumentCounts.set(mapped, count);
|
|
670
|
+
};
|
|
671
|
+
if (!selectors) {
|
|
672
|
+
if (mapped.kind === "Apply" && mapped.operator.includes("!") && !lookup(mapped.operator)) {
|
|
673
|
+
setGeneratedArguments(0);
|
|
674
|
+
}
|
|
675
|
+
return mapped;
|
|
676
|
+
}
|
|
677
|
+
const nameCount = selectors.findIndex((selector) => selector.kind !== "Name");
|
|
678
|
+
const names = selectors.slice(0, nameCount === -1 ? selectors.length : nameCount);
|
|
679
|
+
const isQualified = names.some(
|
|
680
|
+
(_name, index) =>
|
|
681
|
+
index > 0 &&
|
|
682
|
+
lookup(
|
|
683
|
+
names
|
|
684
|
+
.slice(0, index + 1)
|
|
685
|
+
.map(getSelectorName)
|
|
686
|
+
.join("!"),
|
|
687
|
+
),
|
|
688
|
+
);
|
|
689
|
+
if (first?.kind === "Name" && isGoal(first.name) && !isQualified) return mapped;
|
|
690
|
+
if (first?.kind === "Name" && selectors[1].kind !== "Name" && !lookup(first.name)) {
|
|
691
|
+
setGeneratedArguments(0);
|
|
692
|
+
return mapped;
|
|
693
|
+
}
|
|
384
694
|
const selected = selectSubexpression(selectors, lookup, mapped, isOperator);
|
|
385
|
-
|
|
695
|
+
const generated = generatedArgumentCounts.get(mapped);
|
|
696
|
+
if (generated !== undefined) setGeneratedArguments(generated);
|
|
697
|
+
const parenthesized = parenthesizedRanges.get(expression);
|
|
698
|
+
if (parenthesized && selected !== mapped) parenthesizedRanges.set(selected, parenthesized);
|
|
699
|
+
if (selected !== mapped) selections.set(selected, mapped);
|
|
386
700
|
return selected;
|
|
387
701
|
};
|
|
388
702
|
|
|
@@ -406,104 +720,202 @@ const createLookup = (definitions: Definition[]): Lookup => {
|
|
|
406
720
|
export const resolveInstanceSubexpressions = (instance: Instance, module: Module): Instance =>
|
|
407
721
|
resolveInstance(instance, createLookup(module.definitions), () => false);
|
|
408
722
|
|
|
409
|
-
// Generator.selectorToNode resolves a name in a theorem, a proof, or a fact as it does in a definition.
|
|
410
723
|
export const resolveModuleSubexpressions = (module: Module, available: Definition[]): Module => {
|
|
411
|
-
const lookup = createLookup([...available, ...module.definitions]);
|
|
412
724
|
const goals = new Set(
|
|
413
725
|
module.theorems.flatMap((theorem) =>
|
|
414
726
|
theorem.name !== undefined && theorem.statement.kind === "AssumeProve" ? [theorem.name] : [],
|
|
415
727
|
),
|
|
416
728
|
);
|
|
417
|
-
const
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
...statement,
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
const
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
return { ...body, expression: resolveInProof(body.expression) };
|
|
459
|
-
case "Witness":
|
|
460
|
-
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
461
|
-
case "Take":
|
|
462
|
-
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
463
|
-
case "Pick":
|
|
464
|
-
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
465
|
-
case "Assert":
|
|
466
|
-
return { ...body, statement: resolveStatement(body.statement) };
|
|
467
|
-
default:
|
|
468
|
-
return body;
|
|
469
|
-
}
|
|
729
|
+
const clauses = module.theorems.flatMap((theorem): Definition[] => {
|
|
730
|
+
const statement = theorem.statement;
|
|
731
|
+
if (theorem.name === undefined || statement.kind !== "AssumeProve") return [];
|
|
732
|
+
const assumptions = statement.assumptions.filter(
|
|
733
|
+
(assumption) => assumption.kind !== "NewSymbol" && assumption.kind !== "AssumeProve",
|
|
734
|
+
);
|
|
735
|
+
if (assumptions.length !== statement.assumptions.length) return [];
|
|
736
|
+
return [
|
|
737
|
+
{
|
|
738
|
+
kind: "Operator",
|
|
739
|
+
name: theorem.name,
|
|
740
|
+
params: [],
|
|
741
|
+
body: {
|
|
742
|
+
kind: "Tuple",
|
|
743
|
+
elements: [...assumptions, statement.conclusion],
|
|
744
|
+
location: statement.location,
|
|
745
|
+
},
|
|
746
|
+
isLocal: true,
|
|
747
|
+
isRecursive: false,
|
|
748
|
+
location: theorem.location,
|
|
749
|
+
},
|
|
750
|
+
];
|
|
751
|
+
});
|
|
752
|
+
const own = new Set([...module.definitions, ...clauses]);
|
|
753
|
+
setDeclaredArities(
|
|
754
|
+
module.units.flatMap((unit) => (unit.kind === "Recursive" ? unit.declarations : [])),
|
|
755
|
+
module.definitions,
|
|
756
|
+
);
|
|
757
|
+
const recursive = new Map(
|
|
758
|
+
module.units.flatMap((unit): [string, SourceLocation][] =>
|
|
759
|
+
unit.kind === "Recursive"
|
|
760
|
+
? unit.declarations.map((declaration) => [declaration.name, declaration.location])
|
|
761
|
+
: [],
|
|
762
|
+
),
|
|
763
|
+
);
|
|
764
|
+
const isDeclaredBefore = (definition: Definition, location: SourceLocation) => {
|
|
765
|
+
const declared = recursive.get(definition.name);
|
|
766
|
+
return (
|
|
767
|
+
isBefore(definition.location, location) ||
|
|
768
|
+
(definition.isRecursive && declared !== undefined && isBefore(declared, location))
|
|
769
|
+
);
|
|
470
770
|
};
|
|
471
|
-
const
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
771
|
+
const resolvedDefinitions = new Map<Definition, Definition>();
|
|
772
|
+
const getVisibleLookup =
|
|
773
|
+
(lookup: Lookup, location: SourceLocation): Lookup =>
|
|
774
|
+
(name) => {
|
|
775
|
+
const definition = lookup(name);
|
|
776
|
+
if (!definition || (own.has(definition) && !isDeclaredBefore(definition, location))) {
|
|
777
|
+
return undefined;
|
|
778
|
+
}
|
|
779
|
+
return resolvedDefinitions.get(definition) ?? definition;
|
|
780
|
+
};
|
|
781
|
+
const proofLookup = createLookup([...available, ...module.definitions]);
|
|
782
|
+
const isGoal = (name: string) => goals.has(name);
|
|
783
|
+
const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
|
|
784
|
+
const resolve = (expression: Expression, location: SourceLocation) =>
|
|
785
|
+
resolveSubexpressions(
|
|
786
|
+
expression,
|
|
787
|
+
getVisibleLookup(definitionLookup, location),
|
|
788
|
+
(name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
|
|
789
|
+
);
|
|
790
|
+
const createProofResolver = (lookup: Lookup) => {
|
|
791
|
+
const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
|
|
792
|
+
const resolveInProof = (expression: Expression) =>
|
|
793
|
+
resolveSubexpressions(expression, lookup, isProofGoal);
|
|
794
|
+
const resolveFacts = (facts: Fact[]) => {
|
|
795
|
+
const resolved = facts.map((fact) =>
|
|
796
|
+
fact.kind === "ModuleFact" ? fact : resolveInProof(fact),
|
|
797
|
+
);
|
|
798
|
+
factReferences.set(resolved, facts);
|
|
799
|
+
return resolved;
|
|
800
|
+
};
|
|
801
|
+
const resolveBounds = (bounds: Bound[]) =>
|
|
802
|
+
bounds.map((bound) => ({ ...bound, set: resolveInProof(bound.set) }));
|
|
803
|
+
const resolveStatement = (statement: Expression | AssumeProve): Expression | AssumeProve =>
|
|
804
|
+
statement.kind === "AssumeProve"
|
|
475
805
|
? {
|
|
476
|
-
...
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
806
|
+
...statement,
|
|
807
|
+
assumptions: statement.assumptions.map((assumption) =>
|
|
808
|
+
assumption.kind === "NewSymbol"
|
|
809
|
+
? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
|
|
810
|
+
: resolveStatement(assumption),
|
|
811
|
+
),
|
|
812
|
+
conclusion: resolveInProof(statement.conclusion),
|
|
482
813
|
}
|
|
483
|
-
:
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
814
|
+
: resolveInProof(statement);
|
|
815
|
+
const resolveStep = (body: StepBody): StepBody => {
|
|
816
|
+
switch (body.kind) {
|
|
817
|
+
case "Use":
|
|
818
|
+
case "Hide":
|
|
819
|
+
return { ...body, facts: resolveFacts(body.facts) };
|
|
820
|
+
case "Instance":
|
|
821
|
+
return resolveInstance(body, lookup, isProofGoal);
|
|
822
|
+
case "Define":
|
|
823
|
+
return {
|
|
824
|
+
...body,
|
|
825
|
+
definitions: body.definitions.map((definition) =>
|
|
826
|
+
definition.kind === "Instance"
|
|
827
|
+
? resolveInstance(definition, lookup, isProofGoal)
|
|
828
|
+
: resolveDefinition(definition, resolveInProof),
|
|
829
|
+
),
|
|
830
|
+
};
|
|
831
|
+
case "Have":
|
|
832
|
+
case "Case":
|
|
833
|
+
return { ...body, expression: resolveInProof(body.expression) };
|
|
834
|
+
case "Witness":
|
|
835
|
+
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
836
|
+
case "Take":
|
|
837
|
+
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
838
|
+
case "Pick":
|
|
839
|
+
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
840
|
+
case "Assert":
|
|
841
|
+
return { ...body, statement: resolveStatement(body.statement) };
|
|
842
|
+
default:
|
|
843
|
+
return body;
|
|
844
|
+
}
|
|
845
|
+
};
|
|
846
|
+
const resolveProof = (proof: Proof | undefined): Proof | undefined => {
|
|
847
|
+
if (proof?.kind === "By") return { ...proof, facts: resolveFacts(proof.facts) };
|
|
848
|
+
if (proof?.kind !== "Steps") return proof;
|
|
849
|
+
let resolver = { lookup, resolveStep, resolveProof };
|
|
850
|
+
return {
|
|
851
|
+
...proof,
|
|
852
|
+
steps: proof.steps.map((step) => {
|
|
853
|
+
const resolved = {
|
|
854
|
+
...step,
|
|
855
|
+
body: resolver.resolveStep(step.body),
|
|
856
|
+
proof: resolver.resolveProof(step.proof),
|
|
857
|
+
};
|
|
858
|
+
if (resolved.body.kind === "Define") {
|
|
859
|
+
const definitions = resolved.body.definitions.flatMap((definition) =>
|
|
860
|
+
definition.kind === "Instance" ? [] : [definition],
|
|
861
|
+
);
|
|
862
|
+
const outer = resolver.lookup;
|
|
863
|
+
resolver = createProofResolver(
|
|
864
|
+
(name) => definitions.find((definition) => definition.name === name) ?? outer(name),
|
|
865
|
+
);
|
|
866
|
+
}
|
|
867
|
+
return resolved;
|
|
868
|
+
}),
|
|
869
|
+
};
|
|
870
|
+
};
|
|
871
|
+
return { lookup, resolveFacts, resolveStatement, resolveStep, resolveProof };
|
|
496
872
|
};
|
|
497
873
|
const hasReferences =
|
|
498
874
|
module.definitions.some((definition) => containsReference(definition.body)) ||
|
|
499
875
|
module.assumptions.some((assumption) => containsReference(assumption.expression));
|
|
876
|
+
if (hasReferences) {
|
|
877
|
+
[...module.definitions, ...clauses]
|
|
878
|
+
.toSorted((left, right) => compareLocations(left.location, right.location))
|
|
879
|
+
.forEach((definition) =>
|
|
880
|
+
resolvedDefinitions.set(
|
|
881
|
+
definition,
|
|
882
|
+
resolveDefinition(definition, (expression) => resolve(expression, definition.location)),
|
|
883
|
+
),
|
|
884
|
+
);
|
|
885
|
+
}
|
|
886
|
+
const resolved = {
|
|
887
|
+
...module,
|
|
888
|
+
theorems: module.theorems.map((theorem) => {
|
|
889
|
+
const resolver = createProofResolver(getVisibleLookup(proofLookup, theorem.location));
|
|
890
|
+
return {
|
|
891
|
+
...theorem,
|
|
892
|
+
statement:
|
|
893
|
+
theorem.name !== undefined && theorem.statement.kind !== "AssumeProve"
|
|
894
|
+
? theorem.statement
|
|
895
|
+
: resolver.resolveStatement(theorem.statement),
|
|
896
|
+
proof:
|
|
897
|
+
theorem.proof &&
|
|
898
|
+
createProofResolver(getVisibleLookup(proofLookup, theorem.proof.location)).resolveProof(
|
|
899
|
+
theorem.proof,
|
|
900
|
+
),
|
|
901
|
+
};
|
|
902
|
+
}),
|
|
903
|
+
uses: module.uses.map((use) => ({
|
|
904
|
+
...use,
|
|
905
|
+
facts: createProofResolver(getVisibleLookup(proofLookup, use.location)).resolveFacts(
|
|
906
|
+
use.facts,
|
|
907
|
+
),
|
|
908
|
+
})),
|
|
909
|
+
};
|
|
500
910
|
if (!hasReferences) return resolved;
|
|
501
911
|
return {
|
|
502
912
|
...resolved,
|
|
503
|
-
definitions: module.definitions.map(
|
|
913
|
+
definitions: module.definitions.map(
|
|
914
|
+
(definition) => resolvedDefinitions.get(definition) ?? definition,
|
|
915
|
+
),
|
|
504
916
|
assumptions: module.assumptions.map((assumption) => ({
|
|
505
917
|
...assumption,
|
|
506
|
-
expression: resolve(assumption.expression),
|
|
918
|
+
expression: resolve(assumption.expression, assumption.location),
|
|
507
919
|
})),
|
|
508
920
|
};
|
|
509
921
|
};
|