tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.37a75eb5b
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/bags.ts +47 -28
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +476 -590
- 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 +686 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +60 -708
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +25 -18
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +14 -7
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +42 -44
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +597 -240
- package/src/liveness.ts +94 -86
- 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 +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- 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 +118 -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 +652 -220
- 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 +224 -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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- 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 +6 -17
- 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 +0 -2
- 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/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 +1021 -618
- 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 -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 +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +536 -117
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -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 +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -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 +30 -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 +110 -38
- 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 +345 -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 +18 -3
- 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 +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- 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 +165 -83
- 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 -289
- 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 +309 -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 +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1407 -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 +315 -97
- 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 +464 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2410 -683
- 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 +40 -19
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -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 +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -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 +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +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 +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1704 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- 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 +1995 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- 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 +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- 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 +0 -2
- 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 +127 -108
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +382 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1092 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +243 -52
- package/src/simulate.ts +160 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -9
- package/src/subexpressions.ts +3 -1
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +16 -12
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +26 -47
- package/src/typed-tier.ts +6535 -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/values.ts +63 -158
- 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
package/src/parser.ts
CHANGED
|
@@ -35,6 +35,24 @@ interface InfixOperator extends Precedence {
|
|
|
35
35
|
isAssociative: boolean;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
interface TlapmOperand {
|
|
39
|
+
start: number;
|
|
40
|
+
end: number;
|
|
41
|
+
expression: Expression;
|
|
42
|
+
joinedBy?: string;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
interface TlapmOperator extends Precedence {
|
|
46
|
+
start: number;
|
|
47
|
+
end: number;
|
|
48
|
+
fixity: "Prefix" | "Infix" | "Postfix";
|
|
49
|
+
isLeft: boolean;
|
|
50
|
+
joins?: string;
|
|
51
|
+
apply: (operands: TlapmOperand[]) => Expression;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
type TlapmItem = TlapmOperand | TlapmOperator;
|
|
55
|
+
|
|
38
56
|
const POSTFIX_PRECEDENCE = { low: 15, high: 15 };
|
|
39
57
|
const FUNCTION_PRECEDENCE = { low: 16, high: 16 };
|
|
40
58
|
|
|
@@ -144,6 +162,49 @@ const INFIX_OPERATORS = new Map<string, InfixOperator>([
|
|
|
144
162
|
|
|
145
163
|
const NEGATION_PRECEDENCE = 12;
|
|
146
164
|
|
|
165
|
+
// tlapm's Optable has SANY's infix precedences, groups % and \X to the left with the operators
|
|
166
|
+
// SANY takes as associative, and has these prefix precedences. A function application and a field
|
|
167
|
+
// bind above every operator.
|
|
168
|
+
const isTlapmLeft = (text: string, infix: InfixOperator) =>
|
|
169
|
+
infix.isAssociative || text === "%" || text === "\\X";
|
|
170
|
+
|
|
171
|
+
const TLAPM_PREFIX_OPERATORS = new Map<string, Precedence>([
|
|
172
|
+
["~", { low: 4, high: 4 }],
|
|
173
|
+
["[]", { low: 4, high: 15 }],
|
|
174
|
+
["<>", { low: 4, high: 15 }],
|
|
175
|
+
["ENABLED", { low: 4, high: 15 }],
|
|
176
|
+
["UNCHANGED", { low: 4, high: 15 }],
|
|
177
|
+
["SUBSET", { low: 8, high: 8 }],
|
|
178
|
+
["UNION", { low: 8, high: 8 }],
|
|
179
|
+
["DOMAIN", { low: 9, high: 9 }],
|
|
180
|
+
["-", { low: 12, high: 12 }],
|
|
181
|
+
["-.", { low: 12, high: 12 }],
|
|
182
|
+
]);
|
|
183
|
+
|
|
184
|
+
const TLAPM_SELECTION_PRECEDENCE = { low: 17, high: 17 };
|
|
185
|
+
|
|
186
|
+
const TLAPM_ATOM_STARTS = new Set([
|
|
187
|
+
"(",
|
|
188
|
+
"[",
|
|
189
|
+
"{",
|
|
190
|
+
"<<",
|
|
191
|
+
"@",
|
|
192
|
+
"\\A",
|
|
193
|
+
"\\E",
|
|
194
|
+
"\\AA",
|
|
195
|
+
"\\EE",
|
|
196
|
+
"IF",
|
|
197
|
+
"CASE",
|
|
198
|
+
"LET",
|
|
199
|
+
"CHOOSE",
|
|
200
|
+
"LAMBDA",
|
|
201
|
+
"WF_",
|
|
202
|
+
"SF_",
|
|
203
|
+
]);
|
|
204
|
+
|
|
205
|
+
// The brackets whose contents tlapm reads without committing, so a failure in them backtracks.
|
|
206
|
+
const TLAPM_OPEN_BRACKETS = new Set(["(", "{", "<<"]);
|
|
207
|
+
|
|
147
208
|
const POSTFIX_OPERATORS = new Set(["^+", "^*", "^#"]);
|
|
148
209
|
|
|
149
210
|
const DEFINABLE_POSTFIX_OPERATORS = new Set([...POSTFIX_OPERATORS, "'"]);
|
|
@@ -315,13 +376,30 @@ const getSpan = (range: SourceRange): Span => ({
|
|
|
315
376
|
stop: { line: range.end.line, column: range.end.column + 1 },
|
|
316
377
|
});
|
|
317
378
|
|
|
318
|
-
|
|
379
|
+
interface ProofErrorEnds {
|
|
380
|
+
printed: string;
|
|
381
|
+
set: string;
|
|
382
|
+
}
|
|
383
|
+
|
|
384
|
+
const NO_NEWLINES: ProofErrorEnds = { printed: "", set: "" };
|
|
385
|
+
|
|
386
|
+
const PRINTED_NEWLINE: ProofErrorEnds = { printed: "\n", set: "" };
|
|
387
|
+
|
|
388
|
+
const NEWLINES: ProofErrorEnds = { printed: "\n", set: "\n" };
|
|
389
|
+
|
|
390
|
+
// p_parser.ml ends some of the messages it prints, and of those it sets, with a newline.
|
|
391
|
+
const createProofError = (
|
|
392
|
+
message: string,
|
|
393
|
+
span: Span,
|
|
394
|
+
ends: ProofErrorEnds,
|
|
395
|
+
exception = "Proof.Parser",
|
|
396
|
+
) =>
|
|
319
397
|
new TlaSyntaxError(message, undefined, {
|
|
320
|
-
reason: message
|
|
398
|
+
reason: `${message}${ends.set}`,
|
|
321
399
|
line: span.start.line,
|
|
322
400
|
column: span.start.column,
|
|
323
401
|
isEnd: false,
|
|
324
|
-
proof: { stop: span.stop, exception },
|
|
402
|
+
proof: { stop: span.stop, exception, printed: `${message}${ends.printed}` },
|
|
325
403
|
});
|
|
326
404
|
|
|
327
405
|
const FACT_KEYWORDS = new Set([
|
|
@@ -426,6 +504,11 @@ const parse = (
|
|
|
426
504
|
const factNames = new Set<string>();
|
|
427
505
|
const proofScopes: Set<string>[] = [];
|
|
428
506
|
const openModules: Module[] = [];
|
|
507
|
+
// Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
|
|
508
|
+
let attemptFrame: number | undefined;
|
|
509
|
+
let attemptCount = 0;
|
|
510
|
+
const restorePoints: number[] = [];
|
|
511
|
+
const backtracks = new WeakMap<TlaSyntaxError, number>();
|
|
429
512
|
|
|
430
513
|
const isRecursiveName = (name: string) => recursiveScopes[recursiveScopes.length - 1].has(name);
|
|
431
514
|
|
|
@@ -473,15 +556,6 @@ const parse = (
|
|
|
473
556
|
const describeToken = (token: Token) =>
|
|
474
557
|
token.kind === "End" ? "end of input" : JSON.stringify(token.text);
|
|
475
558
|
|
|
476
|
-
let unitStart = 0;
|
|
477
|
-
|
|
478
|
-
const getDefinitionEnd = (fallback: Point) => {
|
|
479
|
-
const equals = tokens
|
|
480
|
-
.slice(unitStart, cursor)
|
|
481
|
-
.find((token) => token.text === "==" && token.kind !== "String");
|
|
482
|
-
return equals ? { line: equals.line, column: equals.endColumn + 1 } : fallback;
|
|
483
|
-
};
|
|
484
|
-
|
|
485
559
|
const isTlapmKeyword = (token: Token) =>
|
|
486
560
|
isTlapm && (token.kind === "Keyword" || BUILTIN_CONSTANTS.has(token.text));
|
|
487
561
|
|
|
@@ -496,6 +570,7 @@ const parse = (
|
|
|
496
570
|
};
|
|
497
571
|
|
|
498
572
|
const getTlapmName = (token: Token) => {
|
|
573
|
+
if (token.kind === "End") return "EOF";
|
|
499
574
|
if (/^-{4,}$/.test(token.text)) return "----";
|
|
500
575
|
if (/^={4,}$/.test(token.text)) return "====";
|
|
501
576
|
if (TLAPM_PUNCTUATION.has(token.text) || token.kind === "Number" || token.kind === "Decimal")
|
|
@@ -509,36 +584,75 @@ const parse = (
|
|
|
509
584
|
const createError = (message: string, token: Point = peekRaw(), unexpected?: Token) => {
|
|
510
585
|
const end = tokens[tokens.length - 1];
|
|
511
586
|
const isEnd = token.line === end.line && token.column === end.column;
|
|
512
|
-
|
|
587
|
+
const error = new TlaSyntaxError(
|
|
513
588
|
`${message} at line ${token.line}, column ${token.column}`,
|
|
514
589
|
undefined,
|
|
515
590
|
getFailure(message, token, isEnd, unexpected),
|
|
516
591
|
);
|
|
592
|
+
if (attemptFrame !== undefined) backtracks.set(error, attemptFrame);
|
|
593
|
+
return error;
|
|
517
594
|
};
|
|
518
595
|
|
|
596
|
+
// tlapm reports a failure after the last token it read before the outermost attempt around it.
|
|
519
597
|
const getFailure = (
|
|
520
598
|
message: string,
|
|
521
599
|
token: Point,
|
|
522
600
|
isEnd: boolean,
|
|
523
601
|
unexpected: Token | undefined,
|
|
524
602
|
) => {
|
|
525
|
-
if (isTlapm
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
}
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
reason: `Unexpected ${getTlapmName(unexpected)}`,
|
|
532
|
-
...getPreviousEnd(unexpected),
|
|
533
|
-
isEnd,
|
|
534
|
-
};
|
|
535
|
-
}
|
|
536
|
-
return { reason: message, line: token.line, column: token.column, isEnd };
|
|
603
|
+
if (!isTlapm) return { reason: message, line: token.line, column: token.column, isEnd };
|
|
604
|
+
const restored = tokens[restorePoints[0] - 1];
|
|
605
|
+
const reason = unexpected ? `Unexpected ${getTlapmName(unexpected)}` : message;
|
|
606
|
+
if (restored) return { reason, line: restored.line, column: restored.endColumn + 1, isEnd };
|
|
607
|
+
const position = unexpected ? getPreviousEnd(unexpected) : token;
|
|
608
|
+
return { reason, line: position.line, column: position.column, isEnd };
|
|
537
609
|
};
|
|
538
610
|
|
|
539
611
|
const createUnexpected = (message: string, token: Token = peekRaw()) =>
|
|
540
612
|
createError(message, token, token);
|
|
541
613
|
|
|
614
|
+
// Pco.attempt: a failure that backtracks to it leaves the input as it was, and gives undefined.
|
|
615
|
+
const attempt = <Result>(parse: () => Result): Result | undefined => {
|
|
616
|
+
const saved = {
|
|
617
|
+
cursor,
|
|
618
|
+
frame: attemptFrame,
|
|
619
|
+
restorePoints: restorePoints.length,
|
|
620
|
+
offsideColumns: offsideColumns.length,
|
|
621
|
+
recursiveScopes: recursiveScopes.length,
|
|
622
|
+
};
|
|
623
|
+
const frame = ++attemptCount;
|
|
624
|
+
attemptFrame = frame;
|
|
625
|
+
try {
|
|
626
|
+
const result = parse();
|
|
627
|
+
attemptFrame = saved.frame;
|
|
628
|
+
return result;
|
|
629
|
+
} catch (error) {
|
|
630
|
+
if (!(error instanceof TlaSyntaxError) || backtracks.get(error) !== frame) throw error;
|
|
631
|
+
cursor = saved.cursor;
|
|
632
|
+
attemptFrame = saved.frame;
|
|
633
|
+
restorePoints.length = saved.restorePoints;
|
|
634
|
+
offsideColumns.length = saved.offsideColumns;
|
|
635
|
+
recursiveScopes.length = saved.recursiveScopes;
|
|
636
|
+
return undefined;
|
|
637
|
+
}
|
|
638
|
+
};
|
|
639
|
+
|
|
640
|
+
// Pco.commit: a failure in parse no longer backtracks.
|
|
641
|
+
const commit = <Result>(parse: () => Result) => {
|
|
642
|
+
const frame = attemptFrame;
|
|
643
|
+
attemptFrame = undefined;
|
|
644
|
+
const result = parse();
|
|
645
|
+
attemptFrame = frame;
|
|
646
|
+
return result;
|
|
647
|
+
};
|
|
648
|
+
|
|
649
|
+
const withRestorePoint = <Result>(parse: () => Result) => {
|
|
650
|
+
restorePoints.push(cursor);
|
|
651
|
+
const result = parse();
|
|
652
|
+
restorePoints.pop();
|
|
653
|
+
return result;
|
|
654
|
+
};
|
|
655
|
+
|
|
542
656
|
const isFieldName = (token: Token) =>
|
|
543
657
|
(token.kind === "Identifier" ||
|
|
544
658
|
token.kind === "Keyword" ||
|
|
@@ -552,7 +666,7 @@ const parse = (
|
|
|
552
666
|
|
|
553
667
|
const advance = () => {
|
|
554
668
|
const token = peek();
|
|
555
|
-
if (token.kind === "End") throw
|
|
669
|
+
if (token.kind === "End") throw createUnexpected("Unexpected end of expression");
|
|
556
670
|
cursor++;
|
|
557
671
|
return token;
|
|
558
672
|
};
|
|
@@ -622,13 +736,13 @@ const parse = (
|
|
|
622
736
|
return items;
|
|
623
737
|
};
|
|
624
738
|
|
|
625
|
-
const isBoundAhead = () => {
|
|
626
|
-
if (isAt("<<")) {
|
|
627
|
-
let offset = 1;
|
|
739
|
+
const isBoundAhead = (start = 0) => {
|
|
740
|
+
if (isAt("<<", start)) {
|
|
741
|
+
let offset = start + 1;
|
|
628
742
|
while (peek(offset).kind === "Identifier" || isAt(",", offset)) offset++;
|
|
629
743
|
return isAt(">>", offset) && isAt("\\in", offset + 1);
|
|
630
744
|
}
|
|
631
|
-
let offset =
|
|
745
|
+
let offset = start;
|
|
632
746
|
while (peek(offset).kind === "Identifier") {
|
|
633
747
|
if (isAt("\\in", offset + 1)) return true;
|
|
634
748
|
if (!isAt(",", offset + 1)) return false;
|
|
@@ -655,13 +769,21 @@ const parse = (
|
|
|
655
769
|
return { kind: "Tuple", names: names.names, ranges: names.ranges };
|
|
656
770
|
};
|
|
657
771
|
|
|
658
|
-
|
|
659
|
-
|
|
772
|
+
// tlapm's func_boundeds reads another bound only where names and \in follow the comma.
|
|
773
|
+
const parseBounds = () => {
|
|
774
|
+
const parseBound = () => {
|
|
660
775
|
const patterns = parseSeparated(parsePattern);
|
|
661
776
|
expect("\\in");
|
|
662
|
-
const set = parseExpression
|
|
777
|
+
const set = commit(parseExpression);
|
|
663
778
|
return patterns.map((pattern) => ({ pattern, set }));
|
|
664
|
-
}
|
|
779
|
+
};
|
|
780
|
+
const bounds = [parseBound()];
|
|
781
|
+
while (isAt(",") && (!isTlapm || isBoundAhead(1))) {
|
|
782
|
+
advance();
|
|
783
|
+
bounds.push(parseBound());
|
|
784
|
+
}
|
|
785
|
+
return bounds.flat();
|
|
786
|
+
};
|
|
665
787
|
|
|
666
788
|
const parseSubscript = (): { subscript: Expression; lastArgs: Expression[] } => {
|
|
667
789
|
const token = peek();
|
|
@@ -823,7 +945,11 @@ const parse = (
|
|
|
823
945
|
start,
|
|
824
946
|
);
|
|
825
947
|
}
|
|
826
|
-
return parseExpression();
|
|
948
|
+
if (!isTlapm) return parseExpression();
|
|
949
|
+
// tlapm's oparg reads an operator where an expression doesn't start, and fails otherwise.
|
|
950
|
+
const argument = attempt(parseExpression);
|
|
951
|
+
if (argument) return argument;
|
|
952
|
+
throw createUnexpected(`Unexpected ${describeToken(peek())}`);
|
|
827
953
|
};
|
|
828
954
|
|
|
829
955
|
let lastArgumentsRange: SourceRange | undefined;
|
|
@@ -842,14 +968,19 @@ const parse = (
|
|
|
842
968
|
const bullet = advance();
|
|
843
969
|
offsideColumns.push(bullet.column);
|
|
844
970
|
const operands = [parseExpression()];
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
971
|
+
const parseItems = () => {
|
|
972
|
+
while (
|
|
973
|
+
isBullet(peekRaw()) &&
|
|
974
|
+
peekRaw().text === bullet.text &&
|
|
975
|
+
peekRaw().column === bullet.column
|
|
976
|
+
) {
|
|
977
|
+
cursor++;
|
|
978
|
+
operands.push(parseExpression());
|
|
979
|
+
}
|
|
980
|
+
};
|
|
981
|
+
// bulleted_list: a first item that fails leaves expr_or_op's other readings to fail after it.
|
|
982
|
+
if (isTlapm) commit(parseItems);
|
|
983
|
+
else parseItems();
|
|
853
984
|
offsideColumns.pop();
|
|
854
985
|
return {
|
|
855
986
|
kind: bullet.text === "/\\" ? "And" : "Or",
|
|
@@ -940,7 +1071,7 @@ const parse = (
|
|
|
940
1071
|
const element = withRange(parsePrefix(), start);
|
|
941
1072
|
const location = getLocation(advance());
|
|
942
1073
|
return withRange(
|
|
943
|
-
{ kind: "Apply", operator: "\\in", args: [element, parseExpression
|
|
1074
|
+
{ kind: "Apply", operator: "\\in", args: [element, commit(parseExpression)], location },
|
|
944
1075
|
start,
|
|
945
1076
|
);
|
|
946
1077
|
};
|
|
@@ -953,9 +1084,9 @@ const parse = (
|
|
|
953
1084
|
const checkpoint = cursor;
|
|
954
1085
|
const pattern = parsePattern();
|
|
955
1086
|
expect("\\in");
|
|
956
|
-
const set = parseExpression
|
|
1087
|
+
const set = commit(parseExpression);
|
|
957
1088
|
if (accept(":")) {
|
|
958
|
-
const predicate = parseExpression
|
|
1089
|
+
const predicate = commit(parseExpression);
|
|
959
1090
|
expect("}");
|
|
960
1091
|
return { kind: "SetFilter", bound: { pattern, set }, predicate, location };
|
|
961
1092
|
}
|
|
@@ -985,7 +1116,7 @@ const parse = (
|
|
|
985
1116
|
return {
|
|
986
1117
|
kind: "AngleAction",
|
|
987
1118
|
action: elements[0],
|
|
988
|
-
subscript: parseSubscript
|
|
1119
|
+
subscript: commit(parseSubscript).subscript,
|
|
989
1120
|
location,
|
|
990
1121
|
};
|
|
991
1122
|
}
|
|
@@ -1070,6 +1201,49 @@ const parse = (
|
|
|
1070
1201
|
return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
|
|
1071
1202
|
};
|
|
1072
1203
|
|
|
1204
|
+
const parseSelections = (
|
|
1205
|
+
name: string,
|
|
1206
|
+
args: Expression[],
|
|
1207
|
+
argumentsRange: SourceRange | undefined,
|
|
1208
|
+
start: number,
|
|
1209
|
+
location: SourceLocation,
|
|
1210
|
+
): Expression => {
|
|
1211
|
+
const selectors: Selector[] = [{ kind: "Name", name, args }];
|
|
1212
|
+
const selectorRanges = [getRange(start, start)];
|
|
1213
|
+
const argumentRanges = [argumentsRange];
|
|
1214
|
+
while (isSelectorAhead()) {
|
|
1215
|
+
advance();
|
|
1216
|
+
selectorRanges.push(getRange(cursor, cursor));
|
|
1217
|
+
lastArgumentsRange = undefined;
|
|
1218
|
+
selectors.push(parseSelector());
|
|
1219
|
+
argumentRanges.push(lastArgumentsRange);
|
|
1220
|
+
}
|
|
1221
|
+
const names = selectors.flatMap((selector) =>
|
|
1222
|
+
selector.kind === "Name" ? [selector.name] : [],
|
|
1223
|
+
);
|
|
1224
|
+
const operator = names.join("!");
|
|
1225
|
+
const qualifiedArgs = selectors.flatMap((selector) =>
|
|
1226
|
+
"args" in selector ? selector.args : [],
|
|
1227
|
+
);
|
|
1228
|
+
const argumentCounts = selectors.map((selector) =>
|
|
1229
|
+
"args" in selector ? selector.args.length : 0,
|
|
1230
|
+
);
|
|
1231
|
+
return names.length < selectors.length
|
|
1232
|
+
? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
|
|
1233
|
+
: qualifiedArgs.length === 0
|
|
1234
|
+
? { kind: "Identifier", name: operator, selectorRanges, location }
|
|
1235
|
+
: {
|
|
1236
|
+
kind: "Apply",
|
|
1237
|
+
operator,
|
|
1238
|
+
args: qualifiedArgs,
|
|
1239
|
+
...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
|
|
1240
|
+
argumentsRange: argumentRanges.at(-1) ?? getRange(start),
|
|
1241
|
+
selectorRanges,
|
|
1242
|
+
argumentRanges,
|
|
1243
|
+
location,
|
|
1244
|
+
};
|
|
1245
|
+
};
|
|
1246
|
+
|
|
1073
1247
|
const parsePrimary = (preceding?: Precedence): Expression => {
|
|
1074
1248
|
const start = cursor;
|
|
1075
1249
|
const token = advance();
|
|
@@ -1079,10 +1253,8 @@ const parse = (
|
|
|
1079
1253
|
expect(":");
|
|
1080
1254
|
return { kind: "Lambda", params, body: parseExpression(), location };
|
|
1081
1255
|
}
|
|
1082
|
-
if (token.kind === "Number")
|
|
1083
|
-
if (isTlapm && /^\\[BOH]/.test(token.text)) throw createError("incomplete expression", token);
|
|
1256
|
+
if (token.kind === "Number")
|
|
1084
1257
|
return { kind: "Number", value: getNumeralValue(token.text), text: token.text, location };
|
|
1085
|
-
}
|
|
1086
1258
|
if (token.kind === "Decimal") return { kind: "Decimal", text: token.text, location };
|
|
1087
1259
|
if (token.kind === "String") return { kind: "String", value: token.text, location };
|
|
1088
1260
|
const isStep = token.kind === "Step" && isStepReference(token);
|
|
@@ -1123,56 +1295,45 @@ const parse = (
|
|
|
1123
1295
|
if (name === "@" && !hasArguments && !isSelectorAhead())
|
|
1124
1296
|
return { kind: "ExceptAt", location };
|
|
1125
1297
|
const args = hasArguments ? parseArguments() : [];
|
|
1126
|
-
const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
|
|
1127
1298
|
if (!isSelectorAhead()) {
|
|
1128
1299
|
return hasArguments
|
|
1129
1300
|
? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
|
|
1130
1301
|
: { kind: "Identifier", name, location };
|
|
1131
1302
|
}
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
selectors.push(parseSelector());
|
|
1139
|
-
argumentRanges.push(lastArgumentsRange);
|
|
1140
|
-
}
|
|
1141
|
-
const names = selectors.flatMap((selector) =>
|
|
1142
|
-
selector.kind === "Name" ? [selector.name] : [],
|
|
1143
|
-
);
|
|
1144
|
-
const operator = names.join("!");
|
|
1145
|
-
const qualifiedArgs = selectors.flatMap((selector) =>
|
|
1146
|
-
"args" in selector ? selector.args : [],
|
|
1147
|
-
);
|
|
1148
|
-
const argumentCounts = selectors.map((selector) =>
|
|
1149
|
-
"args" in selector ? selector.args.length : 0,
|
|
1303
|
+
return parseSelections(
|
|
1304
|
+
name,
|
|
1305
|
+
args,
|
|
1306
|
+
hasArguments ? lastArgumentsRange : undefined,
|
|
1307
|
+
start,
|
|
1308
|
+
location,
|
|
1150
1309
|
);
|
|
1151
|
-
const argumentsRange = argumentRanges.at(-1) ?? getRange(start);
|
|
1152
|
-
return names.length < selectors.length
|
|
1153
|
-
? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
|
|
1154
|
-
: qualifiedArgs.length === 0
|
|
1155
|
-
? { kind: "Identifier", name: operator, selectorRanges, location }
|
|
1156
|
-
: {
|
|
1157
|
-
kind: "Apply",
|
|
1158
|
-
operator,
|
|
1159
|
-
args: qualifiedArgs,
|
|
1160
|
-
...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
|
|
1161
|
-
argumentsRange,
|
|
1162
|
-
selectorRanges,
|
|
1163
|
-
argumentRanges,
|
|
1164
|
-
location,
|
|
1165
|
-
};
|
|
1166
1310
|
}
|
|
1167
|
-
|
|
1311
|
+
const isOperatorNamed =
|
|
1312
|
+
token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
|
|
1313
|
+
if (isOperatorNamed && isAt("(")) {
|
|
1168
1314
|
const args = parseArguments();
|
|
1315
|
+
if (!isTlapm && isSelectorAhead()) {
|
|
1316
|
+
return parseSelections(token.text, args, lastArgumentsRange, start, location);
|
|
1317
|
+
}
|
|
1169
1318
|
// Deviation from TLC: SANY's built-in \X has no definition for TLC to evaluate, a TLC bug.
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
|
|
1319
|
+
if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
|
|
1320
|
+
return { kind: "Product", factors: args, location };
|
|
1321
|
+
}
|
|
1322
|
+
return token.text === "'" && args.length === 1
|
|
1323
|
+
? { kind: "Prime", expression: args[0], location }
|
|
1324
|
+
: {
|
|
1325
|
+
kind: "Apply",
|
|
1326
|
+
operator: token.text,
|
|
1327
|
+
spelling: token.spelling,
|
|
1328
|
+
args,
|
|
1329
|
+
argumentsRange: lastArgumentsRange,
|
|
1330
|
+
location,
|
|
1331
|
+
};
|
|
1173
1332
|
}
|
|
1174
|
-
if (
|
|
1175
|
-
return
|
|
1333
|
+
if (isOperatorNamed && !isTlapm) {
|
|
1334
|
+
return isSelectorAhead()
|
|
1335
|
+
? parseSelections(token.text, [], undefined, start, location)
|
|
1336
|
+
: { kind: "Identifier", name: token.text, spelling: token.spelling, location };
|
|
1176
1337
|
}
|
|
1177
1338
|
switch (token.text) {
|
|
1178
1339
|
case "(": {
|
|
@@ -1207,8 +1368,7 @@ const parse = (
|
|
|
1207
1368
|
const instances: Instance[] = [];
|
|
1208
1369
|
recursiveScopes.push(new Set());
|
|
1209
1370
|
while (!accept("IN")) {
|
|
1210
|
-
if (isTlapm && isAt("RECURSIVE"))
|
|
1211
|
-
throw createError("Unexpected keyword RECURSIVE", getDefinitionEnd(peekRaw()));
|
|
1371
|
+
if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
|
|
1212
1372
|
if (accept("RECURSIVE")) {
|
|
1213
1373
|
declareRecursive();
|
|
1214
1374
|
continue;
|
|
@@ -1254,14 +1414,12 @@ const parse = (
|
|
|
1254
1414
|
|
|
1255
1415
|
const parsePrefixOperand = (operator: Token, low: number, high: number) => {
|
|
1256
1416
|
lastOperator = precedingOperator = { low, high };
|
|
1257
|
-
const operand = parseExpression(
|
|
1258
|
-
isTlapm ? Math.min(high + 1, POSTFIX_PRECEDENCE.low) : high + 1,
|
|
1259
|
-
);
|
|
1417
|
+
const operand = parseExpression(high + 1);
|
|
1260
1418
|
const next = peek();
|
|
1261
1419
|
const nextHigh = DEFINABLE_POSTFIX_OPERATORS.has(next.text)
|
|
1262
1420
|
? POSTFIX_PRECEDENCE.high
|
|
1263
1421
|
: INFIX_OPERATORS.get(next.text)?.high;
|
|
1264
|
-
if (
|
|
1422
|
+
if (next.kind === "Operator" && nextHigh !== undefined && nextHigh >= low) {
|
|
1265
1423
|
throw createError(`Precedence conflict between ${operator.text} and ${next.text}`, next);
|
|
1266
1424
|
}
|
|
1267
1425
|
return operand;
|
|
@@ -1275,26 +1433,6 @@ const parse = (
|
|
|
1275
1433
|
if (token.kind === "Operator" && isBullet(token)) {
|
|
1276
1434
|
return parseJunctionList();
|
|
1277
1435
|
}
|
|
1278
|
-
if (isTlapm && INFIX_OPERATORS.has(token.text) && isAt("(", 1)) {
|
|
1279
|
-
const start = cursor;
|
|
1280
|
-
const nonfix = withBracketLayout(() => {
|
|
1281
|
-
advance();
|
|
1282
|
-
advance();
|
|
1283
|
-
const left = parseExpression();
|
|
1284
|
-
if (!accept(",")) return undefined;
|
|
1285
|
-
const right = parseExpression();
|
|
1286
|
-
expect(")");
|
|
1287
|
-
const apply: Expression = {
|
|
1288
|
-
kind: "Apply",
|
|
1289
|
-
operator: token.text,
|
|
1290
|
-
args: [left, right],
|
|
1291
|
-
location,
|
|
1292
|
-
};
|
|
1293
|
-
return withRange(apply, start);
|
|
1294
|
-
});
|
|
1295
|
-
if (nonfix !== undefined) return nonfix;
|
|
1296
|
-
cursor = start;
|
|
1297
|
-
}
|
|
1298
1436
|
if (token.kind === "Operator" || token.kind === "Keyword") {
|
|
1299
1437
|
switch (token.text) {
|
|
1300
1438
|
case "~":
|
|
@@ -1306,8 +1444,6 @@ const parse = (
|
|
|
1306
1444
|
location,
|
|
1307
1445
|
};
|
|
1308
1446
|
case "-":
|
|
1309
|
-
case "-.":
|
|
1310
|
-
if (token.text === "-." && !isTlapm) break;
|
|
1311
1447
|
advance();
|
|
1312
1448
|
return {
|
|
1313
1449
|
kind: "Apply",
|
|
@@ -1316,17 +1452,11 @@ const parse = (
|
|
|
1316
1452
|
location,
|
|
1317
1453
|
};
|
|
1318
1454
|
case "[]":
|
|
1319
|
-
advance();
|
|
1320
|
-
return { kind: "Always", expression: parsePrefixOperand(token, 4, 15), location };
|
|
1321
1455
|
case "<>":
|
|
1322
|
-
advance();
|
|
1323
|
-
return { kind: "Eventually", expression: parsePrefixOperand(token, 4, 15), location };
|
|
1324
1456
|
case "ENABLED":
|
|
1325
|
-
advance();
|
|
1326
|
-
return { kind: "Enabled", expression: parsePrefixOperand(token, 4, 15), location };
|
|
1327
1457
|
case "UNCHANGED":
|
|
1328
1458
|
advance();
|
|
1329
|
-
return
|
|
1459
|
+
return getOperatorApplication(token.text, parsePrefixOperand(token, 4, 15), location);
|
|
1330
1460
|
case "SUBSET":
|
|
1331
1461
|
case "UNION":
|
|
1332
1462
|
case "DOMAIN":
|
|
@@ -1334,7 +1464,7 @@ const parse = (
|
|
|
1334
1464
|
return {
|
|
1335
1465
|
kind: "Apply",
|
|
1336
1466
|
operator: token.text,
|
|
1337
|
-
args: [
|
|
1467
|
+
args: [parsePrefixOperand(token, 10, 13)],
|
|
1338
1468
|
location,
|
|
1339
1469
|
};
|
|
1340
1470
|
}
|
|
@@ -1342,7 +1472,57 @@ const parse = (
|
|
|
1342
1472
|
return parsePrimary(preceding);
|
|
1343
1473
|
};
|
|
1344
1474
|
|
|
1345
|
-
const
|
|
1475
|
+
const getInfixApplication = (
|
|
1476
|
+
token: Token,
|
|
1477
|
+
left: Expression,
|
|
1478
|
+
right: Expression,
|
|
1479
|
+
isChained: boolean,
|
|
1480
|
+
prefixEnd: Point,
|
|
1481
|
+
): Expression => {
|
|
1482
|
+
const location = getLocation(token);
|
|
1483
|
+
if (token.text === "/\\" || token.text === "\\/") {
|
|
1484
|
+
const kind = token.text === "/\\" ? "And" : "Or";
|
|
1485
|
+
return left.kind === kind && isChained
|
|
1486
|
+
? {
|
|
1487
|
+
...left,
|
|
1488
|
+
operands: [...left.operands, right],
|
|
1489
|
+
prefixEnds: [...(left.prefixEnds ?? []), prefixEnd],
|
|
1490
|
+
}
|
|
1491
|
+
: { kind, operands: [left, right], prefixEnds: [prefixEnd], location };
|
|
1492
|
+
}
|
|
1493
|
+
if (token.text === "\\X") {
|
|
1494
|
+
return left.kind === "Product" && isChained
|
|
1495
|
+
? { ...left, factors: [...left.factors, right] }
|
|
1496
|
+
: { kind: "Product", factors: [left, right], location };
|
|
1497
|
+
}
|
|
1498
|
+
return {
|
|
1499
|
+
kind: "Apply",
|
|
1500
|
+
operator: token.text,
|
|
1501
|
+
spelling: token.spelling,
|
|
1502
|
+
args: [left, right],
|
|
1503
|
+
location,
|
|
1504
|
+
};
|
|
1505
|
+
};
|
|
1506
|
+
|
|
1507
|
+
const getPostfixApplication = (token: Token, operand: Expression): Expression =>
|
|
1508
|
+
token.text === "'"
|
|
1509
|
+
? { kind: "Prime", expression: operand, location: getLocation(token) }
|
|
1510
|
+
: {
|
|
1511
|
+
kind: "Apply",
|
|
1512
|
+
operator: token.text,
|
|
1513
|
+
spelling: token.spelling,
|
|
1514
|
+
args: [operand],
|
|
1515
|
+
location: getLocation(token),
|
|
1516
|
+
};
|
|
1517
|
+
|
|
1518
|
+
const parseFunctionArguments = () => {
|
|
1519
|
+
advance();
|
|
1520
|
+
const args = withBracketLayout(() => parseSeparated(() => parseExpression()));
|
|
1521
|
+
withBracketLayout(() => expect("]"));
|
|
1522
|
+
return args;
|
|
1523
|
+
};
|
|
1524
|
+
|
|
1525
|
+
const parseSanyExpression = (minimumPrecedence: number): Expression => {
|
|
1346
1526
|
const start = cursor;
|
|
1347
1527
|
const prefix = parsePrefix();
|
|
1348
1528
|
let left = prefix.location.range ? prefix : withRange(prefix, start);
|
|
@@ -1351,31 +1531,14 @@ const parse = (
|
|
|
1351
1531
|
const token = peek();
|
|
1352
1532
|
if (token.kind !== "Operator") break;
|
|
1353
1533
|
const location = getLocation(token);
|
|
1354
|
-
if (token.text
|
|
1355
|
-
advance();
|
|
1356
|
-
lastOperator = POSTFIX_PRECEDENCE;
|
|
1357
|
-
left = withRange({ kind: "Prime", expression: left, location }, start);
|
|
1358
|
-
continue;
|
|
1359
|
-
}
|
|
1360
|
-
if (POSTFIX_OPERATORS.has(token.text) && minimumPrecedence <= 15) {
|
|
1534
|
+
if (DEFINABLE_POSTFIX_OPERATORS.has(token.text) && minimumPrecedence <= 15) {
|
|
1361
1535
|
advance();
|
|
1362
1536
|
lastOperator = POSTFIX_PRECEDENCE;
|
|
1363
|
-
left = withRange(
|
|
1364
|
-
{
|
|
1365
|
-
kind: "Apply",
|
|
1366
|
-
operator: token.text,
|
|
1367
|
-
spelling: token.spelling,
|
|
1368
|
-
args: [left],
|
|
1369
|
-
location,
|
|
1370
|
-
},
|
|
1371
|
-
start,
|
|
1372
|
-
);
|
|
1537
|
+
left = withRange(getPostfixApplication(token, left), start);
|
|
1373
1538
|
continue;
|
|
1374
1539
|
}
|
|
1375
1540
|
if (token.text === "[") {
|
|
1376
|
-
|
|
1377
|
-
const args = withBracketLayout(() => parseSeparated(() => parseExpression()));
|
|
1378
|
-
withBracketLayout(() => expect("]"));
|
|
1541
|
+
const args = parseFunctionArguments();
|
|
1379
1542
|
lastOperator = FUNCTION_PRECEDENCE;
|
|
1380
1543
|
left = withRange({ kind: "FunctionApplication", function: left, args, location }, start);
|
|
1381
1544
|
continue;
|
|
@@ -1399,42 +1562,260 @@ const parse = (
|
|
|
1399
1562
|
}
|
|
1400
1563
|
}
|
|
1401
1564
|
advance();
|
|
1402
|
-
if (
|
|
1565
|
+
if (infix.low > NEGATION_PRECEDENCE && isAt("-")) {
|
|
1403
1566
|
throw createError(`Precedence conflict between ${token.text} and -`, peek());
|
|
1404
1567
|
}
|
|
1405
1568
|
lastOperator = precedingOperator = infix;
|
|
1406
1569
|
const right = parseExpression(infix.high + 1);
|
|
1407
|
-
|
|
1408
|
-
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1413
|
-
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
|
|
1417
|
-
|
|
1418
|
-
|
|
1419
|
-
|
|
1420
|
-
|
|
1421
|
-
|
|
1422
|
-
|
|
1423
|
-
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
1427
|
-
|
|
1428
|
-
|
|
1570
|
+
const isChained = previous?.text === token.text;
|
|
1571
|
+
left = withRange(
|
|
1572
|
+
getInfixApplication(token, left, right, isChained, getRange(start).end),
|
|
1573
|
+
start,
|
|
1574
|
+
);
|
|
1575
|
+
previous = { ...infix, text: token.text };
|
|
1576
|
+
}
|
|
1577
|
+
return left;
|
|
1578
|
+
};
|
|
1579
|
+
|
|
1580
|
+
const isTlapmAtomStart = (token: Token) =>
|
|
1581
|
+
token.kind === "Number" ||
|
|
1582
|
+
token.kind === "Decimal" ||
|
|
1583
|
+
token.kind === "String" ||
|
|
1584
|
+
token.kind === "Identifier" ||
|
|
1585
|
+
(token.kind === "Step" && isStepReference(token) && /^<\d/.test(token.text)) ||
|
|
1586
|
+
((token.kind === "Operator" || token.kind === "Keyword") && TLAPM_ATOM_STARTS.has(token.text));
|
|
1587
|
+
|
|
1588
|
+
const getTlapmOperand = (expression: Expression, start: number): TlapmOperand => ({
|
|
1589
|
+
start,
|
|
1590
|
+
end: cursor - 1,
|
|
1591
|
+
expression: expression.location.range ? expression : withRange(expression, start),
|
|
1592
|
+
});
|
|
1593
|
+
|
|
1594
|
+
const getTlapmOperator = (
|
|
1595
|
+
start: number,
|
|
1596
|
+
fixity: TlapmOperator["fixity"],
|
|
1597
|
+
precedence: Precedence,
|
|
1598
|
+
apply: TlapmOperator["apply"],
|
|
1599
|
+
): TlapmOperator => ({
|
|
1600
|
+
...precedence,
|
|
1601
|
+
start,
|
|
1602
|
+
end: cursor - 1,
|
|
1603
|
+
fixity,
|
|
1604
|
+
isLeft: false,
|
|
1605
|
+
apply,
|
|
1606
|
+
});
|
|
1607
|
+
|
|
1608
|
+
// expr_or_op's non_test: a postfix operator before an expression in parentheses is an atom.
|
|
1609
|
+
const parseTlapmNonfixPostfix = (token: Token) =>
|
|
1610
|
+
token.kind === "Operator" && DEFINABLE_POSTFIX_OPERATORS.has(token.text) && isAt("(", 1)
|
|
1611
|
+
? attempt(() =>
|
|
1612
|
+
withBracketLayout(() => {
|
|
1613
|
+
advance();
|
|
1614
|
+
advance();
|
|
1615
|
+
const operand = parseExpression();
|
|
1616
|
+
const end = cursor - 1;
|
|
1617
|
+
expect(")");
|
|
1618
|
+
return { end, expression: getPostfixApplication(token, operand) };
|
|
1619
|
+
}),
|
|
1620
|
+
)
|
|
1621
|
+
: undefined;
|
|
1622
|
+
|
|
1623
|
+
// A comma directly inside the parentheses after the operator, without which non_test's
|
|
1624
|
+
// attempt at `(e, f)` fails. A selector's << or >> isn't a bracket.
|
|
1625
|
+
const hasNonfixComma = () => {
|
|
1626
|
+
let depth = 0;
|
|
1627
|
+
for (let index = cursor + 1; index < tokens.length; index++) {
|
|
1628
|
+
const token = tokens[index];
|
|
1629
|
+
if (token.kind !== "Operator") continue;
|
|
1630
|
+
if (depth === 1 && token.text === ",") return true;
|
|
1631
|
+
if (tokens[index - 1].text === "!") continue;
|
|
1632
|
+
if (OPENING_BRACKETS.has(token.text)) depth++;
|
|
1633
|
+
if (CLOSING_BRACKETS.has(token.text) && --depth === 0) return false;
|
|
1634
|
+
}
|
|
1635
|
+
return false;
|
|
1636
|
+
};
|
|
1637
|
+
|
|
1638
|
+
// expr_or_op's non_test: an infix operator before two expressions in parentheses is an atom.
|
|
1639
|
+
const parseTlapmNonfixInfix = (token: Token) =>
|
|
1640
|
+
isAt("(", 1) && hasNonfixComma()
|
|
1641
|
+
? attempt(() =>
|
|
1642
|
+
withBracketLayout((): Expression => {
|
|
1643
|
+
advance();
|
|
1644
|
+
advance();
|
|
1645
|
+
const left = parseExpression();
|
|
1646
|
+
expect(",");
|
|
1647
|
+
const right = parseExpression();
|
|
1648
|
+
expect(")");
|
|
1649
|
+
return {
|
|
1650
|
+
kind: "Apply",
|
|
1651
|
+
operator: token.text,
|
|
1652
|
+
args: [left, right],
|
|
1653
|
+
location: getLocation(token),
|
|
1654
|
+
};
|
|
1655
|
+
}),
|
|
1656
|
+
)
|
|
1657
|
+
: undefined;
|
|
1658
|
+
|
|
1659
|
+
const parseTlapmItem = (isStart: boolean): TlapmItem | undefined => {
|
|
1660
|
+
const start = cursor;
|
|
1661
|
+
const token = peek();
|
|
1662
|
+
const location = getLocation(token);
|
|
1663
|
+
const isOperator = token.kind === "Operator" || token.kind === "Keyword";
|
|
1664
|
+
const infix = isOperator ? INFIX_OPERATORS.get(token.text) : undefined;
|
|
1665
|
+
if (!isStart) {
|
|
1666
|
+
if (isAt("[")) {
|
|
1667
|
+
const args = parseFunctionArguments();
|
|
1668
|
+
return getTlapmOperator(start, "Postfix", TLAPM_SELECTION_PRECEDENCE, (operands) => ({
|
|
1669
|
+
kind: "FunctionApplication",
|
|
1670
|
+
function: operands[0].expression,
|
|
1671
|
+
args,
|
|
1672
|
+
location,
|
|
1673
|
+
}));
|
|
1674
|
+
}
|
|
1675
|
+
if (isAt(".") && isFieldName(peek(1))) {
|
|
1676
|
+
advance();
|
|
1677
|
+
const field = advance().text;
|
|
1678
|
+
return getTlapmOperator(start, "Postfix", TLAPM_SELECTION_PRECEDENCE, (operands) => ({
|
|
1679
|
+
kind: "FieldAccess",
|
|
1680
|
+
record: operands[0].expression,
|
|
1681
|
+
field,
|
|
1429
1682
|
location,
|
|
1683
|
+
}));
|
|
1684
|
+
}
|
|
1685
|
+
if (infix) {
|
|
1686
|
+
// Pco.resolve has no operator to put before that atom, so the expression ends here.
|
|
1687
|
+
if (parseTlapmNonfixInfix(token)) {
|
|
1688
|
+
cursor = start;
|
|
1689
|
+
return undefined;
|
|
1690
|
+
}
|
|
1691
|
+
advance();
|
|
1692
|
+
return {
|
|
1693
|
+
...getTlapmOperator(start, "Infix", infix, (operands) =>
|
|
1694
|
+
getInfixApplication(
|
|
1695
|
+
token,
|
|
1696
|
+
operands[0].expression,
|
|
1697
|
+
operands[1].expression,
|
|
1698
|
+
operands[0].joinedBy === token.text,
|
|
1699
|
+
getRange(operands[0].start, operands[1].end).end,
|
|
1700
|
+
),
|
|
1701
|
+
),
|
|
1702
|
+
isLeft: isTlapmLeft(token.text, infix),
|
|
1703
|
+
joins: token.text,
|
|
1430
1704
|
};
|
|
1431
1705
|
}
|
|
1432
|
-
|
|
1433
|
-
|
|
1706
|
+
if (token.kind !== "Operator" || !DEFINABLE_POSTFIX_OPERATORS.has(token.text))
|
|
1707
|
+
return undefined;
|
|
1708
|
+
// Pco.resolve has no operator to put before that atom, so the expression ends here.
|
|
1709
|
+
if (parseTlapmNonfixPostfix(token)) {
|
|
1710
|
+
cursor = start;
|
|
1711
|
+
return undefined;
|
|
1712
|
+
}
|
|
1713
|
+
advance();
|
|
1714
|
+
return getTlapmOperator(start, "Postfix", POSTFIX_PRECEDENCE, (operands) =>
|
|
1715
|
+
getPostfixApplication(token, operands[0].expression),
|
|
1716
|
+
);
|
|
1434
1717
|
}
|
|
1435
|
-
|
|
1718
|
+
if (token.kind === "Operator" && isBullet(token))
|
|
1719
|
+
return getTlapmOperand(parseJunctionList(), start);
|
|
1720
|
+
const nonfix = infix ? parseTlapmNonfixInfix(token) : undefined;
|
|
1721
|
+
if (nonfix) return getTlapmOperand(nonfix, start);
|
|
1722
|
+
const nonfixPostfix = parseTlapmNonfixPostfix(token);
|
|
1723
|
+
if (nonfixPostfix) {
|
|
1724
|
+
nonfixPostfix.expression.location.range = getRange(start, nonfixPostfix.end);
|
|
1725
|
+
return { start, end: nonfixPostfix.end, expression: nonfixPostfix.expression };
|
|
1726
|
+
}
|
|
1727
|
+
const prefix = isOperator ? TLAPM_PREFIX_OPERATORS.get(token.text) : undefined;
|
|
1728
|
+
if (prefix) {
|
|
1729
|
+
advance();
|
|
1730
|
+
return getTlapmOperator(start, "Prefix", prefix, (operands) =>
|
|
1731
|
+
getOperatorApplication(
|
|
1732
|
+
token.text === "-" ? "-." : token.text,
|
|
1733
|
+
operands[0].expression,
|
|
1734
|
+
location,
|
|
1735
|
+
),
|
|
1736
|
+
);
|
|
1737
|
+
}
|
|
1738
|
+
if (!isTlapmAtomStart(token)) return undefined;
|
|
1739
|
+
const isTransparent = token.kind === "Operator" && TLAPM_OPEN_BRACKETS.has(token.text);
|
|
1740
|
+
return getTlapmOperand(isTransparent ? parsePrimary() : commit(parsePrimary), start);
|
|
1741
|
+
};
|
|
1742
|
+
|
|
1743
|
+
const isTlapmOperator = (item: TlapmItem | undefined): item is TlapmOperator =>
|
|
1744
|
+
item !== undefined && "fixity" in item;
|
|
1745
|
+
|
|
1746
|
+
const isTlapmOperand = (item: TlapmItem | undefined): item is TlapmOperand =>
|
|
1747
|
+
item !== undefined && !("fixity" in item);
|
|
1748
|
+
|
|
1749
|
+
const applyTlapmOperator = (operator: TlapmOperator, operands: TlapmOperand[]) => {
|
|
1750
|
+
const start = Math.min(operator.start, operands[0].start);
|
|
1751
|
+
const end = Math.max(operator.end, operands[operands.length - 1].end);
|
|
1752
|
+
const expression = operator.apply(operands);
|
|
1753
|
+
expression.location.range = getRange(start, end);
|
|
1754
|
+
return { start, end, expression, joinedBy: operator.joins };
|
|
1755
|
+
};
|
|
1756
|
+
|
|
1757
|
+
const reduceTlapmItems = (stack: TlapmItem[]) => {
|
|
1758
|
+
const right = stack.pop();
|
|
1759
|
+
const operator = stack.pop();
|
|
1760
|
+
if (!isTlapmOperand(right) || !isTlapmOperator(operator)) {
|
|
1761
|
+
throw createError("incomplete expression");
|
|
1762
|
+
}
|
|
1763
|
+
const left = operator.fixity === "Infix" ? stack.pop() : undefined;
|
|
1764
|
+
stack.push(applyTlapmOperator(operator, isTlapmOperand(left) ? [left, right] : [right]));
|
|
1436
1765
|
};
|
|
1437
1766
|
|
|
1767
|
+
const getPreviousOperator = (stack: TlapmItem[]) => {
|
|
1768
|
+
const previous = stack[stack.length - 2];
|
|
1769
|
+
return isTlapmOperator(previous) ? previous : undefined;
|
|
1770
|
+
};
|
|
1771
|
+
|
|
1772
|
+
const isBelow = (left: Precedence, right: Precedence | undefined) =>
|
|
1773
|
+
right !== undefined && left.high < right.low;
|
|
1774
|
+
|
|
1775
|
+
// Port of Pco.resolve. A failure after the first item backtracks no further than its attempt.
|
|
1776
|
+
const parseTlapmExpression = (): Expression =>
|
|
1777
|
+
withRestorePoint(() => {
|
|
1778
|
+
const first = attempt(() => parseTlapmItem(true));
|
|
1779
|
+
if (first === undefined) {
|
|
1780
|
+
const token = peekRaw();
|
|
1781
|
+
throw token.kind === "End"
|
|
1782
|
+
? createUnexpected("Unexpected end of expression", token)
|
|
1783
|
+
: createError(`required expressions(s) missing before '${getTlapmName(token)}'`, token);
|
|
1784
|
+
}
|
|
1785
|
+
return commit(() => {
|
|
1786
|
+
const stack = [first];
|
|
1787
|
+
while (true) {
|
|
1788
|
+
const item = attempt(() => parseTlapmItem(isTlapmOperator(stack[stack.length - 1])));
|
|
1789
|
+
if (item === undefined) break;
|
|
1790
|
+
if (isTlapmOperand(item) || item.fixity === "Prefix") {
|
|
1791
|
+
stack.push(item);
|
|
1792
|
+
continue;
|
|
1793
|
+
}
|
|
1794
|
+
while (isBelow(item, getPreviousOperator(stack))) reduceTlapmItems(stack);
|
|
1795
|
+
const operand = stack[stack.length - 1];
|
|
1796
|
+
if (item.fixity === "Postfix" && isTlapmOperand(operand)) {
|
|
1797
|
+
stack.splice(-1, 1, applyTlapmOperator(item, [operand]));
|
|
1798
|
+
continue;
|
|
1799
|
+
}
|
|
1800
|
+
const previous = getPreviousOperator(stack);
|
|
1801
|
+
const isLeftChain =
|
|
1802
|
+
previous?.fixity === "Infix" &&
|
|
1803
|
+
previous.isLeft &&
|
|
1804
|
+
item.isLeft &&
|
|
1805
|
+
!isBelow(previous, item);
|
|
1806
|
+
if (isLeftChain) reduceTlapmItems(stack);
|
|
1807
|
+
stack.push(item);
|
|
1808
|
+
}
|
|
1809
|
+
while (stack.length > 1) reduceTlapmItems(stack);
|
|
1810
|
+
const result = stack[0];
|
|
1811
|
+
if (!isTlapmOperand(result)) throw createError("incomplete expression");
|
|
1812
|
+
return result.expression;
|
|
1813
|
+
});
|
|
1814
|
+
});
|
|
1815
|
+
|
|
1816
|
+
const parseExpression = (minimumPrecedence = 0) =>
|
|
1817
|
+
isTlapm ? parseTlapmExpression() : parseSanyExpression(minimumPrecedence);
|
|
1818
|
+
|
|
1438
1819
|
const parseParams = () => {
|
|
1439
1820
|
if (!accept("(")) return [];
|
|
1440
1821
|
const params = parseDeclarations();
|
|
@@ -1783,8 +2164,26 @@ const parse = (
|
|
|
1783
2164
|
return defs;
|
|
1784
2165
|
};
|
|
1785
2166
|
|
|
2167
|
+
// tlapm's usebody reads facts while an expression starts after the comma.
|
|
2168
|
+
const parseTlapmFacts = (): Fact[] => {
|
|
2169
|
+
const first = attempt(parseExpression);
|
|
2170
|
+
if (!first) return [];
|
|
2171
|
+
const facts = [first];
|
|
2172
|
+
withRestorePoint(() => {
|
|
2173
|
+
while (isAt(",")) {
|
|
2174
|
+
const fact = attempt(() => {
|
|
2175
|
+
advance();
|
|
2176
|
+
return parseExpression();
|
|
2177
|
+
});
|
|
2178
|
+
if (!fact) return;
|
|
2179
|
+
facts.push(fact);
|
|
2180
|
+
}
|
|
2181
|
+
});
|
|
2182
|
+
return facts;
|
|
2183
|
+
};
|
|
2184
|
+
|
|
1786
2185
|
const parseFacts = () => {
|
|
1787
|
-
const facts = isFactAhead() ? parseSeparated(parseFact) : [];
|
|
2186
|
+
const facts = isTlapm ? parseTlapmFacts() : isFactAhead() ? parseSeparated(parseFact) : [];
|
|
1788
2187
|
const isDef = accept("DEF") || accept("DEFS");
|
|
1789
2188
|
if (isTlapm && facts.length === 0 && !isDef) throw createUnexpected("Expected a fact");
|
|
1790
2189
|
return { facts, defs: isDef ? parseDefs() : [] };
|
|
@@ -1864,23 +2263,50 @@ const parse = (
|
|
|
1864
2263
|
);
|
|
1865
2264
|
};
|
|
1866
2265
|
|
|
2266
|
+
const parseHypothesis = () => {
|
|
2267
|
+
if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
|
|
2268
|
+
advance();
|
|
2269
|
+
advance();
|
|
2270
|
+
}
|
|
2271
|
+
if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
|
|
2272
|
+
if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
|
|
2273
|
+
return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
|
|
2274
|
+
if (!isTlapm) return parseExpression();
|
|
2275
|
+
// expr_or_sequent: where no expression starts, the sequent's ASSUME fails last.
|
|
2276
|
+
const expression = attempt(parseExpression);
|
|
2277
|
+
if (expression === undefined) throw createUnexpected("Expected a hypothesis");
|
|
2278
|
+
return expression;
|
|
2279
|
+
};
|
|
2280
|
+
|
|
2281
|
+
// comma1 (hyp b): Pco.star attempts the hypotheses after the first, each inside the one before,
|
|
2282
|
+
// so a failure that backtracks ends the list, and tlapm reports any other before the first comma.
|
|
2283
|
+
const parseTlapmHypotheses = () => {
|
|
2284
|
+
const assumptions = [parseHypothesis()];
|
|
2285
|
+
withRestorePoint(() => {
|
|
2286
|
+
while (true) {
|
|
2287
|
+
const assumption = attempt(() => {
|
|
2288
|
+
expect(",");
|
|
2289
|
+
return parseHypothesis();
|
|
2290
|
+
});
|
|
2291
|
+
if (assumption === undefined) break;
|
|
2292
|
+
assumptions.push(assumption);
|
|
2293
|
+
}
|
|
2294
|
+
});
|
|
2295
|
+
return assumptions;
|
|
2296
|
+
};
|
|
2297
|
+
|
|
1867
2298
|
const parseAssumeProve = (): AssumeProve => {
|
|
1868
2299
|
const start = cursor;
|
|
1869
2300
|
const location = getLocation(expect("ASSUME"));
|
|
1870
|
-
const
|
|
1871
|
-
|
|
1872
|
-
|
|
1873
|
-
|
|
1874
|
-
|
|
1875
|
-
|
|
1876
|
-
|
|
1877
|
-
|
|
1878
|
-
|
|
1879
|
-
expect("PROVE");
|
|
1880
|
-
return withRange(
|
|
1881
|
-
{ kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
|
|
1882
|
-
start,
|
|
1883
|
-
);
|
|
2301
|
+
const parseSequent = (): AssumeProve => {
|
|
2302
|
+
const assumptions = isTlapm ? parseTlapmHypotheses() : parseSeparated(parseHypothesis);
|
|
2303
|
+
expect("PROVE");
|
|
2304
|
+
return withRange(
|
|
2305
|
+
{ kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
|
|
2306
|
+
start,
|
|
2307
|
+
);
|
|
2308
|
+
};
|
|
2309
|
+
return isTlapm ? commit(parseSequent) : parseSequent();
|
|
1884
2310
|
};
|
|
1885
2311
|
|
|
1886
2312
|
const isNameListAhead = (terminator: string) => {
|
|
@@ -1903,7 +2329,7 @@ const parse = (
|
|
|
1903
2329
|
const parseStepBody = (): StepBody => {
|
|
1904
2330
|
const token = peek();
|
|
1905
2331
|
if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
|
|
1906
|
-
if (isAt("INSTANCE")) {
|
|
2332
|
+
if (!isTlapm && isAt("INSTANCE")) {
|
|
1907
2333
|
const start = cursor;
|
|
1908
2334
|
return withRange(parseInstance(undefined, [], false, getLocation(token)), start);
|
|
1909
2335
|
}
|
|
@@ -2092,20 +2518,26 @@ const parse = (
|
|
|
2092
2518
|
throw createProofError(
|
|
2093
2519
|
`Unexpected end of (sub)proof at level ${level} before QED step`,
|
|
2094
2520
|
levelSpan,
|
|
2521
|
+
NEWLINES,
|
|
2095
2522
|
);
|
|
2096
2523
|
}
|
|
2097
2524
|
if (item.kind === "Leaf") {
|
|
2098
2525
|
throw createProofError(
|
|
2099
2526
|
`Expecting a proof step but found a${LEAF_NAMES[item.proof.kind]} leaf proof`,
|
|
2100
2527
|
item.span,
|
|
2528
|
+
NEWLINES,
|
|
2101
2529
|
);
|
|
2102
2530
|
}
|
|
2103
2531
|
if (!isFirst && item.isProof) {
|
|
2104
|
-
throw createProofError(
|
|
2532
|
+
throw createProofError(
|
|
2533
|
+
"PROOF keyword found in step that does not begin subproof",
|
|
2534
|
+
item.span,
|
|
2535
|
+
PRINTED_NEWLINE,
|
|
2536
|
+
);
|
|
2105
2537
|
}
|
|
2106
2538
|
const implicit = item.token.text[1];
|
|
2107
2539
|
if (implicit === "+" && !isFirst) {
|
|
2108
|
-
throw createProofError("<+> used but no subproof expected", item.span);
|
|
2540
|
+
throw createProofError("<+> used but no subproof expected", item.span, PRINTED_NEWLINE);
|
|
2109
2541
|
}
|
|
2110
2542
|
const stepLevel =
|
|
2111
2543
|
implicit === "*"
|
|
@@ -2160,15 +2592,29 @@ const parse = (
|
|
|
2160
2592
|
throw createProofError(
|
|
2161
2593
|
"extra step(s) after finished proof",
|
|
2162
2594
|
extra.span,
|
|
2595
|
+
NO_NEWLINES,
|
|
2163
2596
|
"Proof.Parser.toplevel",
|
|
2164
2597
|
);
|
|
2165
2598
|
}
|
|
2166
2599
|
return nested.proof;
|
|
2167
2600
|
};
|
|
2168
2601
|
|
|
2169
|
-
const addFactDefinition = (
|
|
2170
|
-
|
|
2171
|
-
|
|
2602
|
+
const addFactDefinition = (
|
|
2603
|
+
module: Module,
|
|
2604
|
+
name: string,
|
|
2605
|
+
body: Expression,
|
|
2606
|
+
location: SourceLocation,
|
|
2607
|
+
) => {
|
|
2608
|
+
if (module.definitions.some((other) => other.name === name)) return;
|
|
2609
|
+
module.definitions.push({
|
|
2610
|
+
kind: "Operator",
|
|
2611
|
+
name,
|
|
2612
|
+
params: [],
|
|
2613
|
+
body,
|
|
2614
|
+
isLocal: false,
|
|
2615
|
+
isRecursive: false,
|
|
2616
|
+
location,
|
|
2617
|
+
});
|
|
2172
2618
|
};
|
|
2173
2619
|
|
|
2174
2620
|
const parseFactName = () => {
|
|
@@ -2179,12 +2625,21 @@ const parse = (
|
|
|
2179
2625
|
return name;
|
|
2180
2626
|
};
|
|
2181
2627
|
|
|
2628
|
+
// A theorem whose statement fails to start backtracks in tlapm, whose module ends there.
|
|
2629
|
+
const parseTheoremExpression = () => {
|
|
2630
|
+
if (!isTlapm) return parseExpression();
|
|
2631
|
+
const token = peekRaw();
|
|
2632
|
+
const statement = attempt(parseExpression);
|
|
2633
|
+
if (statement) return statement;
|
|
2634
|
+
throw createUnexpected(`Expected "====" but found ${describeToken(token)}`, token);
|
|
2635
|
+
};
|
|
2636
|
+
|
|
2182
2637
|
const parseTheorem = (module: Module) => {
|
|
2183
2638
|
const start = cursor;
|
|
2184
2639
|
const keyword = advance();
|
|
2185
2640
|
const name = parseFactName();
|
|
2186
2641
|
const parsed = withProofScope(() => {
|
|
2187
|
-
const statement = isAt("ASSUME") ? parseAssumeProve() :
|
|
2642
|
+
const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
|
|
2188
2643
|
if (isTlapm) return { statement, proof: parseTlapmProof() };
|
|
2189
2644
|
return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
|
|
2190
2645
|
});
|
|
@@ -2196,21 +2651,7 @@ const parse = (
|
|
|
2196
2651
|
module.theorems.push(theorem);
|
|
2197
2652
|
module.units.push({ kind: "Theorem", theorem });
|
|
2198
2653
|
if (name === undefined || statement.kind === "AssumeProve") return;
|
|
2199
|
-
addFactDefinition(
|
|
2200
|
-
module,
|
|
2201
|
-
withRange(
|
|
2202
|
-
{
|
|
2203
|
-
kind: "Operator",
|
|
2204
|
-
name,
|
|
2205
|
-
params: [],
|
|
2206
|
-
body: statement,
|
|
2207
|
-
isLocal: false,
|
|
2208
|
-
isRecursive: false,
|
|
2209
|
-
location: getLocation(keyword),
|
|
2210
|
-
},
|
|
2211
|
-
start,
|
|
2212
|
-
),
|
|
2213
|
-
);
|
|
2654
|
+
addFactDefinition(module, name, statement, theorem.location);
|
|
2214
2655
|
};
|
|
2215
2656
|
|
|
2216
2657
|
const parseAssumption = (): Assumption => {
|
|
@@ -2259,7 +2700,6 @@ const parse = (
|
|
|
2259
2700
|
}
|
|
2260
2701
|
while (true) {
|
|
2261
2702
|
const tokenIndex = cursor;
|
|
2262
|
-
unitStart = tokenIndex;
|
|
2263
2703
|
const token = peek();
|
|
2264
2704
|
if (token.kind === "ModuleEnd") {
|
|
2265
2705
|
location.range = {
|
|
@@ -2312,15 +2752,7 @@ const parse = (
|
|
|
2312
2752
|
module.assumptions.push(assumption);
|
|
2313
2753
|
module.units.push({ kind: "Assumption", assumption });
|
|
2314
2754
|
if (assumption.name !== undefined) {
|
|
2315
|
-
addFactDefinition(module,
|
|
2316
|
-
kind: "Operator",
|
|
2317
|
-
name: assumption.name,
|
|
2318
|
-
params: [],
|
|
2319
|
-
body: assumption.expression,
|
|
2320
|
-
isLocal: false,
|
|
2321
|
-
isRecursive: false,
|
|
2322
|
-
location: assumption.location,
|
|
2323
|
-
});
|
|
2755
|
+
addFactDefinition(module, assumption.name, assumption.expression, assumption.location);
|
|
2324
2756
|
}
|
|
2325
2757
|
continue;
|
|
2326
2758
|
}
|