tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +37 -0
- package/dist/index.d.ts +37 -0
- 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 +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- 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 +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- 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/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- 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 +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- 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 +87 -16
- 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 +516 -115
- 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 +908 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -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 +67 -16
- 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 +122 -64
- 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 +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +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 +8 -16
- 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 +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +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 +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +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/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- 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 +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- 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 +136 -338
- 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
|
@@ -0,0 +1,382 @@
|
|
|
1
|
+
import { TlaIsabelleError } from "../../../errors";
|
|
2
|
+
import { fconvRule, premsConv } from "../pure/conv";
|
|
3
|
+
import { asmRl, compIncr, normHhfEq } from "../pure/drule";
|
|
4
|
+
import { emptyNet, insertTermNet, unifyTermNet, type Net } from "../pure/net";
|
|
5
|
+
import { addSimps, emptySimpset } from "../pure/raw-simplifier";
|
|
6
|
+
import { rewriteCterm } from "../pure/rewriter";
|
|
7
|
+
import { mapSeq, mapsSeq, seqOfList, singleSeq, type Seq } from "../pure/seq";
|
|
8
|
+
import { matchTac, resolveTac } from "../pure/tactic";
|
|
9
|
+
import { allTac, thenAllNew, tryTac, type GoalTactic } from "../pure/tactical";
|
|
10
|
+
import {
|
|
11
|
+
aconv,
|
|
12
|
+
dummyT,
|
|
13
|
+
existsSubterm,
|
|
14
|
+
fastypeOf,
|
|
15
|
+
listComb,
|
|
16
|
+
mkConst,
|
|
17
|
+
mkFree,
|
|
18
|
+
mkTVar,
|
|
19
|
+
mkVar,
|
|
20
|
+
type Term,
|
|
21
|
+
type Typ,
|
|
22
|
+
type Var,
|
|
23
|
+
} from "../pure/term";
|
|
24
|
+
import {
|
|
25
|
+
conclOf,
|
|
26
|
+
instantiate,
|
|
27
|
+
instantiateTypes,
|
|
28
|
+
majorPremOf,
|
|
29
|
+
premsOf,
|
|
30
|
+
type Thm,
|
|
31
|
+
} from "../pure/thm";
|
|
32
|
+
import { emptyTyEnv, normType, unifyTypes, type TyEnv } from "../pure/type";
|
|
33
|
+
import { stripAssumsConcl } from "../pure/logic";
|
|
34
|
+
import { getThms, parseFactReferences } from "./attrib";
|
|
35
|
+
import { readTerms, updateCases, type IsarContext } from "./context";
|
|
36
|
+
import type { Method } from "./method";
|
|
37
|
+
import { insertTac } from "./proof";
|
|
38
|
+
import {
|
|
39
|
+
consume,
|
|
40
|
+
dropJudgment,
|
|
41
|
+
getCases,
|
|
42
|
+
getConstraints,
|
|
43
|
+
internalizeParams,
|
|
44
|
+
makeCommon,
|
|
45
|
+
type CaseInfo,
|
|
46
|
+
type CasesRule,
|
|
47
|
+
} from "./rule-cases";
|
|
48
|
+
import { innerText, syntaxError, type OuterToken } from "./theory";
|
|
49
|
+
|
|
50
|
+
export interface NamedCasesRule {
|
|
51
|
+
readonly name: string;
|
|
52
|
+
readonly rule: CasesRule;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export interface InductData {
|
|
56
|
+
// Newest first, as Item_Net.content lists them.
|
|
57
|
+
readonly casesType: readonly NamedCasesRule[];
|
|
58
|
+
readonly casesPred: readonly NamedCasesRule[];
|
|
59
|
+
readonly casesDefault: CasesRule;
|
|
60
|
+
readonly trivialRule: Thm;
|
|
61
|
+
// The theorems of a fact of the logic with their tags.
|
|
62
|
+
readonly getTaggedFact: (name: string) => readonly CasesRule[] | undefined;
|
|
63
|
+
// Whether some fact of the logic tags this theorem.
|
|
64
|
+
readonly isTagged: (thm: Thm) => boolean;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
interface CasesArgs {
|
|
68
|
+
readonly isSimp: boolean;
|
|
69
|
+
readonly insts: readonly (readonly (Term | undefined)[])[];
|
|
70
|
+
readonly rule: CasesRule | undefined;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
const error = (message: string) => new TlaIsabelleError("ERROR", message);
|
|
74
|
+
|
|
75
|
+
const isInductConst = (term: Term) =>
|
|
76
|
+
term.kind === "Const" && term.name.startsWith("PredicateLogic.cases_");
|
|
77
|
+
|
|
78
|
+
// Induct.vars_of: the variables left to right, each where it occurs last.
|
|
79
|
+
const varsOf = (term: Term): Var[] => {
|
|
80
|
+
const occurrences: Var[] = [];
|
|
81
|
+
const visit = (current: Term) => {
|
|
82
|
+
if (current.kind === "Var") occurrences.unshift(current);
|
|
83
|
+
if (current.kind === "Abs") visit(current.body);
|
|
84
|
+
if (current.kind === "App") {
|
|
85
|
+
visit(current.fun);
|
|
86
|
+
visit(current.arg);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
visit(term);
|
|
90
|
+
return occurrences
|
|
91
|
+
.filter(
|
|
92
|
+
(variable, index) =>
|
|
93
|
+
occurrences.findIndex(
|
|
94
|
+
(other) => other.name === variable.name && other.index === variable.index,
|
|
95
|
+
) === index,
|
|
96
|
+
)
|
|
97
|
+
.reverse();
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
// Net.encode_type: a type as a term, for indexing.
|
|
101
|
+
const encodeType = (type: Typ): Term => {
|
|
102
|
+
switch (type.kind) {
|
|
103
|
+
case "Type":
|
|
104
|
+
return listComb(mkConst(type.name, dummyT), type.args.map(encodeType));
|
|
105
|
+
case "TFree":
|
|
106
|
+
return mkFree(type.name, dummyT);
|
|
107
|
+
case "TVar":
|
|
108
|
+
return mkVar(type.name, type.index, dummyT);
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
const leftVarPrem = (rule: Thm): Term => {
|
|
113
|
+
const prems = premsOf(rule);
|
|
114
|
+
const variable = prems.length === 0 ? undefined : varsOf(prems[0])[0];
|
|
115
|
+
if (variable === undefined)
|
|
116
|
+
throw new TlaIsabelleError("THM", "No variables in major premise of rule");
|
|
117
|
+
return encodeType(variable.type);
|
|
118
|
+
};
|
|
119
|
+
|
|
120
|
+
// Item_Net.retrieve: the rules whose index could unify with the term, newest first.
|
|
121
|
+
const retrieve = (
|
|
122
|
+
rules: readonly NamedCasesRule[],
|
|
123
|
+
index: (rule: Thm) => Term,
|
|
124
|
+
term: Term,
|
|
125
|
+
): CasesRule[] =>
|
|
126
|
+
unifyTermNet(
|
|
127
|
+
rules.reduce<Net<number>>(
|
|
128
|
+
(net, entry, position) => insertTermNet(index(entry.rule.rule), position, net),
|
|
129
|
+
emptyNet,
|
|
130
|
+
),
|
|
131
|
+
term,
|
|
132
|
+
)
|
|
133
|
+
.sort((left, right) => left - right)
|
|
134
|
+
.map((position) => rules[position].rule);
|
|
135
|
+
|
|
136
|
+
const lookupRule = (rules: readonly NamedCasesRule[], kind: string, name: string): CasesRule => {
|
|
137
|
+
const found = rules.find((entry) => entry.name === name || entry.name.endsWith(`.${name}`));
|
|
138
|
+
if (found === undefined) throw error(`No rule for ${kind} "${name}"`);
|
|
139
|
+
return found.rule;
|
|
140
|
+
};
|
|
141
|
+
|
|
142
|
+
// Object_Logic.elim_concl: an elimination rule concludes a variable that a premise concludes.
|
|
143
|
+
const isElimRule = (rule: Thm) =>
|
|
144
|
+
dropJudgment(conclOf(rule)).kind === "Var" &&
|
|
145
|
+
premsOf(rule).some((prem) => aconv(conclOf(rule), stripAssumsConcl(prem)));
|
|
146
|
+
|
|
147
|
+
const readRule = (isar: IsarContext, tokens: readonly OuterToken[]): CasesRule => {
|
|
148
|
+
const induct = isar.tactics.induct;
|
|
149
|
+
const [keyword, colon, ...rest] = tokens;
|
|
150
|
+
if (colon?.kind !== "symbol" || colon.text !== ":") throw syntaxError(colon);
|
|
151
|
+
if (keyword.text === "rule") {
|
|
152
|
+
const references = parseFactReferences(rest);
|
|
153
|
+
const thms = getThms(isar, references);
|
|
154
|
+
if (thms.length !== 1) throw error("Single rule expected");
|
|
155
|
+
if (references[0].attributes.length > 0) throw error("Unsupported cases rule with attributes");
|
|
156
|
+
const tagged = induct
|
|
157
|
+
.getTaggedFact(references[0].name)
|
|
158
|
+
?.find((entry) => entry.rule === thms[0] && !isar.facts.has(references[0].name));
|
|
159
|
+
return tagged ?? { rule: thms[0], tags: [] };
|
|
160
|
+
}
|
|
161
|
+
const name = rest[0];
|
|
162
|
+
if (name === undefined || rest.length !== 1 || name.kind === "symbol") throw syntaxError(name);
|
|
163
|
+
if (keyword.text === "type") return lookupRule(induct.casesType, "type", name.text);
|
|
164
|
+
if (keyword.text === "pred" || keyword.text === "set")
|
|
165
|
+
return lookupRule(
|
|
166
|
+
induct.casesPred,
|
|
167
|
+
keyword.text,
|
|
168
|
+
isar.scope.constNames.get(name.text) ?? name.text,
|
|
169
|
+
);
|
|
170
|
+
throw syntaxError(keyword);
|
|
171
|
+
};
|
|
172
|
+
|
|
173
|
+
const RULE_KEYWORDS = new Set(["arbitrary", "taking", "type", "pred", "set", "rule"]);
|
|
174
|
+
|
|
175
|
+
// The cases method's syntax: (no_simp)?, instantiations separated by "and", then a rule.
|
|
176
|
+
const parseCasesArgs = (isar: IsarContext, tokens: readonly OuterToken[]): CasesArgs => {
|
|
177
|
+
const isSymbol = (position: number, text: string) =>
|
|
178
|
+
tokens[position]?.kind === "symbol" && tokens[position].text === text;
|
|
179
|
+
const isSimp = !(
|
|
180
|
+
isSymbol(0, "(") &&
|
|
181
|
+
tokens[1]?.kind === "word" &&
|
|
182
|
+
tokens[1].text === "no_simp" &&
|
|
183
|
+
isSymbol(2, ")")
|
|
184
|
+
);
|
|
185
|
+
let position = isSimp ? 0 : 3;
|
|
186
|
+
const insts: (Term | undefined)[][] = [[]];
|
|
187
|
+
while (
|
|
188
|
+
position < tokens.length &&
|
|
189
|
+
!(RULE_KEYWORDS.has(tokens[position].text) && isSymbol(position + 1, ":"))
|
|
190
|
+
) {
|
|
191
|
+
const token = tokens[position];
|
|
192
|
+
position += 1;
|
|
193
|
+
if (token.kind === "word" && token.text === "and") insts.push([]);
|
|
194
|
+
else if (token.kind === "word" && token.text === "_") insts[insts.length - 1].push(undefined);
|
|
195
|
+
else if (token.kind === "symbol") throw syntaxError(token);
|
|
196
|
+
else
|
|
197
|
+
insts[insts.length - 1].push(
|
|
198
|
+
readTerms(
|
|
199
|
+
isar,
|
|
200
|
+
[
|
|
201
|
+
{
|
|
202
|
+
text: innerText(token),
|
|
203
|
+
type: mkTVar("'a", 0),
|
|
204
|
+
},
|
|
205
|
+
],
|
|
206
|
+
"default",
|
|
207
|
+
)[0],
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
return {
|
|
211
|
+
isSimp,
|
|
212
|
+
insts: insts.length === 1 && insts[0].length === 0 ? [] : insts,
|
|
213
|
+
rule: position < tokens.length ? readRule(isar, tokens.slice(position)) : undefined,
|
|
214
|
+
};
|
|
215
|
+
};
|
|
216
|
+
|
|
217
|
+
const alignLeft = <Left, Right>(
|
|
218
|
+
message: string,
|
|
219
|
+
lefts: readonly Left[],
|
|
220
|
+
rights: readonly Right[],
|
|
221
|
+
): [Left, Right][] => {
|
|
222
|
+
if (lefts.length < rights.length) throw error(message);
|
|
223
|
+
return rights.map((right, index) => [lefts[index], right]);
|
|
224
|
+
};
|
|
225
|
+
|
|
226
|
+
// Drule.infer_instantiate: the variables' types unify with their instances', then
|
|
227
|
+
// Drule.instantiate_normalize.
|
|
228
|
+
const inferInstantiate = (pairs: readonly [Var, Term][], rule: Thm): Thm => {
|
|
229
|
+
if (pairs.length === 0) return rule;
|
|
230
|
+
const tyenv = pairs.reduce<TyEnv>((env, pair) => {
|
|
231
|
+
const unified = unifyTypes(pair[0].type, fastypeOf(pair[1]), env);
|
|
232
|
+
if (unified === undefined) throw error("Ill-typed instantiation");
|
|
233
|
+
return unified;
|
|
234
|
+
}, emptyTyEnv);
|
|
235
|
+
return compIncr(
|
|
236
|
+
instantiate(
|
|
237
|
+
pairs.map((pair) => ({
|
|
238
|
+
variable: { ...pair[0], type: normType(tyenv, pair[0].type) },
|
|
239
|
+
term: pair[1],
|
|
240
|
+
})),
|
|
241
|
+
instantiateTypes(tyenv, rule),
|
|
242
|
+
),
|
|
243
|
+
asmRl,
|
|
244
|
+
);
|
|
245
|
+
};
|
|
246
|
+
|
|
247
|
+
// Induct.simplified_rule' with the induct simpset. Its other rules and simprocs rewrite only
|
|
248
|
+
// PredicateLogic's cases_* constants, which no premise here mentions.
|
|
249
|
+
const simplifiedRule = (isar: IsarContext, rule: Thm): Thm => {
|
|
250
|
+
if (premsOf(rule).some((prem) => existsSubterm(isInductConst, prem)))
|
|
251
|
+
throw error("Unsupported cases rule with induct constraints");
|
|
252
|
+
const limits = isar.tactics.limits;
|
|
253
|
+
const empty = { limits, simpset: emptySimpset, bounds: 0 };
|
|
254
|
+
const context = { ...empty, simpset: addSimps(empty, [normHhfEq]) };
|
|
255
|
+
return fconvRule(
|
|
256
|
+
premsConv((term) =>
|
|
257
|
+
rewriteCterm(
|
|
258
|
+
{ simprem: false, useprem: false, mutsimp: false },
|
|
259
|
+
() => undefined,
|
|
260
|
+
context,
|
|
261
|
+
term,
|
|
262
|
+
),
|
|
263
|
+
),
|
|
264
|
+
rule,
|
|
265
|
+
);
|
|
266
|
+
};
|
|
267
|
+
|
|
268
|
+
const firstResult = <Item>(seq: Seq<Item>): Seq<Item> => {
|
|
269
|
+
const cell = seq.pull();
|
|
270
|
+
return cell === undefined ? seq : singleSeq(cell[0]);
|
|
271
|
+
};
|
|
272
|
+
|
|
273
|
+
// Induct.cases_context_tactic on the first goal, as the cases method runs it under Seq.DETERM.
|
|
274
|
+
export const casesMethod = (isar: IsarContext, tokens: readonly OuterToken[]): Method => {
|
|
275
|
+
const args = parseCasesArgs(isar, tokens);
|
|
276
|
+
const induct = isar.tactics.induct;
|
|
277
|
+
const limits = isar.tactics.limits;
|
|
278
|
+
const instRule = (rule: CasesRule): [CaseInfo, number, CasesRule] => {
|
|
279
|
+
const instantiated =
|
|
280
|
+
args.insts.length === 0
|
|
281
|
+
? rule.rule
|
|
282
|
+
: inferInstantiate(
|
|
283
|
+
alignLeft(
|
|
284
|
+
"Rule has fewer premises than arguments given",
|
|
285
|
+
premsOf(rule.rule),
|
|
286
|
+
args.insts,
|
|
287
|
+
).flatMap((pair) =>
|
|
288
|
+
alignLeft(
|
|
289
|
+
"Rule has fewer variables than instantiations given",
|
|
290
|
+
varsOf(pair[0]),
|
|
291
|
+
pair[1],
|
|
292
|
+
).flatMap((inst): [Var, Term][] => {
|
|
293
|
+
const term = inst[1];
|
|
294
|
+
if (term === undefined) return [];
|
|
295
|
+
if (unifyTypes(fastypeOf(term), inst[0].type, emptyTyEnv) === undefined)
|
|
296
|
+
throw error("Ill-typed instantiation");
|
|
297
|
+
return [[inst[0], term]];
|
|
298
|
+
}),
|
|
299
|
+
),
|
|
300
|
+
rule.rule,
|
|
301
|
+
);
|
|
302
|
+
const [info, consumes] = getCases(rule);
|
|
303
|
+
return [
|
|
304
|
+
info,
|
|
305
|
+
consumes,
|
|
306
|
+
{ rule: instantiated, tags: instantiated === rule.rule ? rule.tags : [] },
|
|
307
|
+
];
|
|
308
|
+
};
|
|
309
|
+
return (facts) => (state) => {
|
|
310
|
+
const [rule, ruleFacts] =
|
|
311
|
+
args.rule === undefined && facts.length > 0 && isElimRule(facts[0])
|
|
312
|
+
? [{ rule: facts[0], tags: [] }, facts.slice(1)]
|
|
313
|
+
: [args.rule, facts];
|
|
314
|
+
if (rule !== undefined && rule.tags.length === 0 && induct.isTagged(rule.rule))
|
|
315
|
+
throw error("Unsupported cases rule whose case names come from a fact");
|
|
316
|
+
const firstInst = args.insts[0]?.[0];
|
|
317
|
+
const checkSupported = (candidate: CasesRule) => {
|
|
318
|
+
if (args.isSimp && getConstraints(candidate.tags) > 0)
|
|
319
|
+
throw error("Unsupported cases rule with equality constraints");
|
|
320
|
+
return candidate;
|
|
321
|
+
};
|
|
322
|
+
const candidates: Seq<[CaseInfo, number, CasesRule]> =
|
|
323
|
+
rule !== undefined
|
|
324
|
+
? singleSeq(instRule(checkSupported(rule)))
|
|
325
|
+
: mapsSeq(
|
|
326
|
+
(candidate: CasesRule) => {
|
|
327
|
+
checkSupported(candidate);
|
|
328
|
+
try {
|
|
329
|
+
return singleSeq(instRule(candidate));
|
|
330
|
+
} catch (caught) {
|
|
331
|
+
// Seq.try: any failure but an interrupt drops the candidate.
|
|
332
|
+
if (caught instanceof TlaIsabelleError && caught.exception !== "Interrupt")
|
|
333
|
+
return seqOfList([]);
|
|
334
|
+
throw caught;
|
|
335
|
+
}
|
|
336
|
+
},
|
|
337
|
+
seqOfList([
|
|
338
|
+
...(ruleFacts.length === 0
|
|
339
|
+
? []
|
|
340
|
+
: retrieve(induct.casesPred, majorPremOf, conclOf(ruleFacts[0]))),
|
|
341
|
+
...(firstInst === undefined
|
|
342
|
+
? []
|
|
343
|
+
: retrieve(induct.casesType, leftVarPrem, encodeType(fastypeOf(firstInst)))),
|
|
344
|
+
induct.casesDefault,
|
|
345
|
+
]),
|
|
346
|
+
);
|
|
347
|
+
return firstResult(
|
|
348
|
+
mapsSeq(
|
|
349
|
+
(candidate: [CaseInfo, number, CasesRule]) =>
|
|
350
|
+
mapsSeq(
|
|
351
|
+
(consumed) => {
|
|
352
|
+
const [info, , remaining, consumedRule] = consumed;
|
|
353
|
+
const simplified = args.isSimp ? simplifiedRule(isar, consumedRule) : consumedRule;
|
|
354
|
+
const cases = makeCommon(
|
|
355
|
+
limits,
|
|
356
|
+
internalizeParams({
|
|
357
|
+
rule: simplified,
|
|
358
|
+
tags: simplified === candidate[2].rule ? candidate[2].tags : [],
|
|
359
|
+
}).prop,
|
|
360
|
+
info,
|
|
361
|
+
);
|
|
362
|
+
const tactic: GoalTactic = thenAllNew(
|
|
363
|
+
(index) => (goal) =>
|
|
364
|
+
mapsSeq(
|
|
365
|
+
resolveTac(limits, [simplified])(index),
|
|
366
|
+
insertTac(limits, remaining, index)(goal),
|
|
367
|
+
),
|
|
368
|
+
(index) =>
|
|
369
|
+
args.isSimp ? tryTac(matchTac(limits, [induct.trivialRule])(index)) : allTac,
|
|
370
|
+
);
|
|
371
|
+
return mapSeq(
|
|
372
|
+
(goal: Thm) => ({ context: updateCases(state.context, cases), goal }),
|
|
373
|
+
tactic(1)(state.goal),
|
|
374
|
+
);
|
|
375
|
+
},
|
|
376
|
+
consume(limits, ruleFacts, candidate[0], candidate[1], candidate[2].rule),
|
|
377
|
+
),
|
|
378
|
+
candidates,
|
|
379
|
+
),
|
|
380
|
+
);
|
|
381
|
+
};
|
|
382
|
+
};
|
|
@@ -6,6 +6,8 @@ const TLA_TYPE = mkType("PredicateLogic.c");
|
|
|
6
6
|
export type Ast =
|
|
7
7
|
| { readonly kind: "name"; readonly name: string }
|
|
8
8
|
| { readonly kind: "const"; readonly name: string }
|
|
9
|
+
| { readonly kind: "var"; readonly name: string; readonly index: number }
|
|
10
|
+
| { readonly kind: "dummy" }
|
|
9
11
|
| { readonly kind: "app"; readonly fun: Ast; readonly arg: Ast }
|
|
10
12
|
| {
|
|
11
13
|
readonly kind: "abs";
|
|
@@ -19,8 +21,24 @@ type Token =
|
|
|
19
21
|
| { readonly kind: "id"; readonly text: string }
|
|
20
22
|
| { readonly kind: "delimiter"; readonly text: string }
|
|
21
23
|
| { readonly kind: "string"; readonly text: string }
|
|
24
|
+
| { readonly kind: "var"; readonly text: string }
|
|
22
25
|
| { readonly kind: "end" };
|
|
23
26
|
|
|
27
|
+
// The ASCII notations of the Isabelle/TLA+ theories, as the symbols they share a constant with.
|
|
28
|
+
const ASCII_DELIMITERS = new Map([
|
|
29
|
+
["\\subseteq", "\\<subseteq>"],
|
|
30
|
+
["\\notin", "\\<notin>"],
|
|
31
|
+
["\\inter", "\\<inter>"],
|
|
32
|
+
["\\union", "\\<union>"],
|
|
33
|
+
["\\cup", "\\cup"],
|
|
34
|
+
["\\in", "\\<in>"],
|
|
35
|
+
["\\A", "\\<forall>"],
|
|
36
|
+
["\\E", "\\<exists>"],
|
|
37
|
+
["<=>", "\\<Leftrightarrow>"],
|
|
38
|
+
["==", "\\<equiv>"],
|
|
39
|
+
["~=", "~="],
|
|
40
|
+
]);
|
|
41
|
+
|
|
24
42
|
const DELIMITERS = [
|
|
25
43
|
"::",
|
|
26
44
|
":>",
|
|
@@ -47,7 +65,7 @@ const DELIMITERS = [
|
|
|
47
65
|
"0",
|
|
48
66
|
];
|
|
49
67
|
|
|
50
|
-
const KEYWORDS = new Set(["EXCEPT", "DOMAIN", "SUBSET", "UNION", "PROP"]);
|
|
68
|
+
const KEYWORDS = new Set(["EXCEPT", "DOMAIN", "SUBSET", "UNION", "PROP", "CHOOSE"]);
|
|
51
69
|
|
|
52
70
|
const isLetter = (char: string) => /[A-Za-z]/.test(char);
|
|
53
71
|
const isIdChar = (char: string) => /[A-Za-z0-9_']/.test(char);
|
|
@@ -70,10 +88,35 @@ const tokenize = (text: string): Token[] => {
|
|
|
70
88
|
}
|
|
71
89
|
if (text.startsWith("\\<", position) && isLetter(text[position + 2] ?? "")) {
|
|
72
90
|
const end = text.indexOf(">", position);
|
|
91
|
+
if (end < 0)
|
|
92
|
+
throw new TlaIsabelleError(
|
|
93
|
+
"ERROR",
|
|
94
|
+
`Inner lexical error at: ${text.slice(position, position + 20)}`,
|
|
95
|
+
);
|
|
73
96
|
tokens.push({ kind: "delimiter", text: text.slice(position, end + 1) });
|
|
74
97
|
position = end + 1;
|
|
75
98
|
continue;
|
|
76
99
|
}
|
|
100
|
+
if (char === "?" && isLetter(text[position + 1] ?? "")) {
|
|
101
|
+
let end = position + 2;
|
|
102
|
+
while (end < text.length && isIdChar(text[end])) end += 1;
|
|
103
|
+
tokens.push({ kind: "var", text: text.slice(position + 1, end) });
|
|
104
|
+
position = end;
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
if (char === "_" && !isIdChar(text[position + 1] ?? "")) {
|
|
108
|
+
tokens.push({ kind: "delimiter", text: "_" });
|
|
109
|
+
position += 1;
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
const ascii = [...ASCII_DELIMITERS.keys()].find((candidate) =>
|
|
113
|
+
text.startsWith(candidate, position),
|
|
114
|
+
);
|
|
115
|
+
if (ascii !== undefined) {
|
|
116
|
+
tokens.push({ kind: "delimiter", text: ASCII_DELIMITERS.get(ascii) ?? ascii });
|
|
117
|
+
position += ascii.length;
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
77
120
|
if (isLetter(char)) {
|
|
78
121
|
let end = position + 1;
|
|
79
122
|
while (
|
|
@@ -101,6 +144,12 @@ const tokenize = (text: string): Token[] => {
|
|
|
101
144
|
return tokens;
|
|
102
145
|
};
|
|
103
146
|
|
|
147
|
+
// Lexicon.read_indexname: trailing digits are the index.
|
|
148
|
+
const readIndexname = (text: string) => {
|
|
149
|
+
const digits = /\d*$/.exec(text)?.[0] ?? "";
|
|
150
|
+
return { name: text.slice(0, text.length - digits.length), index: Number(digits || 0) };
|
|
151
|
+
};
|
|
152
|
+
|
|
104
153
|
const toConstant = (name: string): Ast => ({ kind: "const", name });
|
|
105
154
|
const apply = (fun: Ast, ...args: Ast[]) =>
|
|
106
155
|
args.reduce<Ast>((result, arg) => ({ kind: "app", fun: result, arg }), fun);
|
|
@@ -151,6 +200,7 @@ const INFIXES = new Map<string, Infix>([
|
|
|
151
200
|
["\\<Rightarrow>", infixr("PredicateLogic.imp", 25)],
|
|
152
201
|
["=>", infixr("PredicateLogic.imp", 25)],
|
|
153
202
|
["\\<Leftrightarrow>", infixr("PredicateLogic.iff", 25)],
|
|
203
|
+
["~=", { constant: "PredicateLogic.not_equal", left: 51, right: 51, priority: 50 }],
|
|
154
204
|
["\\<or>", infixr("PredicateLogic.disj", 30)],
|
|
155
205
|
["|", infixr("PredicateLogic.disj", 30)],
|
|
156
206
|
["\\<and>", infixr("PredicateLogic.conj", 35)],
|
|
@@ -161,7 +211,9 @@ const INFIXES = new Map<string, Infix>([
|
|
|
161
211
|
["\\<notin>", infixl("SetTheory.notin", 50)],
|
|
162
212
|
["\\<subseteq>", infixl("SetTheory.subset", 50)],
|
|
163
213
|
["\\<union>", infixl("SetTheory.union", 65)],
|
|
214
|
+
["\\cup", infixl("Zenon.cup", 65)],
|
|
164
215
|
["\\", infixl("SetTheory.setminus", 65)],
|
|
216
|
+
["\\<setminus>", infixl("SetTheory.setminus", 65)],
|
|
165
217
|
["\\<inter>", infixl("SetTheory.inter", 70)],
|
|
166
218
|
["@@", infixl("Functions.extend", 70)],
|
|
167
219
|
[":>", infixl("Functions.oneArg", 75)],
|
|
@@ -274,11 +326,11 @@ class Parser {
|
|
|
274
326
|
throw new TlaIsabelleError("ERROR", `Undefined type name: ${name}`);
|
|
275
327
|
}
|
|
276
328
|
|
|
277
|
-
private parseBinders(
|
|
329
|
+
private parseBinders(): TypedName[] {
|
|
278
330
|
const binders: TypedName[] = [];
|
|
279
331
|
while (this.peek().kind === "id") {
|
|
280
332
|
const name = this.parseIdentifier();
|
|
281
|
-
if (
|
|
333
|
+
if (this.isDelimiter("::")) {
|
|
282
334
|
this.position += 1;
|
|
283
335
|
binders.push({ name, type: this.parseType() });
|
|
284
336
|
} else binders.push({ name, type: undefined });
|
|
@@ -331,6 +383,17 @@ class Parser {
|
|
|
331
383
|
};
|
|
332
384
|
continue;
|
|
333
385
|
}
|
|
386
|
+
if (token.text === "\\<equiv>") {
|
|
387
|
+
if (minimum > 2 || left.priority < 3) return left;
|
|
388
|
+
this.position += 1;
|
|
389
|
+
const right = this.parseExpression(3);
|
|
390
|
+
left = {
|
|
391
|
+
ast: apply(toConstant("Pure.eq"), left.ast, right.ast),
|
|
392
|
+
priority: 2,
|
|
393
|
+
isProp: true,
|
|
394
|
+
};
|
|
395
|
+
continue;
|
|
396
|
+
}
|
|
334
397
|
if (left.isProp) return left;
|
|
335
398
|
if (token.text === "::") {
|
|
336
399
|
if (minimum > 3 || left.priority < 4) return left;
|
|
@@ -386,6 +449,7 @@ class Parser {
|
|
|
386
449
|
throw this.syntaxError();
|
|
387
450
|
}
|
|
388
451
|
if (token.kind === "id") return toTerm({ kind: "name", name: token.text });
|
|
452
|
+
if (token.kind === "var") return toTerm({ kind: "var", ...readIndexname(token.text) });
|
|
389
453
|
if (token.kind === "string") return toTerm(toStringTerm(token.text));
|
|
390
454
|
switch (token.text) {
|
|
391
455
|
case "(": {
|
|
@@ -395,17 +459,102 @@ class Parser {
|
|
|
395
459
|
}
|
|
396
460
|
case "0":
|
|
397
461
|
return toTerm(toConstant("Integers.zero"));
|
|
398
|
-
case "
|
|
462
|
+
case "_":
|
|
463
|
+
return toTerm({ kind: "dummy" });
|
|
464
|
+
case "PROP": {
|
|
465
|
+
if (minimum > 1000) throw this.syntaxError();
|
|
466
|
+
const next = this.next();
|
|
467
|
+
if (next.kind === "id")
|
|
468
|
+
return { ast: { kind: "name", name: next.text }, priority: 1000, isProp: true };
|
|
469
|
+
if (next.kind === "var")
|
|
470
|
+
return {
|
|
471
|
+
ast: { kind: "var", ...readIndexname(next.text) },
|
|
472
|
+
priority: 1000,
|
|
473
|
+
isProp: true,
|
|
474
|
+
};
|
|
475
|
+
this.position -= 1;
|
|
476
|
+
throw this.syntaxError();
|
|
477
|
+
}
|
|
478
|
+
case "CHOOSE": {
|
|
479
|
+
if (minimum > 10) throw this.syntaxError();
|
|
480
|
+
const name = this.parseIdentifier();
|
|
481
|
+
if (this.isDelimiter("\\<in>")) {
|
|
482
|
+
this.position += 1;
|
|
483
|
+
const domain = this.parseLogic(0);
|
|
484
|
+
this.expect(":");
|
|
485
|
+
const body = this.parseLogic(0);
|
|
486
|
+
return toTerm(
|
|
487
|
+
apply(toConstant("SetTheory.bChoose"), domain, {
|
|
488
|
+
kind: "abs",
|
|
489
|
+
name,
|
|
490
|
+
type: undefined,
|
|
491
|
+
body,
|
|
492
|
+
}),
|
|
493
|
+
10,
|
|
494
|
+
);
|
|
495
|
+
}
|
|
496
|
+
this.expect(":");
|
|
497
|
+
const body = this.parseLogic(10);
|
|
498
|
+
return toTerm(
|
|
499
|
+
apply(toConstant("PredicateLogic.Choice"), { kind: "abs", name, type: undefined, body }),
|
|
500
|
+
10,
|
|
501
|
+
);
|
|
502
|
+
}
|
|
503
|
+
case "{": {
|
|
399
504
|
if (this.isDelimiter("}")) {
|
|
400
505
|
this.position += 1;
|
|
401
506
|
return toTerm(toConstant("SetTheory.emptyset"), 100);
|
|
402
507
|
}
|
|
508
|
+
// SetTheory's {x \<in> S : P} and {e : x \<in> S}, then an enumeration.
|
|
509
|
+
if (this.peek().kind === "id" && this.isDelimiter("\\<in>", 1)) {
|
|
510
|
+
const start = this.position;
|
|
511
|
+
const name = this.parseIdentifier();
|
|
512
|
+
this.position += 1;
|
|
513
|
+
const set = this.parseLogic(0);
|
|
514
|
+
if (this.isDelimiter(":")) {
|
|
515
|
+
this.position += 1;
|
|
516
|
+
const body = this.parseLogic(0);
|
|
517
|
+
this.expect("}");
|
|
518
|
+
return toTerm(
|
|
519
|
+
apply(toConstant("SetTheory.subsetOf"), set, {
|
|
520
|
+
kind: "abs",
|
|
521
|
+
name,
|
|
522
|
+
type: undefined,
|
|
523
|
+
body,
|
|
524
|
+
}),
|
|
525
|
+
);
|
|
526
|
+
}
|
|
527
|
+
this.position = start;
|
|
528
|
+
}
|
|
529
|
+
const first = this.parseLogic(0);
|
|
530
|
+
if (this.isDelimiter(":")) {
|
|
531
|
+
this.position += 1;
|
|
532
|
+
const name = this.parseIdentifier();
|
|
533
|
+
this.expect("\\<in>");
|
|
534
|
+
const set = this.parseLogic(0);
|
|
535
|
+
this.expect("}");
|
|
536
|
+
return toTerm(
|
|
537
|
+
apply(toConstant("SetTheory.setOfAll"), set, {
|
|
538
|
+
kind: "abs",
|
|
539
|
+
name,
|
|
540
|
+
type: undefined,
|
|
541
|
+
body: first,
|
|
542
|
+
}),
|
|
543
|
+
);
|
|
544
|
+
}
|
|
545
|
+
const elements = [first];
|
|
546
|
+
while (this.isDelimiter(",")) {
|
|
547
|
+
this.position += 1;
|
|
548
|
+
elements.push(this.parseLogic(0));
|
|
549
|
+
}
|
|
550
|
+
this.expect("}");
|
|
403
551
|
return toTerm(
|
|
404
|
-
|
|
552
|
+
elements.reduceRight(
|
|
405
553
|
(set, element) => apply(toConstant("SetTheory.addElt"), element, set),
|
|
406
554
|
toConstant("SetTheory.emptyset"),
|
|
407
555
|
),
|
|
408
556
|
);
|
|
557
|
+
}
|
|
409
558
|
case "<<":
|
|
410
559
|
return toTerm(toTuple(this.parseCommaList(">>")));
|
|
411
560
|
case "\\<langle>":
|
|
@@ -418,7 +567,7 @@ class Parser {
|
|
|
418
567
|
case "%":
|
|
419
568
|
case "\\<lambda>": {
|
|
420
569
|
if (minimum > 3) throw this.syntaxError();
|
|
421
|
-
const binders = this.parseBinders(
|
|
570
|
+
const binders = this.parseBinders();
|
|
422
571
|
this.expect(".");
|
|
423
572
|
const body = this.parseLogic(3);
|
|
424
573
|
return toTerm(
|
|
@@ -436,7 +585,7 @@ class Parser {
|
|
|
436
585
|
}
|
|
437
586
|
case "\\<And>": {
|
|
438
587
|
if (minimum > 0) throw this.syntaxError();
|
|
439
|
-
const binders = this.parseBinders(
|
|
588
|
+
const binders = this.parseBinders();
|
|
440
589
|
this.expect(".");
|
|
441
590
|
const body = this.parseProp(0);
|
|
442
591
|
return {
|
|
@@ -570,4 +719,6 @@ const parseWith = <Result>(text: string, parse: (parser: Parser) => Result): Res
|
|
|
570
719
|
|
|
571
720
|
export const parseProp = (text: string) => parseWith(text, (parser) => parser.parseProp(0));
|
|
572
721
|
|
|
722
|
+
export const parseTerm = (text: string) => parseWith(text, (parser) => parser.parseLogic(0));
|
|
723
|
+
|
|
573
724
|
export const parseType = (text: string) => parseWith(text, (parser) => parser.parseType());
|