tla-ts 0.0.9 → 0.0.10-dev.094b9b512
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +40 -37
- package/dist/deciders.js +47 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- 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 +2658 -410
- package/dist/prove.js +2657 -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 +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +208 -54
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +18 -43
- package/src/obligations/anonymize.ts +119 -90
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +2 -2
- package/src/obligations/expression.ts +38 -25
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +67 -63
- package/src/obligations/index.ts +38 -20
- package/src/obligations/levels.ts +28 -17
- package/src/obligations/module.ts +29 -54
- package/src/obligations/normalize.ts +31 -36
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +53 -25
- package/src/obligations/printer.ts +90 -57
- package/src/obligations/proof.ts +4 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +58 -62
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +51 -27
- package/src/obligations/substitution.ts +2 -4
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +961 -387
- 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 +19 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -62
- package/src/prover/isabelle/isar/attrib.ts +219 -0
- package/src/prover/isabelle/isar/context.ts +336 -0
- package/src/prover/isabelle/isar/induct.ts +392 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +513 -225
- package/src/prover/isabelle/isar/proof.ts +569 -23
- package/src/prover/isabelle/isar/rule-cases.ts +234 -0
- package/src/prover/isabelle/isar/theory.ts +490 -89
- package/src/prover/isabelle/isar/toplevel.ts +341 -0
- package/src/prover/isabelle/isar/type-check.ts +100 -37
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +59 -60
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +96 -44
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +2 -8
- 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 +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +16 -15
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +32 -73
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +28 -15
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +18 -24
- 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 +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +29 -20
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +32 -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 +0 -2
- package/src/prover/prep/methods.ts +137 -83
- package/src/prover/prep/normalize.ts +38 -36
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +371 -132
- package/src/prover/ptl/decide.ts +104 -44
- 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 +61 -29
- package/src/prover/smt/data.ts +497 -387
- package/src/prover/smt/encode.ts +156 -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 +1025 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +63 -0
- package/src/prover/smt/solver/ackr-helper.ts +182 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +112 -0
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/add-bounds-tactic.ts +60 -0
- package/src/prover/smt/solver/aig-tactic.ts +43 -0
- package/src/prover/smt/solver/aig.ts +890 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -48
- package/src/prover/smt/solver/arith-terms.ts +123 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +176 -0
- package/src/prover/smt/solver/array-rewriter.ts +312 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -57
- package/src/prover/smt/solver/ast-lt.ts +166 -21
- package/src/prover/smt/solver/ast-util.ts +161 -7
- package/src/prover/smt/solver/ast.ts +1466 -178
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +591 -0
- package/src/prover/smt/solver/bit-blaster.ts +874 -0
- package/src/prover/smt/solver/bound-manager.ts +186 -0
- package/src/prover/smt/solver/bound-simplifier.ts +602 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +500 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +339 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +97 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1905 -0
- package/src/prover/smt/solver/bv1-blast.ts +224 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +175 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +545 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +534 -0
- package/src/prover/smt/solver/card2bv.ts +112 -0
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +28 -34
- package/src/prover/smt/solver/check-logic.ts +326 -0
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +280 -0
- package/src/prover/smt/solver/conflict-resolution.ts +79 -12
- package/src/prover/smt/solver/context.ts +510 -175
- package/src/prover/smt/solver/ctx-simplify.ts +34 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +124 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +575 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +83 -0
- package/src/prover/smt/solver/demodulator.ts +789 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +68 -0
- package/src/prover/smt/solver/der.ts +40 -30
- package/src/prover/smt/solver/diff-neq.ts +207 -0
- package/src/prover/smt/solver/distribute-forall.ts +67 -0
- package/src/prover/smt/solver/dom-simplify.ts +513 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +267 -0
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +130 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +558 -0
- package/src/prover/smt/solver/enode.ts +93 -22
- package/src/prover/smt/solver/eq2bv-tactic.ts +219 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +404 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +659 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +895 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +528 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +419 -0
- package/src/prover/smt/solver/euf/array-solver.ts +308 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +164 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +750 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +451 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +620 -0
- package/src/prover/smt/solver/euf/egraph.ts +885 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1203 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +333 -0
- package/src/prover/smt/solver/euf/mam.ts +1094 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +900 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +299 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +343 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +31 -0
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -6
- package/src/prover/smt/solver/expr2polynomial.ts +147 -0
- package/src/prover/smt/solver/factor.ts +152 -0
- package/src/prover/smt/solver/fd-solver.ts +269 -0
- package/src/prover/smt/solver/fingerprints.ts +16 -26
- package/src/prover/smt/solver/fix-dl-var.ts +149 -0
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/fm-tactic.ts +873 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +619 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +641 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2246 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +75 -0
- package/src/prover/smt/solver/goal.ts +177 -28
- package/src/prover/smt/solver/goal2nlsat.ts +191 -0
- package/src/prover/smt/solver/guard-set.ts +220 -0
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +27 -23
- package/src/prover/smt/solver/inf-eps.ts +64 -0
- package/src/prover/smt/solver/inj-axiom.ts +102 -0
- package/src/prover/smt/solver/internalizer.ts +72 -130
- package/src/prover/smt/solver/lackr.ts +383 -0
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/lia2card.ts +269 -0
- package/src/prover/smt/solver/lia2pb.ts +141 -0
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/logic-tactics.ts +349 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +24 -27
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +18 -39
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -82
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +79 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +69 -132
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +24 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +184 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +293 -0
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +30 -54
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +6 -5
- package/src/prover/smt/solver/macro-finder.ts +533 -0
- package/src/prover/smt/solver/mam-compiler.ts +117 -126
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +29 -0
- package/src/prover/smt/solver/max-cliques.ts +107 -0
- package/src/prover/smt/solver/maxcore.ts +318 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +9 -20
- package/src/prover/smt/solver/maxlex.ts +123 -0
- package/src/prover/smt/solver/maxsmt-base.ts +99 -0
- package/src/prover/smt/solver/maxsmt.ts +93 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +477 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +102 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +49 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +624 -0
- package/src/prover/smt/solver/model-based-opt.ts +845 -0
- package/src/prover/smt/solver/model-checker.ts +20 -62
- package/src/prover/smt/solver/model-evaluator.ts +186 -39
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +57 -40
- package/src/prover/smt/solver/model-macro-solver.ts +58 -111
- package/src/prover/smt/solver/model-printer.ts +215 -0
- package/src/prover/smt/solver/mpf.ts +712 -0
- package/src/prover/smt/solver/mus.ts +52 -0
- package/src/prover/smt/solver/muz/dl-context.ts +362 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +98 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +305 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +427 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +278 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +158 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +303 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +127 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +460 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +192 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +179 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1395 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +41 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +244 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +133 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +344 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +309 -0
- package/src/prover/smt/solver/muz/substitution.ts +154 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +286 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +179 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +61 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +10 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +48 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +30 -160
- package/src/prover/smt/solver/nlsat/solver.ts +227 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +311 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +369 -0
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nlsat-tactic.ts +83 -0
- package/src/prover/smt/solver/nnf.ts +108 -60
- package/src/prover/smt/solver/normalize-bounds.ts +54 -0
- package/src/prover/smt/solver/occf.ts +98 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +366 -0
- package/src/prover/smt/solver/opt-pareto.ts +284 -0
- package/src/prover/smt/solver/opt-preprocess.ts +102 -0
- package/src/prover/smt/solver/opt-solver.ts +300 -0
- package/src/prover/smt/solver/opt-value.ts +56 -0
- package/src/prover/smt/solver/optsmt.ts +691 -0
- package/src/prover/smt/solver/parallel-tactic.ts +301 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -23
- package/src/prover/smt/solver/pb-rewriter.ts +296 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +542 -0
- package/src/prover/smt/solver/poly-rewriter.ts +203 -77
- package/src/prover/smt/solver/probes.ts +514 -0
- package/src/prover/smt/solver/propagate-values.ts +34 -30
- package/src/prover/smt/solver/proto-model.ts +648 -63
- package/src/prover/smt/solver/pull-quant.ts +29 -23
- package/src/prover/smt/solver/purify-arith.ts +598 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1099 -0
- package/src/prover/smt/solver/qe-lite-der.ts +3 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +5 -28
- package/src/prover/smt/solver/qe-lite.ts +40 -49
- package/src/prover/smt/solver/qe-mbp.ts +281 -0
- package/src/prover/smt/solver/qe.ts +1508 -0
- package/src/prover/smt/solver/qel.ts +26 -0
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/qsat.ts +840 -0
- package/src/prover/smt/solver/quant-hoist.ts +195 -0
- package/src/prover/smt/solver/quant-tactics.ts +18 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +9 -23
- package/src/prover/smt/solver/quasi-macros.ts +254 -0
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +29 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +248 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +108 -0
- package/src/prover/smt/solver/reduce-args.ts +226 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +120 -0
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +3 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +49 -129
- package/src/prover/smt/solver/rewriter.ts +478 -120
- package/src/prover/smt/solver/rlimit.ts +27 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +314 -0
- package/src/prover/smt/solver/sat/big.ts +178 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +79 -0
- package/src/prover/smt/solver/sat/clause.ts +221 -0
- package/src/prover/smt/solver/sat/cleaner.ts +96 -0
- package/src/prover/smt/solver/sat/config.ts +125 -0
- package/src/prover/smt/solver/sat/consequences.ts +204 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +144 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +528 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +388 -0
- package/src/prover/smt/solver/sat/model-converter.ts +156 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +264 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1553 -0
- package/src/prover/smt/solver/sat/probing.ts +169 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +171 -0
- package/src/prover/smt/solver/sat/scc.ts +143 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1662 -0
- package/src/prover/smt/solver/sat/solver.ts +2128 -0
- package/src/prover/smt/solver/sat/var-queue.ts +119 -0
- package/src/prover/smt/solver/sat/watch-list.ts +136 -0
- package/src/prover/smt/solver/search-tree.ts +285 -0
- package/src/prover/smt/solver/seq-axioms.ts +1013 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +823 -0
- package/src/prover/smt/solver/seq-derive.ts +1303 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +238 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +440 -0
- package/src/prover/smt/solver/seq-factory.ts +91 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +225 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1296 -0
- package/src/prover/smt/solver/seq-re-util.ts +777 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +145 -0
- package/src/prover/smt/solver/seq-regex-live.ts +202 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +100 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2407 -0
- package/src/prover/smt/solver/seq-skolem.ts +318 -0
- package/src/prover/smt/solver/seq-subset.ts +166 -0
- package/src/prover/smt/solver/seq-view-witness.ts +355 -0
- package/src/prover/smt/solver/smt-consequences.ts +299 -0
- package/src/prover/smt/solver/smt-kernel.ts +85 -0
- package/src/prover/smt/solver/smt-logics.ts +67 -0
- package/src/prover/smt/solver/smt-setup.ts +492 -0
- package/src/prover/smt/solver/smt2-printer.ts +767 -0
- package/src/prover/smt/solver/smtlib-parser.ts +2423 -270
- package/src/prover/smt/solver/smtlib-script.ts +1493 -0
- package/src/prover/smt/solver/solve-eqs.ts +931 -0
- package/src/prover/smt/solver/solver.ts +120 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +319 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/tactic.ts +1936 -0
- package/src/prover/smt/solver/term-enumeration.ts +206 -0
- package/src/prover/smt/solver/theory-array.ts +1275 -0
- package/src/prover/smt/solver/theory-bv.ts +1239 -0
- package/src/prover/smt/solver/theory-char.ts +356 -0
- package/src/prover/smt/solver/theory-datatype.ts +599 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +422 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +56 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -10
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +87 -53
- package/src/prover/smt/solver/theory-lra-model.ts +24 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +25 -40
- package/src/prover/smt/solver/theory-lra-state.ts +7 -27
- package/src/prover/smt/solver/theory-lra.ts +194 -8
- package/src/prover/smt/solver/theory-pb.ts +932 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +59 -0
- package/src/prover/smt/solver/theory-recfun.ts +308 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +871 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1375 -0
- package/src/prover/smt/solver/theory-seq-state.ts +880 -0
- package/src/prover/smt/solver/theory-seq.ts +984 -0
- package/src/prover/smt/solver/theory.ts +175 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +487 -0
- package/src/prover/smt/solver/var-subst.ts +33 -35
- package/src/prover/smt/table.ts +1 -9
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 -15
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +20 -14
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +10 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +11 -33
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +88 -57
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- 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 +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/tlaps-module.ts +0 -510
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
// A port of tlapm's obligation generation (Proof.Gen and Module.Gen)
|
|
2
|
-
// whose context is everything the proof may use at that point.
|
|
1
|
+
// A port of tlapm's obligation generation (Proof.Gen and Module.Gen).
|
|
3
2
|
|
|
4
3
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
5
4
|
import { isEqualExpr } from "./equality";
|
|
6
5
|
import {
|
|
6
|
+
AT_NOWHERE,
|
|
7
7
|
at,
|
|
8
8
|
exprifySequent,
|
|
9
|
+
getDefinitionHyp,
|
|
9
10
|
getErrorNote,
|
|
10
11
|
getFact,
|
|
12
|
+
getLocalDefn,
|
|
13
|
+
getTrue,
|
|
11
14
|
isBuiltinApply,
|
|
12
15
|
mapAccumulate,
|
|
16
|
+
type Defn,
|
|
13
17
|
type Expr,
|
|
14
18
|
type Hyp,
|
|
15
19
|
type Locus,
|
|
@@ -33,14 +37,8 @@ import {
|
|
|
33
37
|
import { shiftExpr } from "./substitution";
|
|
34
38
|
import { getScopeTime } from "./temporal";
|
|
35
39
|
|
|
36
|
-
export const AT_NOWHERE: Expr = { kind: "At", isExcept: false };
|
|
37
|
-
|
|
38
40
|
const isAnonymous = (step: StepNumber | undefined) => step?.kind === "Named" && step.isAnonymous;
|
|
39
41
|
|
|
40
|
-
export const getTrue = (from: { location?: Locus }) =>
|
|
41
|
-
at({ kind: "Internal", builtin: "TRUE" }, from);
|
|
42
|
-
|
|
43
|
-
// Each visible fact of the sequent, shifted past the hypotheses after it.
|
|
44
42
|
const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
45
43
|
sequent.context.flatMap((hyp, index) =>
|
|
46
44
|
hyp.kind === "Fact" && hyp.visibility === "Visible"
|
|
@@ -48,20 +46,22 @@ const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
|
48
46
|
: [],
|
|
49
47
|
);
|
|
50
48
|
|
|
51
|
-
const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
49
|
+
export const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
52
50
|
if (!step.step) throw new TlapmBugError();
|
|
53
|
-
return
|
|
54
|
-
kind: "
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
};
|
|
51
|
+
return getDefinitionHyp(
|
|
52
|
+
{ kind: "Operator", name: getStepName(step.step), body, location: step.location },
|
|
53
|
+
{ kind: "Proof", time },
|
|
54
|
+
"Visible",
|
|
55
|
+
true,
|
|
56
|
+
step.location,
|
|
57
|
+
);
|
|
61
58
|
};
|
|
62
59
|
|
|
63
|
-
|
|
64
|
-
|
|
60
|
+
export const getDefineHyp = (definition: Defn): Hyp => ({
|
|
61
|
+
...getLocalDefn(definition),
|
|
62
|
+
location: definition.location,
|
|
63
|
+
});
|
|
64
|
+
|
|
65
65
|
export const proveAssertion = (context: Hyp[], sequent: Sequent, step: Step, time: Time) => {
|
|
66
66
|
const visibility: Visibility = isAnonymous(step.step) ? "Visible" : "Hidden";
|
|
67
67
|
const hyps = sequent.context.map((hyp): Hyp =>
|
|
@@ -101,18 +101,16 @@ export const useAssertion = (
|
|
|
101
101
|
};
|
|
102
102
|
};
|
|
103
103
|
|
|
104
|
-
// A cited step or definition keeps the scope it was proved in, and any other fact takes the
|
|
105
|
-
// current one.
|
|
106
104
|
const getFactTime = (context: Hyp[], fact: Expr, time: Time): Time => {
|
|
107
105
|
if (fact.kind !== "Ix") return time;
|
|
108
106
|
const hyp = context[context.length - fact.index];
|
|
109
107
|
if (hyp?.kind === "Fact") return hyp.time;
|
|
110
108
|
return hyp?.kind === "Defn" && typeof hyp.whereDefined === "object"
|
|
111
109
|
? hyp.whereDefined.time
|
|
112
|
-
:
|
|
110
|
+
: time;
|
|
113
111
|
};
|
|
114
112
|
|
|
115
|
-
const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
113
|
+
export const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
116
114
|
if (def.kind !== "Dx") throw new TlaProofError(`Unknown definition ${def.name}`);
|
|
117
115
|
const index = context.length - def.index;
|
|
118
116
|
const hyp = context[index];
|
|
@@ -127,7 +125,7 @@ const isDomainMatch = (fact: Expr, domain: Expr) =>
|
|
|
127
125
|
fact.args[0].index === 0 &&
|
|
128
126
|
isEqualExpr(domain, fact.args[1]);
|
|
129
127
|
|
|
130
|
-
const setExpression = (
|
|
128
|
+
export const setExpression = (
|
|
131
129
|
onWarning: Warn,
|
|
132
130
|
visibility: Visibility,
|
|
133
131
|
fact: Expr,
|
|
@@ -157,7 +155,6 @@ const setExpression = (
|
|
|
157
155
|
return result;
|
|
158
156
|
};
|
|
159
157
|
|
|
160
|
-
// The lines of tlapm's --toolbox and --line options, which select the proofs to generate.
|
|
161
158
|
export interface LineRange {
|
|
162
159
|
start: number;
|
|
163
160
|
end: number;
|
|
@@ -165,9 +162,15 @@ export interface LineRange {
|
|
|
165
162
|
|
|
166
163
|
const obligate = (
|
|
167
164
|
sequent: Sequent,
|
|
168
|
-
from: { location?: Locus; method?: OldMethod },
|
|
165
|
+
from: { location?: Locus; method?: OldMethod; isEnabledAxiomsSound?: boolean },
|
|
169
166
|
kind: ObligationKind,
|
|
170
|
-
): Obligation => ({
|
|
167
|
+
): Obligation => ({
|
|
168
|
+
sequent,
|
|
169
|
+
location: from.location,
|
|
170
|
+
kind,
|
|
171
|
+
method: from.method,
|
|
172
|
+
isEnabledAxiomsSound: from.isEnabledAxiomsSound,
|
|
173
|
+
});
|
|
171
174
|
|
|
172
175
|
interface ProofSummary {
|
|
173
176
|
total: number;
|
|
@@ -211,6 +214,12 @@ export interface ModuleSummary extends ProofSummary {
|
|
|
211
214
|
theorems: TheoremSummary[];
|
|
212
215
|
}
|
|
213
216
|
|
|
217
|
+
interface GeneratedStep {
|
|
218
|
+
sequent: Sequent;
|
|
219
|
+
step: Step;
|
|
220
|
+
time: Time;
|
|
221
|
+
}
|
|
222
|
+
|
|
214
223
|
export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWarning: Warn) => {
|
|
215
224
|
const generate = (sequent: Sequent, proof: Proof, time: Time): Proof => {
|
|
216
225
|
const location = proof.location;
|
|
@@ -238,8 +247,8 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
238
247
|
throw new TlaProofError("Proof.Gen.generate");
|
|
239
248
|
case "Steps": {
|
|
240
249
|
const [inner, steps] = mapAccumulate({ sequent, time }, proof.steps, (state, step) => {
|
|
241
|
-
const
|
|
242
|
-
return [
|
|
250
|
+
const next = generateStep(state.sequent, step, state.time);
|
|
251
|
+
return [next, next.step];
|
|
243
252
|
});
|
|
244
253
|
const qedProof = generate(inner.sequent, proof.qed.proof, inner.time);
|
|
245
254
|
return { ...proof, steps, qed: { ...proof.qed, proof: qedProof } };
|
|
@@ -247,7 +256,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
247
256
|
}
|
|
248
257
|
};
|
|
249
258
|
|
|
250
|
-
const generateStep = (sequent: Sequent, step: Step, time: Time):
|
|
259
|
+
const generateStep = (sequent: Sequent, step: Step, time: Time): GeneratedStep => {
|
|
251
260
|
switch (step.kind) {
|
|
252
261
|
case "Forget": {
|
|
253
262
|
const count = sequent.context.length;
|
|
@@ -256,15 +265,15 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
256
265
|
? { ...hyp, visibility: "Hidden" }
|
|
257
266
|
: hyp,
|
|
258
267
|
);
|
|
259
|
-
return
|
|
268
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
260
269
|
}
|
|
261
270
|
case "Use": {
|
|
262
271
|
const usable = step.usable;
|
|
263
272
|
if (usable.defs.length === 0 && usable.facts.length === 1) {
|
|
264
273
|
const fact = usable.facts[0];
|
|
265
274
|
const obligation = obligate({ ...sequent, active: fact }, step, { kind: "Support" });
|
|
266
|
-
return
|
|
267
|
-
{
|
|
275
|
+
return {
|
|
276
|
+
sequent: {
|
|
268
277
|
context: [
|
|
269
278
|
...sequent.context,
|
|
270
279
|
{
|
|
@@ -279,9 +288,9 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
279
288
|
],
|
|
280
289
|
active: shiftExpr(1, sequent.active),
|
|
281
290
|
},
|
|
282
|
-
{ ...step, obligations: [obligation] },
|
|
291
|
+
step: { ...step, obligations: [obligation] },
|
|
283
292
|
time,
|
|
284
|
-
|
|
293
|
+
};
|
|
285
294
|
}
|
|
286
295
|
if (usable.facts.length > 0)
|
|
287
296
|
throw new TlaProofError("Proof.Gen.gen_step: USE with facts and definitions");
|
|
@@ -289,7 +298,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
289
298
|
(current, def) => setDefinition("Visible", current, def),
|
|
290
299
|
sequent.context,
|
|
291
300
|
);
|
|
292
|
-
return
|
|
301
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
293
302
|
}
|
|
294
303
|
case "Hide": {
|
|
295
304
|
const hidden = step.usable.defs.reduce(
|
|
@@ -300,36 +309,33 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
300
309
|
(current, fact) => setExpression(onWarning, "Hidden", fact, current),
|
|
301
310
|
hidden,
|
|
302
311
|
);
|
|
303
|
-
return
|
|
312
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
304
313
|
}
|
|
305
314
|
case "Define":
|
|
306
|
-
return
|
|
307
|
-
{
|
|
308
|
-
context: [
|
|
309
|
-
...sequent.context,
|
|
310
|
-
...step.definitions.map((definition): Hyp => ({
|
|
311
|
-
kind: "Defn",
|
|
312
|
-
definition,
|
|
313
|
-
whereDefined: "User",
|
|
314
|
-
visibility: "Visible",
|
|
315
|
-
isLocal: true,
|
|
316
|
-
location: definition.location,
|
|
317
|
-
})),
|
|
318
|
-
],
|
|
315
|
+
return {
|
|
316
|
+
sequent: {
|
|
317
|
+
context: [...sequent.context, ...step.definitions.map(getDefineHyp)],
|
|
319
318
|
active: shiftExpr(step.definitions.length, sequent.active),
|
|
320
319
|
},
|
|
321
320
|
step,
|
|
322
321
|
time,
|
|
323
|
-
|
|
322
|
+
};
|
|
324
323
|
case "Assert": {
|
|
325
324
|
const inner = proveAssertion(sequent.context, step.sequent, step, time);
|
|
326
325
|
const proof = generate(inner, step.proof, inner.time);
|
|
327
326
|
const generated: Step = { ...step, proof };
|
|
328
|
-
return
|
|
329
|
-
useAssertion(
|
|
330
|
-
|
|
327
|
+
return {
|
|
328
|
+
sequent: useAssertion(
|
|
329
|
+
false,
|
|
330
|
+
sequent.context,
|
|
331
|
+
sequent.active,
|
|
332
|
+
step.sequent,
|
|
333
|
+
generated,
|
|
334
|
+
time,
|
|
335
|
+
),
|
|
336
|
+
step: generated,
|
|
331
337
|
time,
|
|
332
|
-
|
|
338
|
+
};
|
|
333
339
|
}
|
|
334
340
|
case "Suffices": {
|
|
335
341
|
const proof = generate(
|
|
@@ -339,7 +345,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
339
345
|
);
|
|
340
346
|
const generated: Step = { ...step, proof };
|
|
341
347
|
const next = proveAssertion(sequent.context, step.sequent, generated, time);
|
|
342
|
-
return
|
|
348
|
+
return { sequent: next, step: generated, time: next.time };
|
|
343
349
|
}
|
|
344
350
|
default:
|
|
345
351
|
throw new TlaProofError("Proof.Gen.gen_step");
|
|
@@ -353,17 +359,16 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
353
359
|
location: Locus | undefined,
|
|
354
360
|
): [Hyp[], Obligation[]] => {
|
|
355
361
|
const step: StepNumber = { kind: "Unnamed", level: 0, id: 0 };
|
|
356
|
-
const
|
|
362
|
+
const generated = generateStep(
|
|
357
363
|
{ context, active: { ...AT_NOWHERE, location } },
|
|
358
364
|
mode === "Use"
|
|
359
365
|
? { kind: "Use", usable, isOnly: false, location, step, useLocation: location }
|
|
360
366
|
: { kind: "Hide", usable, location, step },
|
|
361
367
|
"Always",
|
|
362
368
|
);
|
|
363
|
-
return [sequent.context, generated.obligations ?? []];
|
|
369
|
+
return [generated.sequent.context, generated.step.obligations ?? []];
|
|
364
370
|
};
|
|
365
371
|
|
|
366
|
-
// The definitions go first, then each fact on its own, shifting the facts after it.
|
|
367
372
|
const mutate = (
|
|
368
373
|
context: Hyp[],
|
|
369
374
|
mode: "Use" | "Hide",
|
|
@@ -384,7 +389,6 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
384
389
|
return [last, [...first, ...others]];
|
|
385
390
|
};
|
|
386
391
|
|
|
387
|
-
// collect: a QED's obligations come before its sibling steps', and a step's own before its proof's.
|
|
388
392
|
const collect = (proof: Proof): Obligation[] => {
|
|
389
393
|
const obligations: Obligation[] = [];
|
|
390
394
|
const visitProof = (item: Proof) => {
|
|
@@ -393,17 +397,17 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
393
397
|
item.steps.forEach(visitStep);
|
|
394
398
|
return;
|
|
395
399
|
}
|
|
396
|
-
if (item.obligations) obligations.push(...item.obligations);
|
|
400
|
+
if (item.obligations && !item.isSuppressed) obligations.push(...item.obligations);
|
|
397
401
|
};
|
|
398
402
|
const visitStep = (step: Step) => {
|
|
399
|
-
if (step.kind === "Use" && step.obligations
|
|
403
|
+
if (step.kind === "Use" && step.obligations && !step.isSuppressed)
|
|
404
|
+
obligations.push(...step.obligations);
|
|
400
405
|
if ("proof" in step) visitProof(step.proof);
|
|
401
406
|
};
|
|
402
407
|
visitProof(proof);
|
|
403
408
|
return obligations;
|
|
404
409
|
};
|
|
405
410
|
|
|
406
|
-
// Module.Gen.generate.
|
|
407
411
|
const generateModule = (
|
|
408
412
|
context: Hyp[],
|
|
409
413
|
module: Mule,
|
package/src/obligations/index.ts
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
// Generates the proof obligations tlapm prints for a module, in tlapm's order and layout.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError, TlaSyntaxError, type SyntaxFailure } from "../errors";
|
|
4
2
|
import { createAnonymizer } from "./anonymize";
|
|
5
3
|
import {
|
|
6
4
|
getAtPrefix,
|
|
7
|
-
|
|
5
|
+
getErrorSetting,
|
|
8
6
|
getLocusPosition,
|
|
9
7
|
getLocusPrefix,
|
|
8
|
+
warnError,
|
|
10
9
|
type Locus,
|
|
11
10
|
type Warn,
|
|
12
11
|
type Sequent,
|
|
@@ -19,11 +18,11 @@ import {
|
|
|
19
18
|
} from "./generate";
|
|
20
19
|
import { compareNames, flatten, getDependencies, STANDARD_MODULES, type Mule } from "./module";
|
|
21
20
|
import { expandInstance, normalize, type Pipeline } from "./normalize";
|
|
22
|
-
import { formatObligation } from "./printer";
|
|
21
|
+
import { formatObligation, type PrinterOptions } from "./printer";
|
|
23
22
|
import type { Counter, ObligationKind } from "./proof";
|
|
24
23
|
import type { OldMethod } from "./pragma";
|
|
25
24
|
import { createSimplifier } from "./simplify";
|
|
26
|
-
import {
|
|
25
|
+
import { createModuleConverter } from "./source";
|
|
27
26
|
import { tokenize } from "../lexer";
|
|
28
27
|
import { parseTlapmModule } from "../parser";
|
|
29
28
|
import type { Module } from "../ast";
|
|
@@ -41,6 +40,7 @@ export interface PrintedObligation {
|
|
|
41
40
|
kind: ObligationKind;
|
|
42
41
|
sequent: Sequent;
|
|
43
42
|
method?: OldMethod;
|
|
43
|
+
isEnabledAxiomsSound?: boolean;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
export interface ModuleObligations {
|
|
@@ -55,6 +55,7 @@ export const WHOLE_MODULE: LineRange = { start: 0, end: Infinity };
|
|
|
55
55
|
interface ObligationOptions {
|
|
56
56
|
lines?: LineRange;
|
|
57
57
|
onWarning?: Warn;
|
|
58
|
+
printing?: PrinterOptions;
|
|
58
59
|
}
|
|
59
60
|
|
|
60
61
|
const MODULE_HEADER = /-{4,} *MODULE/;
|
|
@@ -65,7 +66,7 @@ const formatLocus = (locus: Locus | undefined) =>
|
|
|
65
66
|
locus ? `${locus.startLine}:${locus.startColumn}:${locus.endLine}:${locus.endColumn}` : "";
|
|
66
67
|
|
|
67
68
|
const findTab = (source: string) => {
|
|
68
|
-
const tokens = tokenize(source);
|
|
69
|
+
const tokens = tokenize(source, true);
|
|
69
70
|
const lines = source.split("\n");
|
|
70
71
|
const endLine = tokens.at(-1)?.line ?? lines.length;
|
|
71
72
|
const moduleEnd =
|
|
@@ -120,7 +121,6 @@ const parseSource = (source: string): Module | SyntaxFailure[] => {
|
|
|
120
121
|
return isSyntaxFailure(parsed) ? [parsed] : parsed;
|
|
121
122
|
};
|
|
122
123
|
|
|
123
|
-
// Module.Save.parse_file warns when a module's name differs from its file's, then renames it.
|
|
124
124
|
const loadMule = (
|
|
125
125
|
input: ObligationSource,
|
|
126
126
|
counter: Counter,
|
|
@@ -130,17 +130,41 @@ const loadMule = (
|
|
|
130
130
|
): Mule => {
|
|
131
131
|
if (!MODULE_HEADER.test(input.source)) throw new TlaProofError("No tokens in file");
|
|
132
132
|
const parsed = parseSource(input.source);
|
|
133
|
+
const proofFailure = Array.isArray(parsed) ? parsed[0].proof : undefined;
|
|
134
|
+
if (Array.isArray(parsed) && proofFailure) {
|
|
135
|
+
const locus = {
|
|
136
|
+
file: input.file,
|
|
137
|
+
startLine: parsed[0].line,
|
|
138
|
+
startColumn: parsed[0].column,
|
|
139
|
+
endLine: proofFailure.stop.line,
|
|
140
|
+
endColumn: proofFailure.stop.column,
|
|
141
|
+
};
|
|
142
|
+
warnError(onWarning, locus, parsed[0].reason);
|
|
143
|
+
throw new TlaProofError(parsed[0].reason, { failure: proofFailure.exception });
|
|
144
|
+
}
|
|
133
145
|
if (Array.isArray(parsed)) {
|
|
134
146
|
parsed.forEach((failure) => {
|
|
135
147
|
const text = `File ${JSON.stringify(input.file)}, line ${failure.line}, character ${failure.column}\n${failure.reason}`;
|
|
136
148
|
onWarning({ text, channel: "stderr" });
|
|
137
149
|
onWarning({ text: `${text}\n`, channel: "toolboxOnly" });
|
|
150
|
+
onWarning(
|
|
151
|
+
getErrorSetting(
|
|
152
|
+
{
|
|
153
|
+
file: input.file,
|
|
154
|
+
startLine: failure.line,
|
|
155
|
+
startColumn: failure.column,
|
|
156
|
+
endLine: failure.line,
|
|
157
|
+
endColumn: failure.column + 1,
|
|
158
|
+
},
|
|
159
|
+
`${failure.reason}\n`,
|
|
160
|
+
),
|
|
161
|
+
);
|
|
138
162
|
});
|
|
139
163
|
const message = `Could not parse ${JSON.stringify(input.file)} successfully.`;
|
|
140
164
|
onWarning({ text: `${errorPrefix}Error: ${message}`, channel: "stderr" });
|
|
141
165
|
throw new TlaProofError(message, { failure: "Module.Parser.parse_file" });
|
|
142
166
|
}
|
|
143
|
-
const mule =
|
|
167
|
+
const mule = createModuleConverter(input.file, input.source, counter, isMain)(parsed);
|
|
144
168
|
const fileName = input.file.slice(input.file.lastIndexOf("/") + 1);
|
|
145
169
|
const name = fileName.replace(/\.tla$/, "");
|
|
146
170
|
if (mule.name === name) return mule;
|
|
@@ -151,7 +175,6 @@ const loadMule = (
|
|
|
151
175
|
return { ...mule, name };
|
|
152
176
|
};
|
|
153
177
|
|
|
154
|
-
// Module.Dep.schedule: dependencies first, visiting modules and their dependencies by name.
|
|
155
178
|
const schedule = (modules: Map<string, Mule>) => {
|
|
156
179
|
const dependencies = new Map(
|
|
157
180
|
[...modules].map(([name, module]) => [name, getDependencies(module).dependencies]),
|
|
@@ -220,8 +243,6 @@ export const formatSummary = (result: ModuleObligations) => {
|
|
|
220
243
|
].join("\n");
|
|
221
244
|
};
|
|
222
245
|
|
|
223
|
-
// Each main module is one file given to tlapm. They load into one context and report in schedule
|
|
224
|
-
// order, each numbering its obligations from 1.
|
|
225
246
|
export const getObligations = (
|
|
226
247
|
mains: ObligationSource[],
|
|
227
248
|
loadModule: (name: string) => ObligationSource | undefined,
|
|
@@ -238,9 +259,7 @@ export const getObligations = (
|
|
|
238
259
|
};
|
|
239
260
|
modules.set(module.name, module);
|
|
240
261
|
});
|
|
241
|
-
// Module.Save.complete_load: breadth first from every known module, by name.
|
|
242
262
|
const queue = [...modules.values()].sort((left, right) => compareNames(left.name, right.name));
|
|
243
|
-
// A missing module is fine only if some loaded module declares it as a submodule.
|
|
244
263
|
const requested = new Map<string, Locus | undefined>();
|
|
245
264
|
const found = new Set<string>();
|
|
246
265
|
for (let index = 0; index < queue.length; index++) {
|
|
@@ -249,7 +268,6 @@ export const getObligations = (
|
|
|
249
268
|
found.add(name);
|
|
250
269
|
if (!modules.has(name)) modules.set(name, submodule);
|
|
251
270
|
});
|
|
252
|
-
// A file named like a standard module replaces it, and is read again for each module citing it.
|
|
253
271
|
for (const name of result.dependencies) {
|
|
254
272
|
if (modules.has(name) && !STANDARD_MODULES.has(name)) continue;
|
|
255
273
|
const input = loadModule(name);
|
|
@@ -270,9 +288,10 @@ export const getObligations = (
|
|
|
270
288
|
}
|
|
271
289
|
}
|
|
272
290
|
const missing = [...requested.keys()].filter((name) => !found.has(name)).sort(compareNames);
|
|
273
|
-
missing.forEach((name) =>
|
|
274
|
-
|
|
275
|
-
|
|
291
|
+
missing.forEach((name) => {
|
|
292
|
+
const message = `Unknown module ${JSON.stringify(name)}`;
|
|
293
|
+
warnError(onWarning, requested.get(name), message);
|
|
294
|
+
});
|
|
276
295
|
if (missing.length > 0)
|
|
277
296
|
throw new TlaProofError(`Unknown module ${JSON.stringify(missing[0])}`, {
|
|
278
297
|
failure: "Module.Parser.load_module",
|
|
@@ -292,14 +311,12 @@ export const getObligations = (
|
|
|
292
311
|
module.isStandard ? module : flatten(modules, module, new Set()),
|
|
293
312
|
);
|
|
294
313
|
const generateModule = createGenerator(new Set(mains.map((main) => main.file)), lines, onWarning);
|
|
295
|
-
// Instances see each module as flattened, and as normalized once its turn has come.
|
|
296
314
|
const normalized = new Map(order.map((module) => [module.name, module]));
|
|
297
315
|
return order.flatMap((module): ModuleObligations[] => {
|
|
298
316
|
if (module.isStandard) return [];
|
|
299
317
|
const result = normalize(pipeline, normalized, undefined, module);
|
|
300
318
|
if (!module.isImportant) return [];
|
|
301
319
|
const generated = generateModule([], result);
|
|
302
|
-
// tlapm numbers the obligations, then drops the omitted ones and those outside the lines.
|
|
303
320
|
const obligations = generated.obligations.flatMap((obligation, index): PrintedObligation[] => {
|
|
304
321
|
const location = obligation.location;
|
|
305
322
|
if (
|
|
@@ -310,7 +327,7 @@ export const getObligations = (
|
|
|
310
327
|
const text =
|
|
311
328
|
obligation.kind.kind === "Error"
|
|
312
329
|
? obligation.kind.message
|
|
313
|
-
: `${formatObligation(obligation.sequent)}\n`;
|
|
330
|
+
: `${formatObligation(obligation.sequent, options.printing)}\n`;
|
|
314
331
|
return [
|
|
315
332
|
{
|
|
316
333
|
id: index + 1,
|
|
@@ -320,6 +337,7 @@ export const getObligations = (
|
|
|
320
337
|
kind: obligation.kind,
|
|
321
338
|
sequent: obligation.sequent,
|
|
322
339
|
method: obligation.method,
|
|
340
|
+
isEnabledAxiomsSound: obligation.isEnabledAxiomsSound,
|
|
323
341
|
},
|
|
324
342
|
];
|
|
325
343
|
});
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// the weights of an operator's arguments, and the declared names the level depends on.
|
|
1
|
+
// A port of tlapm's Expr.Levels.
|
|
3
2
|
|
|
4
3
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
4
|
import {
|
|
@@ -16,6 +15,7 @@ import {
|
|
|
16
15
|
type Bound,
|
|
17
16
|
type Builtin,
|
|
18
17
|
type Expr,
|
|
18
|
+
type Hyp,
|
|
19
19
|
type Level,
|
|
20
20
|
type Scope,
|
|
21
21
|
} from "./expression";
|
|
@@ -114,15 +114,14 @@ export const LEVEL_NUMBERS: Record<Level, number> = {
|
|
|
114
114
|
Unknown: 0,
|
|
115
115
|
};
|
|
116
116
|
|
|
117
|
-
const
|
|
117
|
+
const getUnion = (sets: Set<string>[]) => new Set(sets.flatMap((set) => [...set]));
|
|
118
118
|
|
|
119
119
|
const combineLevels = (infos: LevelInfo[]): LevelInfo => ({
|
|
120
120
|
level: Math.max(0, ...infos.map((info) => info.level)),
|
|
121
121
|
weights: [],
|
|
122
|
-
params:
|
|
122
|
+
params: getUnion(infos.map((info) => info.params)),
|
|
123
123
|
});
|
|
124
124
|
|
|
125
|
-
// The level of each hypothesis depends only on the scope before it.
|
|
126
125
|
const hypLevels = new WeakMap<Scope, LevelInfo>();
|
|
127
126
|
|
|
128
127
|
const computeHypLevel = (scope: Scope): LevelInfo => {
|
|
@@ -162,18 +161,29 @@ const getBoundsLevel = (scope: Scope | undefined, bounds: Bound[], body: Expr) =
|
|
|
162
161
|
]);
|
|
163
162
|
};
|
|
164
163
|
|
|
165
|
-
const applyOperator = (operator: LevelInfo, args: LevelInfo[]): LevelInfo => {
|
|
164
|
+
const applyOperator = (operator: LevelInfo, args: LevelInfo[], from: Expr): LevelInfo => {
|
|
166
165
|
if (operator.weights.length !== args.length) {
|
|
167
|
-
throw new TlaProofError("Invalid number of arguments"
|
|
166
|
+
throw new TlaProofError("Invalid number of arguments", {
|
|
167
|
+
failure: "Expr.Levels: ARITY",
|
|
168
|
+
locus: from.location,
|
|
169
|
+
});
|
|
168
170
|
}
|
|
169
171
|
const weighted = args.filter((_arg, index) => operator.weights[index]);
|
|
170
172
|
return {
|
|
171
173
|
level: Math.max(operator.level, ...weighted.map((arg) => arg.level)),
|
|
172
174
|
weights: [],
|
|
173
|
-
params:
|
|
175
|
+
params: getUnion([operator.params, ...weighted.map((arg) => arg.params)]),
|
|
174
176
|
};
|
|
175
177
|
};
|
|
176
178
|
|
|
179
|
+
export const getContextLevel = (scope: Scope | undefined, hyps: Hyp[]) => {
|
|
180
|
+
const [inner, levels] = mapAccumulate(scope, hyps, (current, hyp) => {
|
|
181
|
+
const next = adjoin(current, hyp);
|
|
182
|
+
return [next, getHypLevel(next).level];
|
|
183
|
+
});
|
|
184
|
+
return { scope: inner, level: Math.max(0, ...levels) };
|
|
185
|
+
};
|
|
186
|
+
|
|
177
187
|
export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelInfo => {
|
|
178
188
|
const recurse = (inner: Expr) => getLevelInfo(scope, inner);
|
|
179
189
|
switch (expression.kind) {
|
|
@@ -205,13 +215,15 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
205
215
|
}
|
|
206
216
|
case "Apply": {
|
|
207
217
|
const operator = expression.operator;
|
|
208
|
-
// The action frontend commutes a prime onto an operator, and tlapm keeps the level that
|
|
209
|
-
// the application had.
|
|
210
218
|
if (isBuiltinApply(operator, "Prime") && operator.args.length === 1) {
|
|
211
219
|
return recurse({ ...expression, operator: operator.args[0] });
|
|
212
220
|
}
|
|
213
221
|
if (operator.kind === "Opaque") {
|
|
214
|
-
return applyOperator(
|
|
222
|
+
return applyOperator(
|
|
223
|
+
getInfo(0, expression.args.length),
|
|
224
|
+
expression.args.map(recurse),
|
|
225
|
+
expression,
|
|
226
|
+
);
|
|
215
227
|
}
|
|
216
228
|
if (operator.kind === "Internal" && expression.args.length === 1) {
|
|
217
229
|
const arg = expression.args[0];
|
|
@@ -240,14 +252,13 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
240
252
|
expression.args.forEach(recurse);
|
|
241
253
|
return getInfo(3, 2);
|
|
242
254
|
}
|
|
243
|
-
return applyOperator(recurse(operator), expression.args.map(recurse));
|
|
255
|
+
return applyOperator(recurse(operator), expression.args.map(recurse), expression);
|
|
244
256
|
}
|
|
245
257
|
case "Sequent": {
|
|
246
|
-
const
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
return getInfo(Math.max(0, ...levels, getLevelInfo(inner, expression.sequent.active).level));
|
|
258
|
+
const context = getContextLevel(scope, expression.sequent.context);
|
|
259
|
+
return getInfo(
|
|
260
|
+
Math.max(context.level, getLevelInfo(context.scope, expression.sequent.active).level),
|
|
261
|
+
);
|
|
251
262
|
}
|
|
252
263
|
case "With":
|
|
253
264
|
case "Dot":
|