tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- 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 +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,19 +1,13 @@
|
|
|
1
|
-
// Parses Isabelle's inner syntax, the terms inside quotes, as far as tlapm's theory printer
|
|
2
|
-
// (isabelle.ml) uses it. The notation and its priorities come from Isabelle2025's Pure and from
|
|
3
|
-
// the Isabelle/TLA+ theories that declare it: PredicateLogic, SetTheory, Functions, Tuples,
|
|
4
|
-
// Strings and CaseExpressions. The translations those theories declare apply while parsing, so a
|
|
5
|
-
// term comes out as constants, names, applications and abstractions only.
|
|
6
|
-
|
|
7
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
8
2
|
import { funT, mkType, propT, type Typ } from "../pure/term";
|
|
9
3
|
|
|
10
4
|
const TLA_TYPE = mkType("PredicateLogic.c");
|
|
11
5
|
|
|
12
|
-
// A parsed term before names resolve and types are inferred. A name is a bound or free variable
|
|
13
|
-
// or a constant; a constant comes from notation.
|
|
14
6
|
export type Ast =
|
|
15
7
|
| { readonly kind: "name"; readonly name: string }
|
|
16
8
|
| { readonly kind: "const"; readonly name: string }
|
|
9
|
+
| { readonly kind: "var"; readonly name: string; readonly index: number }
|
|
10
|
+
| { readonly kind: "dummy" }
|
|
17
11
|
| { readonly kind: "app"; readonly fun: Ast; readonly arg: Ast }
|
|
18
12
|
| {
|
|
19
13
|
readonly kind: "abs";
|
|
@@ -27,8 +21,24 @@ type Token =
|
|
|
27
21
|
| { readonly kind: "id"; readonly text: string }
|
|
28
22
|
| { readonly kind: "delimiter"; readonly text: string }
|
|
29
23
|
| { readonly kind: "string"; readonly text: string }
|
|
24
|
+
| { readonly kind: "var"; readonly text: string }
|
|
30
25
|
| { readonly kind: "end" };
|
|
31
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
|
+
|
|
32
42
|
const DELIMITERS = [
|
|
33
43
|
"::",
|
|
34
44
|
":>",
|
|
@@ -55,7 +65,7 @@ const DELIMITERS = [
|
|
|
55
65
|
"0",
|
|
56
66
|
];
|
|
57
67
|
|
|
58
|
-
const KEYWORDS = new Set(["EXCEPT", "DOMAIN", "SUBSET", "UNION", "PROP"]);
|
|
68
|
+
const KEYWORDS = new Set(["EXCEPT", "DOMAIN", "SUBSET", "UNION", "PROP", "CHOOSE"]);
|
|
59
69
|
|
|
60
70
|
const isLetter = (char: string) => /[A-Za-z]/.test(char);
|
|
61
71
|
const isIdChar = (char: string) => /[A-Za-z0-9_']/.test(char);
|
|
@@ -78,10 +88,35 @@ const tokenize = (text: string): Token[] => {
|
|
|
78
88
|
}
|
|
79
89
|
if (text.startsWith("\\<", position) && isLetter(text[position + 2] ?? "")) {
|
|
80
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
|
+
);
|
|
81
96
|
tokens.push({ kind: "delimiter", text: text.slice(position, end + 1) });
|
|
82
97
|
position = end + 1;
|
|
83
98
|
continue;
|
|
84
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
|
+
}
|
|
85
120
|
if (isLetter(char)) {
|
|
86
121
|
let end = position + 1;
|
|
87
122
|
while (
|
|
@@ -109,31 +144,36 @@ const tokenize = (text: string): Token[] => {
|
|
|
109
144
|
return tokens;
|
|
110
145
|
};
|
|
111
146
|
|
|
112
|
-
|
|
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
|
+
|
|
153
|
+
const toConstant = (name: string): Ast => ({ kind: "const", name });
|
|
113
154
|
const apply = (fun: Ast, ...args: Ast[]) =>
|
|
114
155
|
args.reduce<Ast>((result, arg) => ({ kind: "app", fun: result, arg }), fun);
|
|
115
156
|
|
|
116
|
-
|
|
117
|
-
const nibble = (value: number): Ast =>
|
|
157
|
+
const toNibble = (value: number): Ast =>
|
|
118
158
|
value === 0
|
|
119
|
-
?
|
|
120
|
-
: apply(
|
|
159
|
+
? toConstant("Integers.zero")
|
|
160
|
+
: apply(toConstant("Functions.fapply"), toConstant("Integers.succ"), toNibble(value - 1));
|
|
121
161
|
|
|
122
|
-
const
|
|
162
|
+
const toStringTerm = (text: string) =>
|
|
123
163
|
[...text].reduce((tuple, char) => {
|
|
124
164
|
const code = char.charCodeAt(0);
|
|
125
165
|
if (code >= 128) throw new TlaIsabelleError("ERROR", `Non-ASCII symbol: ${char}`);
|
|
126
166
|
return apply(
|
|
127
|
-
|
|
167
|
+
toConstant("Tuples.Append"),
|
|
128
168
|
tuple,
|
|
129
|
-
apply(
|
|
169
|
+
apply(toConstant("Strings.char"), toNibble(code >> 4), toNibble(code & 15)),
|
|
130
170
|
);
|
|
131
|
-
},
|
|
171
|
+
}, toConstant("Tuples.emptySeq"));
|
|
132
172
|
|
|
133
|
-
const
|
|
173
|
+
const toTuple = (elements: readonly Ast[]) =>
|
|
134
174
|
elements.reduce(
|
|
135
|
-
(result, element) => apply(
|
|
136
|
-
|
|
175
|
+
(result, element) => apply(toConstant("Tuples.Append"), result, element),
|
|
176
|
+
toConstant("Tuples.emptySeq"),
|
|
137
177
|
);
|
|
138
178
|
|
|
139
179
|
interface Infix {
|
|
@@ -160,6 +200,7 @@ const INFIXES = new Map<string, Infix>([
|
|
|
160
200
|
["\\<Rightarrow>", infixr("PredicateLogic.imp", 25)],
|
|
161
201
|
["=>", infixr("PredicateLogic.imp", 25)],
|
|
162
202
|
["\\<Leftrightarrow>", infixr("PredicateLogic.iff", 25)],
|
|
203
|
+
["~=", { constant: "PredicateLogic.not_equal", left: 51, right: 51, priority: 50 }],
|
|
163
204
|
["\\<or>", infixr("PredicateLogic.disj", 30)],
|
|
164
205
|
["|", infixr("PredicateLogic.disj", 30)],
|
|
165
206
|
["\\<and>", infixr("PredicateLogic.conj", 35)],
|
|
@@ -170,7 +211,9 @@ const INFIXES = new Map<string, Infix>([
|
|
|
170
211
|
["\\<notin>", infixl("SetTheory.notin", 50)],
|
|
171
212
|
["\\<subseteq>", infixl("SetTheory.subset", 50)],
|
|
172
213
|
["\\<union>", infixl("SetTheory.union", 65)],
|
|
214
|
+
["\\cup", infixl("Zenon.cup", 65)],
|
|
173
215
|
["\\", infixl("SetTheory.setminus", 65)],
|
|
216
|
+
["\\<setminus>", infixl("SetTheory.setminus", 65)],
|
|
174
217
|
["\\<inter>", infixl("SetTheory.inter", 70)],
|
|
175
218
|
["@@", infixl("Functions.extend", 70)],
|
|
176
219
|
[":>", infixl("Functions.oneArg", 75)],
|
|
@@ -188,14 +231,17 @@ const PREFIXES = new Map<
|
|
|
188
231
|
["DOMAIN", { constant: "Functions.DOMAIN", argument: 100, priority: 90 }],
|
|
189
232
|
]);
|
|
190
233
|
|
|
191
|
-
// A parse result: the term, its priority, and whether it is a proposition rather than an object
|
|
192
|
-
// of the logic, which Isabelle tells apart by syntactic category.
|
|
193
234
|
interface Parsed {
|
|
194
235
|
readonly ast: Ast;
|
|
195
236
|
readonly priority: number;
|
|
196
237
|
readonly isProp: boolean;
|
|
197
238
|
}
|
|
198
239
|
|
|
240
|
+
interface TypedName {
|
|
241
|
+
readonly name: string;
|
|
242
|
+
readonly type: Typ | undefined;
|
|
243
|
+
}
|
|
244
|
+
|
|
199
245
|
const MAX_PRIORITY = 1000;
|
|
200
246
|
|
|
201
247
|
class Parser {
|
|
@@ -231,23 +277,22 @@ class Parser {
|
|
|
231
277
|
);
|
|
232
278
|
}
|
|
233
279
|
|
|
234
|
-
private
|
|
280
|
+
private parseIdentifier(): string {
|
|
235
281
|
const token = this.next();
|
|
236
282
|
if (token.kind !== "id") throw this.syntaxError();
|
|
237
283
|
return token.text;
|
|
238
284
|
}
|
|
239
285
|
|
|
240
|
-
|
|
286
|
+
isAtEnd() {
|
|
241
287
|
return this.peek().kind === "end";
|
|
242
288
|
}
|
|
243
289
|
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
const
|
|
247
|
-
const atom = domains === undefined ? this.typeAtom() : undefined;
|
|
290
|
+
parseType(): Typ {
|
|
291
|
+
const domains = this.isDelimiter("[") ? this.parseTypeList() : undefined;
|
|
292
|
+
const atom = domains === undefined ? this.parseTypeAtom() : undefined;
|
|
248
293
|
if (this.isDelimiter("=>") || this.isDelimiter("\\<Rightarrow>")) {
|
|
249
294
|
this.position += 1;
|
|
250
|
-
const range = this.
|
|
295
|
+
const range = this.parseType();
|
|
251
296
|
return (domains ?? [atom ?? TLA_TYPE]).reduceRight(
|
|
252
297
|
(result, domain) => funT(domain, result),
|
|
253
298
|
range,
|
|
@@ -257,75 +302,71 @@ class Parser {
|
|
|
257
302
|
return atom;
|
|
258
303
|
}
|
|
259
304
|
|
|
260
|
-
private
|
|
305
|
+
private parseTypeList(): Typ[] {
|
|
261
306
|
this.expect("[");
|
|
262
|
-
const types = [this.
|
|
307
|
+
const types = [this.parseType()];
|
|
263
308
|
while (this.isDelimiter(",")) {
|
|
264
309
|
this.position += 1;
|
|
265
|
-
types.push(this.
|
|
310
|
+
types.push(this.parseType());
|
|
266
311
|
}
|
|
267
312
|
this.expect("]");
|
|
268
313
|
return types;
|
|
269
314
|
}
|
|
270
315
|
|
|
271
|
-
private
|
|
316
|
+
private parseTypeAtom(): Typ {
|
|
272
317
|
if (this.isDelimiter("(")) {
|
|
273
318
|
this.position += 1;
|
|
274
|
-
const type = this.
|
|
319
|
+
const type = this.parseType();
|
|
275
320
|
this.expect(")");
|
|
276
321
|
return type;
|
|
277
322
|
}
|
|
278
|
-
const name = this.
|
|
323
|
+
const name = this.parseIdentifier();
|
|
279
324
|
if (name === "c") return TLA_TYPE;
|
|
280
325
|
if (name === "prop") return propT;
|
|
281
326
|
throw new TlaIsabelleError("ERROR", `Undefined type name: ${name}`);
|
|
282
327
|
}
|
|
283
328
|
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
const binders: { name: string; type: Typ | undefined }[] = [];
|
|
329
|
+
private parseBinders(): TypedName[] {
|
|
330
|
+
const binders: TypedName[] = [];
|
|
287
331
|
while (this.peek().kind === "id") {
|
|
288
|
-
const name = this.
|
|
289
|
-
if (
|
|
332
|
+
const name = this.parseIdentifier();
|
|
333
|
+
if (this.isDelimiter("::")) {
|
|
290
334
|
this.position += 1;
|
|
291
|
-
binders.push({ name, type: this.
|
|
335
|
+
binders.push({ name, type: this.parseType() });
|
|
292
336
|
} else binders.push({ name, type: undefined });
|
|
293
337
|
}
|
|
294
338
|
if (binders.length === 0) throw this.syntaxError();
|
|
295
339
|
return binders;
|
|
296
340
|
}
|
|
297
341
|
|
|
298
|
-
private
|
|
342
|
+
private parseCommaList(close: string): Ast[] {
|
|
299
343
|
if (this.isDelimiter(close)) {
|
|
300
344
|
this.position += 1;
|
|
301
345
|
return [];
|
|
302
346
|
}
|
|
303
|
-
const items = [this.
|
|
347
|
+
const items = [this.parseLogic(0)];
|
|
304
348
|
while (this.isDelimiter(",")) {
|
|
305
349
|
this.position += 1;
|
|
306
|
-
items.push(this.
|
|
350
|
+
items.push(this.parseLogic(0));
|
|
307
351
|
}
|
|
308
352
|
this.expect(close);
|
|
309
353
|
return items;
|
|
310
354
|
}
|
|
311
355
|
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
const parsed = this.expression(minimum);
|
|
356
|
+
parseLogic(minimum: number): Ast {
|
|
357
|
+
const parsed = this.parseExpression(minimum);
|
|
315
358
|
if (parsed.isProp)
|
|
316
359
|
throw new TlaIsabelleError("ERROR", "Inner syntax error: proposition in term position");
|
|
317
360
|
return parsed.ast;
|
|
318
361
|
}
|
|
319
362
|
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
const parsed = this.expression(minimum);
|
|
324
|
-
return parsed.isProp ? parsed.ast : apply(constant("PredicateLogic.Trueprop"), parsed.ast);
|
|
363
|
+
parseProp(minimum: number): Ast {
|
|
364
|
+
const parsed = this.parseExpression(minimum);
|
|
365
|
+
return parsed.isProp ? parsed.ast : apply(toConstant("PredicateLogic.Trueprop"), parsed.ast);
|
|
325
366
|
}
|
|
326
367
|
|
|
327
|
-
private
|
|
328
|
-
let left = this.
|
|
368
|
+
private parseExpression(minimum: number): Parsed {
|
|
369
|
+
let left = this.parsePrefix(minimum);
|
|
329
370
|
for (;;) {
|
|
330
371
|
const token = this.peek();
|
|
331
372
|
if (token.kind !== "delimiter") return left;
|
|
@@ -334,20 +375,31 @@ class Parser {
|
|
|
334
375
|
this.position += 1;
|
|
335
376
|
const premise = left.isProp
|
|
336
377
|
? left.ast
|
|
337
|
-
: apply(
|
|
378
|
+
: apply(toConstant("PredicateLogic.Trueprop"), left.ast);
|
|
338
379
|
left = {
|
|
339
|
-
ast: apply(
|
|
380
|
+
ast: apply(toConstant("Pure.imp"), premise, this.parseProp(1)),
|
|
340
381
|
priority: 1,
|
|
341
382
|
isProp: true,
|
|
342
383
|
};
|
|
343
384
|
continue;
|
|
344
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
|
+
}
|
|
345
397
|
if (left.isProp) return left;
|
|
346
398
|
if (token.text === "::") {
|
|
347
399
|
if (minimum > 3 || left.priority < 4) return left;
|
|
348
400
|
this.position += 1;
|
|
349
401
|
left = {
|
|
350
|
-
ast: { kind: "constrain", term: left.ast, type: this.
|
|
402
|
+
ast: { kind: "constrain", term: left.ast, type: this.parseType() },
|
|
351
403
|
priority: 3,
|
|
352
404
|
isProp: false,
|
|
353
405
|
};
|
|
@@ -356,7 +408,7 @@ class Parser {
|
|
|
356
408
|
if (token.text === "(") {
|
|
357
409
|
if (left.priority < MAX_PRIORITY) return left;
|
|
358
410
|
this.position += 1;
|
|
359
|
-
const args = this.
|
|
411
|
+
const args = this.parseCommaList(")");
|
|
360
412
|
if (args.length === 0) throw this.syntaxError();
|
|
361
413
|
left = { ast: apply(left.ast, ...args), priority: MAX_PRIORITY, isProp: false };
|
|
362
414
|
continue;
|
|
@@ -364,10 +416,10 @@ class Parser {
|
|
|
364
416
|
if (token.text === "[") {
|
|
365
417
|
if (minimum > 90 || left.priority < 89) return left;
|
|
366
418
|
this.position += 1;
|
|
367
|
-
const index = this.
|
|
419
|
+
const index = this.parseLogic(0);
|
|
368
420
|
this.expect("]");
|
|
369
421
|
left = {
|
|
370
|
-
ast: apply(
|
|
422
|
+
ast: apply(toConstant("Functions.fapply"), left.ast, index),
|
|
371
423
|
priority: 90,
|
|
372
424
|
isProp: false,
|
|
373
425
|
};
|
|
@@ -378,61 +430,147 @@ class Parser {
|
|
|
378
430
|
return left;
|
|
379
431
|
this.position += 1;
|
|
380
432
|
left = {
|
|
381
|
-
ast: apply(
|
|
433
|
+
ast: apply(toConstant(infix.constant), left.ast, this.parseLogic(infix.right)),
|
|
382
434
|
priority: infix.priority,
|
|
383
435
|
isProp: false,
|
|
384
436
|
};
|
|
385
437
|
}
|
|
386
438
|
}
|
|
387
439
|
|
|
388
|
-
private
|
|
440
|
+
private parsePrefix(minimum: number): Parsed {
|
|
389
441
|
const token = this.next();
|
|
390
|
-
const
|
|
442
|
+
const toTerm = (ast: Ast, priority = MAX_PRIORITY): Parsed => ({
|
|
443
|
+
ast,
|
|
444
|
+
priority,
|
|
445
|
+
isProp: false,
|
|
446
|
+
});
|
|
391
447
|
if (token.kind === "end") {
|
|
392
448
|
this.position -= 1;
|
|
393
449
|
throw this.syntaxError();
|
|
394
450
|
}
|
|
395
|
-
if (token.kind === "id") return
|
|
396
|
-
if (token.kind === "
|
|
451
|
+
if (token.kind === "id") return toTerm({ kind: "name", name: token.text });
|
|
452
|
+
if (token.kind === "var") return toTerm({ kind: "var", ...readIndexname(token.text) });
|
|
453
|
+
if (token.kind === "string") return toTerm(toStringTerm(token.text));
|
|
397
454
|
switch (token.text) {
|
|
398
455
|
case "(": {
|
|
399
|
-
const inner = this.
|
|
456
|
+
const inner = this.parseExpression(0);
|
|
400
457
|
this.expect(")");
|
|
401
458
|
return { ...inner, priority: MAX_PRIORITY };
|
|
402
459
|
}
|
|
403
460
|
case "0":
|
|
404
|
-
return
|
|
405
|
-
case "
|
|
461
|
+
return toTerm(toConstant("Integers.zero"));
|
|
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 "{": {
|
|
406
504
|
if (this.isDelimiter("}")) {
|
|
407
505
|
this.position += 1;
|
|
408
|
-
return
|
|
506
|
+
return toTerm(toConstant("SetTheory.emptyset"), 100);
|
|
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
|
+
);
|
|
409
544
|
}
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
545
|
+
const elements = [first];
|
|
546
|
+
while (this.isDelimiter(",")) {
|
|
547
|
+
this.position += 1;
|
|
548
|
+
elements.push(this.parseLogic(0));
|
|
549
|
+
}
|
|
550
|
+
this.expect("}");
|
|
551
|
+
return toTerm(
|
|
552
|
+
elements.reduceRight(
|
|
553
|
+
(set, element) => apply(toConstant("SetTheory.addElt"), element, set),
|
|
554
|
+
toConstant("SetTheory.emptyset"),
|
|
414
555
|
),
|
|
415
556
|
);
|
|
557
|
+
}
|
|
416
558
|
case "<<":
|
|
417
|
-
return
|
|
418
|
-
this.isDelimiter(">>")
|
|
419
|
-
? (this.next(), constant("Tuples.emptySeq"))
|
|
420
|
-
: tuple(this.commaList(">>")),
|
|
421
|
-
);
|
|
559
|
+
return toTerm(toTuple(this.parseCommaList(">>")));
|
|
422
560
|
case "\\<langle>":
|
|
423
|
-
return
|
|
561
|
+
return toTerm(toTuple(this.parseCommaList("\\<rangle>")));
|
|
424
562
|
case "[":
|
|
425
|
-
return this.
|
|
563
|
+
return this.parseBracket();
|
|
426
564
|
case "\\<forall>":
|
|
427
565
|
case "\\<exists>":
|
|
428
|
-
return
|
|
566
|
+
return toTerm(this.parseQuantifier(token.text === "\\<forall>"), 10);
|
|
429
567
|
case "%":
|
|
430
568
|
case "\\<lambda>": {
|
|
431
569
|
if (minimum > 3) throw this.syntaxError();
|
|
432
|
-
const binders = this.
|
|
570
|
+
const binders = this.parseBinders();
|
|
433
571
|
this.expect(".");
|
|
434
|
-
const body = this.
|
|
435
|
-
return
|
|
572
|
+
const body = this.parseLogic(3);
|
|
573
|
+
return toTerm(
|
|
436
574
|
binders.reduceRight<Ast>(
|
|
437
575
|
(result, binder) => ({
|
|
438
576
|
kind: "abs",
|
|
@@ -447,13 +585,13 @@ class Parser {
|
|
|
447
585
|
}
|
|
448
586
|
case "\\<And>": {
|
|
449
587
|
if (minimum > 0) throw this.syntaxError();
|
|
450
|
-
const binders = this.
|
|
588
|
+
const binders = this.parseBinders();
|
|
451
589
|
this.expect(".");
|
|
452
|
-
const body = this.
|
|
590
|
+
const body = this.parseProp(0);
|
|
453
591
|
return {
|
|
454
592
|
ast: binders.reduceRight<Ast>(
|
|
455
593
|
(result, binder) =>
|
|
456
|
-
apply(
|
|
594
|
+
apply(toConstant("Pure.all"), {
|
|
457
595
|
kind: "abs",
|
|
458
596
|
name: binder.name,
|
|
459
597
|
type: binder.type,
|
|
@@ -471,30 +609,32 @@ class Parser {
|
|
|
471
609
|
this.position -= 1;
|
|
472
610
|
throw this.syntaxError();
|
|
473
611
|
}
|
|
474
|
-
return
|
|
612
|
+
return toTerm(
|
|
613
|
+
apply(toConstant(prefix.constant), this.parseLogic(prefix.argument)),
|
|
614
|
+
prefix.priority,
|
|
615
|
+
);
|
|
475
616
|
}
|
|
476
617
|
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
const names = [this.identifier()];
|
|
618
|
+
private parseQuantifier(isForall: boolean): Ast {
|
|
619
|
+
const names = [this.parseIdentifier()];
|
|
480
620
|
while (this.isDelimiter(",")) {
|
|
481
621
|
this.position += 1;
|
|
482
|
-
names.push(this.
|
|
622
|
+
names.push(this.parseIdentifier());
|
|
483
623
|
}
|
|
484
624
|
if (this.isDelimiter(":")) {
|
|
485
625
|
this.position += 1;
|
|
486
|
-
const body = this.
|
|
487
|
-
const quantifier =
|
|
626
|
+
const body = this.parseLogic(10);
|
|
627
|
+
const quantifier = toConstant(isForall ? "PredicateLogic.All" : "PredicateLogic.Ex");
|
|
488
628
|
return names.reduceRight(
|
|
489
629
|
(result, name) => apply(quantifier, { kind: "abs", name, type: undefined, body: result }),
|
|
490
630
|
body,
|
|
491
631
|
);
|
|
492
632
|
}
|
|
493
633
|
this.expect("\\<in>");
|
|
494
|
-
const domain = this.
|
|
634
|
+
const domain = this.parseLogic(0);
|
|
495
635
|
this.expect(":");
|
|
496
|
-
const body = this.
|
|
497
|
-
const quantifier =
|
|
636
|
+
const body = this.parseLogic(0);
|
|
637
|
+
const quantifier = toConstant(isForall ? "SetTheory.bAll" : "SetTheory.bEx");
|
|
498
638
|
return names.reduceRight(
|
|
499
639
|
(result, name) =>
|
|
500
640
|
apply(quantifier, domain, { kind: "abs", name, type: undefined, body: result }),
|
|
@@ -502,29 +642,32 @@ class Parser {
|
|
|
502
642
|
);
|
|
503
643
|
}
|
|
504
644
|
|
|
505
|
-
|
|
506
|
-
// and [d : r, ...].
|
|
507
|
-
private bracket(): Parsed {
|
|
645
|
+
private parseBracket(): Parsed {
|
|
508
646
|
if (this.peek().kind === "id" && this.isDelimiter("\\<in>", 1)) {
|
|
509
|
-
const name = this.
|
|
647
|
+
const name = this.parseIdentifier();
|
|
510
648
|
this.position += 1;
|
|
511
|
-
const domain = this.
|
|
649
|
+
const domain = this.parseLogic(0);
|
|
512
650
|
this.expect("\\<mapsto>");
|
|
513
|
-
const body = this.
|
|
651
|
+
const body = this.parseLogic(0);
|
|
514
652
|
this.expect("]");
|
|
515
653
|
return {
|
|
516
|
-
ast: apply(
|
|
654
|
+
ast: apply(toConstant("Functions.Fcn"), domain, {
|
|
655
|
+
kind: "abs",
|
|
656
|
+
name,
|
|
657
|
+
type: undefined,
|
|
658
|
+
body,
|
|
659
|
+
}),
|
|
517
660
|
priority: 900,
|
|
518
661
|
isProp: false,
|
|
519
662
|
};
|
|
520
663
|
}
|
|
521
|
-
const first = this.
|
|
664
|
+
const first = this.parseLogic(0);
|
|
522
665
|
if (this.isDelimiter("\\<rightarrow>")) {
|
|
523
666
|
this.position += 1;
|
|
524
|
-
const range = this.
|
|
667
|
+
const range = this.parseLogic(0);
|
|
525
668
|
this.expect("]");
|
|
526
669
|
return {
|
|
527
|
-
ast: apply(
|
|
670
|
+
ast: apply(toConstant("Functions.FuncSet"), first, range),
|
|
528
671
|
priority: 900,
|
|
529
672
|
isProp: false,
|
|
530
673
|
};
|
|
@@ -535,10 +678,10 @@ class Parser {
|
|
|
535
678
|
for (;;) {
|
|
536
679
|
this.expect("!");
|
|
537
680
|
this.expect("[");
|
|
538
|
-
const index = this.
|
|
681
|
+
const index = this.parseLogic(0);
|
|
539
682
|
this.expect("]");
|
|
540
683
|
this.expect("=");
|
|
541
|
-
result = apply(
|
|
684
|
+
result = apply(toConstant("Functions.except"), result, index, this.parseLogic(0));
|
|
542
685
|
if (!this.isDelimiter(",")) break;
|
|
543
686
|
this.position += 1;
|
|
544
687
|
}
|
|
@@ -547,16 +690,16 @@ class Parser {
|
|
|
547
690
|
}
|
|
548
691
|
this.expect(":");
|
|
549
692
|
const domains = [first];
|
|
550
|
-
const ranges = [this.
|
|
693
|
+
const ranges = [this.parseLogic(0)];
|
|
551
694
|
while (this.isDelimiter(",")) {
|
|
552
695
|
this.position += 1;
|
|
553
|
-
domains.push(this.
|
|
696
|
+
domains.push(this.parseLogic(0));
|
|
554
697
|
this.expect(":");
|
|
555
|
-
ranges.push(this.
|
|
698
|
+
ranges.push(this.parseLogic(0));
|
|
556
699
|
}
|
|
557
700
|
this.expect("]");
|
|
558
701
|
return {
|
|
559
|
-
ast: apply(
|
|
702
|
+
ast: apply(toConstant("Tuples.EnumFuncSet"), toTuple(domains), toTuple(ranges)),
|
|
560
703
|
priority: MAX_PRIORITY,
|
|
561
704
|
isProp: false,
|
|
562
705
|
};
|
|
@@ -566,7 +709,7 @@ class Parser {
|
|
|
566
709
|
const parseWith = <Result>(text: string, parse: (parser: Parser) => Result): Result => {
|
|
567
710
|
const parser = new Parser(tokenize(text));
|
|
568
711
|
const result = parse(parser);
|
|
569
|
-
if (!parser.
|
|
712
|
+
if (!parser.isAtEnd())
|
|
570
713
|
throw new TlaIsabelleError(
|
|
571
714
|
"ERROR",
|
|
572
715
|
`Inner syntax error: trailing input in ${text.slice(0, 40)}`,
|
|
@@ -574,6 +717,8 @@ const parseWith = <Result>(text: string, parse: (parser: Parser) => Result): Res
|
|
|
574
717
|
return result;
|
|
575
718
|
};
|
|
576
719
|
|
|
577
|
-
export const parseProp = (text: string) => parseWith(text, (parser) => parser.
|
|
720
|
+
export const parseProp = (text: string) => parseWith(text, (parser) => parser.parseProp(0));
|
|
721
|
+
|
|
722
|
+
export const parseTerm = (text: string) => parseWith(text, (parser) => parser.parseLogic(0));
|
|
578
723
|
|
|
579
|
-
export const parseType = (text: string) => parseWith(text, (parser) => parser.
|
|
724
|
+
export const parseType = (text: string) => parseWith(text, (parser) => parser.parseType());
|