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,15 +1,17 @@
|
|
|
1
|
-
// A port of tlapm's obligation generation (Proof.Gen and Module.Gen): leaf proofs become obligations
|
|
2
|
-
// whose context is everything the proof may use at that point.
|
|
3
|
-
|
|
4
1
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
5
2
|
import { isEqualExpr } from "./equality";
|
|
6
3
|
import {
|
|
4
|
+
AT_NOWHERE,
|
|
7
5
|
at,
|
|
8
6
|
exprifySequent,
|
|
7
|
+
getDefinitionHyp,
|
|
9
8
|
getErrorNote,
|
|
10
9
|
getFact,
|
|
10
|
+
getLocalDefn,
|
|
11
|
+
getTrue,
|
|
11
12
|
isBuiltinApply,
|
|
12
13
|
mapAccumulate,
|
|
14
|
+
type Defn,
|
|
13
15
|
type Expr,
|
|
14
16
|
type Hyp,
|
|
15
17
|
type Locus,
|
|
@@ -33,14 +35,8 @@ import {
|
|
|
33
35
|
import { shiftExpr } from "./substitution";
|
|
34
36
|
import { getScopeTime } from "./temporal";
|
|
35
37
|
|
|
36
|
-
export const AT_NOWHERE: Expr = { kind: "At", isExcept: false };
|
|
37
|
-
|
|
38
38
|
const isAnonymous = (step: StepNumber | undefined) => step?.kind === "Named" && step.isAnonymous;
|
|
39
39
|
|
|
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
40
|
const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
45
41
|
sequent.context.flatMap((hyp, index) =>
|
|
46
42
|
hyp.kind === "Fact" && hyp.visibility === "Visible"
|
|
@@ -48,20 +44,22 @@ const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
|
48
44
|
: [],
|
|
49
45
|
);
|
|
50
46
|
|
|
51
|
-
const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
47
|
+
export const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
52
48
|
if (!step.step) throw new TlapmBugError();
|
|
53
|
-
return
|
|
54
|
-
kind: "
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
};
|
|
49
|
+
return getDefinitionHyp(
|
|
50
|
+
{ kind: "Operator", name: getStepName(step.step), body, location: step.location },
|
|
51
|
+
{ kind: "Proof", time },
|
|
52
|
+
"Visible",
|
|
53
|
+
true,
|
|
54
|
+
step.location,
|
|
55
|
+
);
|
|
61
56
|
};
|
|
62
57
|
|
|
63
|
-
|
|
64
|
-
|
|
58
|
+
export const getDefineHyp = (definition: Defn): Hyp => ({
|
|
59
|
+
...getLocalDefn(definition),
|
|
60
|
+
location: definition.location,
|
|
61
|
+
});
|
|
62
|
+
|
|
65
63
|
export const proveAssertion = (context: Hyp[], sequent: Sequent, step: Step, time: Time) => {
|
|
66
64
|
const visibility: Visibility = isAnonymous(step.step) ? "Visible" : "Hidden";
|
|
67
65
|
const hyps = sequent.context.map((hyp): Hyp =>
|
|
@@ -101,18 +99,16 @@ export const useAssertion = (
|
|
|
101
99
|
};
|
|
102
100
|
};
|
|
103
101
|
|
|
104
|
-
// A cited step or definition keeps the scope it was proved in, and any other fact takes the
|
|
105
|
-
// current one.
|
|
106
102
|
const getFactTime = (context: Hyp[], fact: Expr, time: Time): Time => {
|
|
107
103
|
if (fact.kind !== "Ix") return time;
|
|
108
104
|
const hyp = context[context.length - fact.index];
|
|
109
105
|
if (hyp?.kind === "Fact") return hyp.time;
|
|
110
106
|
return hyp?.kind === "Defn" && typeof hyp.whereDefined === "object"
|
|
111
107
|
? hyp.whereDefined.time
|
|
112
|
-
:
|
|
108
|
+
: time;
|
|
113
109
|
};
|
|
114
110
|
|
|
115
|
-
const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
111
|
+
export const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
116
112
|
if (def.kind !== "Dx") throw new TlaProofError(`Unknown definition ${def.name}`);
|
|
117
113
|
const index = context.length - def.index;
|
|
118
114
|
const hyp = context[index];
|
|
@@ -127,7 +123,7 @@ const isDomainMatch = (fact: Expr, domain: Expr) =>
|
|
|
127
123
|
fact.args[0].index === 0 &&
|
|
128
124
|
isEqualExpr(domain, fact.args[1]);
|
|
129
125
|
|
|
130
|
-
const setExpression = (
|
|
126
|
+
export const setExpression = (
|
|
131
127
|
onWarning: Warn,
|
|
132
128
|
visibility: Visibility,
|
|
133
129
|
fact: Expr,
|
|
@@ -157,7 +153,6 @@ const setExpression = (
|
|
|
157
153
|
return result;
|
|
158
154
|
};
|
|
159
155
|
|
|
160
|
-
// The lines of tlapm's --toolbox and --line options, which select the proofs to generate.
|
|
161
156
|
export interface LineRange {
|
|
162
157
|
start: number;
|
|
163
158
|
end: number;
|
|
@@ -165,9 +160,15 @@ export interface LineRange {
|
|
|
165
160
|
|
|
166
161
|
const obligate = (
|
|
167
162
|
sequent: Sequent,
|
|
168
|
-
from: { location?: Locus; method?: OldMethod },
|
|
163
|
+
from: { location?: Locus; method?: OldMethod; isEnabledAxiomsSound?: boolean },
|
|
169
164
|
kind: ObligationKind,
|
|
170
|
-
): Obligation => ({
|
|
165
|
+
): Obligation => ({
|
|
166
|
+
sequent,
|
|
167
|
+
location: from.location,
|
|
168
|
+
kind,
|
|
169
|
+
method: from.method,
|
|
170
|
+
isEnabledAxiomsSound: from.isEnabledAxiomsSound,
|
|
171
|
+
});
|
|
171
172
|
|
|
172
173
|
interface ProofSummary {
|
|
173
174
|
total: number;
|
|
@@ -211,6 +212,12 @@ export interface ModuleSummary extends ProofSummary {
|
|
|
211
212
|
theorems: TheoremSummary[];
|
|
212
213
|
}
|
|
213
214
|
|
|
215
|
+
interface GeneratedStep {
|
|
216
|
+
sequent: Sequent;
|
|
217
|
+
step: Step;
|
|
218
|
+
time: Time;
|
|
219
|
+
}
|
|
220
|
+
|
|
214
221
|
export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWarning: Warn) => {
|
|
215
222
|
const generate = (sequent: Sequent, proof: Proof, time: Time): Proof => {
|
|
216
223
|
const location = proof.location;
|
|
@@ -238,8 +245,8 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
238
245
|
throw new TlaProofError("Proof.Gen.generate");
|
|
239
246
|
case "Steps": {
|
|
240
247
|
const [inner, steps] = mapAccumulate({ sequent, time }, proof.steps, (state, step) => {
|
|
241
|
-
const
|
|
242
|
-
return [
|
|
248
|
+
const next = generateStep(state.sequent, step, state.time);
|
|
249
|
+
return [next, next.step];
|
|
243
250
|
});
|
|
244
251
|
const qedProof = generate(inner.sequent, proof.qed.proof, inner.time);
|
|
245
252
|
return { ...proof, steps, qed: { ...proof.qed, proof: qedProof } };
|
|
@@ -247,7 +254,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
247
254
|
}
|
|
248
255
|
};
|
|
249
256
|
|
|
250
|
-
const generateStep = (sequent: Sequent, step: Step, time: Time):
|
|
257
|
+
const generateStep = (sequent: Sequent, step: Step, time: Time): GeneratedStep => {
|
|
251
258
|
switch (step.kind) {
|
|
252
259
|
case "Forget": {
|
|
253
260
|
const count = sequent.context.length;
|
|
@@ -256,15 +263,15 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
256
263
|
? { ...hyp, visibility: "Hidden" }
|
|
257
264
|
: hyp,
|
|
258
265
|
);
|
|
259
|
-
return
|
|
266
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
260
267
|
}
|
|
261
268
|
case "Use": {
|
|
262
269
|
const usable = step.usable;
|
|
263
270
|
if (usable.defs.length === 0 && usable.facts.length === 1) {
|
|
264
271
|
const fact = usable.facts[0];
|
|
265
272
|
const obligation = obligate({ ...sequent, active: fact }, step, { kind: "Support" });
|
|
266
|
-
return
|
|
267
|
-
{
|
|
273
|
+
return {
|
|
274
|
+
sequent: {
|
|
268
275
|
context: [
|
|
269
276
|
...sequent.context,
|
|
270
277
|
{
|
|
@@ -279,9 +286,9 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
279
286
|
],
|
|
280
287
|
active: shiftExpr(1, sequent.active),
|
|
281
288
|
},
|
|
282
|
-
{ ...step, obligations: [obligation] },
|
|
289
|
+
step: { ...step, obligations: [obligation] },
|
|
283
290
|
time,
|
|
284
|
-
|
|
291
|
+
};
|
|
285
292
|
}
|
|
286
293
|
if (usable.facts.length > 0)
|
|
287
294
|
throw new TlaProofError("Proof.Gen.gen_step: USE with facts and definitions");
|
|
@@ -289,7 +296,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
289
296
|
(current, def) => setDefinition("Visible", current, def),
|
|
290
297
|
sequent.context,
|
|
291
298
|
);
|
|
292
|
-
return
|
|
299
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
293
300
|
}
|
|
294
301
|
case "Hide": {
|
|
295
302
|
const hidden = step.usable.defs.reduce(
|
|
@@ -300,36 +307,33 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
300
307
|
(current, fact) => setExpression(onWarning, "Hidden", fact, current),
|
|
301
308
|
hidden,
|
|
302
309
|
);
|
|
303
|
-
return
|
|
310
|
+
return { sequent: { ...sequent, context }, step, time };
|
|
304
311
|
}
|
|
305
312
|
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
|
-
],
|
|
313
|
+
return {
|
|
314
|
+
sequent: {
|
|
315
|
+
context: [...sequent.context, ...step.definitions.map(getDefineHyp)],
|
|
319
316
|
active: shiftExpr(step.definitions.length, sequent.active),
|
|
320
317
|
},
|
|
321
318
|
step,
|
|
322
319
|
time,
|
|
323
|
-
|
|
320
|
+
};
|
|
324
321
|
case "Assert": {
|
|
325
322
|
const inner = proveAssertion(sequent.context, step.sequent, step, time);
|
|
326
323
|
const proof = generate(inner, step.proof, inner.time);
|
|
327
324
|
const generated: Step = { ...step, proof };
|
|
328
|
-
return
|
|
329
|
-
useAssertion(
|
|
330
|
-
|
|
325
|
+
return {
|
|
326
|
+
sequent: useAssertion(
|
|
327
|
+
false,
|
|
328
|
+
sequent.context,
|
|
329
|
+
sequent.active,
|
|
330
|
+
step.sequent,
|
|
331
|
+
generated,
|
|
332
|
+
time,
|
|
333
|
+
),
|
|
334
|
+
step: generated,
|
|
331
335
|
time,
|
|
332
|
-
|
|
336
|
+
};
|
|
333
337
|
}
|
|
334
338
|
case "Suffices": {
|
|
335
339
|
const proof = generate(
|
|
@@ -339,7 +343,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
339
343
|
);
|
|
340
344
|
const generated: Step = { ...step, proof };
|
|
341
345
|
const next = proveAssertion(sequent.context, step.sequent, generated, time);
|
|
342
|
-
return
|
|
346
|
+
return { sequent: next, step: generated, time: next.time };
|
|
343
347
|
}
|
|
344
348
|
default:
|
|
345
349
|
throw new TlaProofError("Proof.Gen.gen_step");
|
|
@@ -353,17 +357,16 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
353
357
|
location: Locus | undefined,
|
|
354
358
|
): [Hyp[], Obligation[]] => {
|
|
355
359
|
const step: StepNumber = { kind: "Unnamed", level: 0, id: 0 };
|
|
356
|
-
const
|
|
360
|
+
const generated = generateStep(
|
|
357
361
|
{ context, active: { ...AT_NOWHERE, location } },
|
|
358
362
|
mode === "Use"
|
|
359
363
|
? { kind: "Use", usable, isOnly: false, location, step, useLocation: location }
|
|
360
364
|
: { kind: "Hide", usable, location, step },
|
|
361
365
|
"Always",
|
|
362
366
|
);
|
|
363
|
-
return [sequent.context, generated.obligations ?? []];
|
|
367
|
+
return [generated.sequent.context, generated.step.obligations ?? []];
|
|
364
368
|
};
|
|
365
369
|
|
|
366
|
-
// The definitions go first, then each fact on its own, shifting the facts after it.
|
|
367
370
|
const mutate = (
|
|
368
371
|
context: Hyp[],
|
|
369
372
|
mode: "Use" | "Hide",
|
|
@@ -384,7 +387,6 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
384
387
|
return [last, [...first, ...others]];
|
|
385
388
|
};
|
|
386
389
|
|
|
387
|
-
// collect: a QED's obligations come before its sibling steps', and a step's own before its proof's.
|
|
388
390
|
const collect = (proof: Proof): Obligation[] => {
|
|
389
391
|
const obligations: Obligation[] = [];
|
|
390
392
|
const visitProof = (item: Proof) => {
|
|
@@ -393,17 +395,17 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
393
395
|
item.steps.forEach(visitStep);
|
|
394
396
|
return;
|
|
395
397
|
}
|
|
396
|
-
if (item.obligations) obligations.push(...item.obligations);
|
|
398
|
+
if (item.obligations && !item.isSuppressed) obligations.push(...item.obligations);
|
|
397
399
|
};
|
|
398
400
|
const visitStep = (step: Step) => {
|
|
399
|
-
if (step.kind === "Use" && step.obligations
|
|
401
|
+
if (step.kind === "Use" && step.obligations && !step.isSuppressed)
|
|
402
|
+
obligations.push(...step.obligations);
|
|
400
403
|
if ("proof" in step) visitProof(step.proof);
|
|
401
404
|
};
|
|
402
405
|
visitProof(proof);
|
|
403
406
|
return obligations;
|
|
404
407
|
};
|
|
405
408
|
|
|
406
|
-
// Module.Gen.generate.
|
|
407
409
|
const generateModule = (
|
|
408
410
|
context: Hyp[],
|
|
409
411
|
module: Mule,
|
package/src/obligations/index.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
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
|
getErrorNote,
|
|
6
|
+
getErrorSetting,
|
|
8
7
|
getLocusPosition,
|
|
9
8
|
getLocusPrefix,
|
|
9
|
+
warnError,
|
|
10
10
|
type Locus,
|
|
11
11
|
type Warn,
|
|
12
12
|
type Sequent,
|
|
@@ -19,11 +19,11 @@ import {
|
|
|
19
19
|
} from "./generate";
|
|
20
20
|
import { compareNames, flatten, getDependencies, STANDARD_MODULES, type Mule } from "./module";
|
|
21
21
|
import { expandInstance, normalize, type Pipeline } from "./normalize";
|
|
22
|
-
import { formatObligation } from "./printer";
|
|
23
|
-
import type
|
|
22
|
+
import { formatObligation, type PrinterOptions } from "./printer";
|
|
23
|
+
import { getUnique, type Counter, type ObligationKind } from "./proof";
|
|
24
24
|
import type { OldMethod } from "./pragma";
|
|
25
25
|
import { createSimplifier } from "./simplify";
|
|
26
|
-
import {
|
|
26
|
+
import { createModuleConverter } from "./source";
|
|
27
27
|
import { tokenize } from "../lexer";
|
|
28
28
|
import { parseTlapmModule } from "../parser";
|
|
29
29
|
import type { Module } from "../ast";
|
|
@@ -41,6 +41,7 @@ export interface PrintedObligation {
|
|
|
41
41
|
kind: ObligationKind;
|
|
42
42
|
sequent: Sequent;
|
|
43
43
|
method?: OldMethod;
|
|
44
|
+
isEnabledAxiomsSound?: boolean;
|
|
44
45
|
}
|
|
45
46
|
|
|
46
47
|
export interface ModuleObligations {
|
|
@@ -55,6 +56,7 @@ export const WHOLE_MODULE: LineRange = { start: 0, end: Infinity };
|
|
|
55
56
|
interface ObligationOptions {
|
|
56
57
|
lines?: LineRange;
|
|
57
58
|
onWarning?: Warn;
|
|
59
|
+
printing?: PrinterOptions;
|
|
58
60
|
}
|
|
59
61
|
|
|
60
62
|
const MODULE_HEADER = /-{4,} *MODULE/;
|
|
@@ -65,7 +67,7 @@ const formatLocus = (locus: Locus | undefined) =>
|
|
|
65
67
|
locus ? `${locus.startLine}:${locus.startColumn}:${locus.endLine}:${locus.endColumn}` : "";
|
|
66
68
|
|
|
67
69
|
const findTab = (source: string) => {
|
|
68
|
-
const tokens = tokenize(source);
|
|
70
|
+
const tokens = tokenize(source, true);
|
|
69
71
|
const lines = source.split("\n");
|
|
70
72
|
const endLine = tokens.at(-1)?.line ?? lines.length;
|
|
71
73
|
const moduleEnd =
|
|
@@ -120,7 +122,6 @@ const parseSource = (source: string): Module | SyntaxFailure[] => {
|
|
|
120
122
|
return isSyntaxFailure(parsed) ? [parsed] : parsed;
|
|
121
123
|
};
|
|
122
124
|
|
|
123
|
-
// Module.Save.parse_file warns when a module's name differs from its file's, then renames it.
|
|
124
125
|
const loadMule = (
|
|
125
126
|
input: ObligationSource,
|
|
126
127
|
counter: Counter,
|
|
@@ -130,17 +131,42 @@ const loadMule = (
|
|
|
130
131
|
): Mule => {
|
|
131
132
|
if (!MODULE_HEADER.test(input.source)) throw new TlaProofError("No tokens in file");
|
|
132
133
|
const parsed = parseSource(input.source);
|
|
134
|
+
const proofFailure = Array.isArray(parsed) ? parsed[0].proof : undefined;
|
|
135
|
+
if (Array.isArray(parsed) && proofFailure) {
|
|
136
|
+
const locus = {
|
|
137
|
+
file: input.file,
|
|
138
|
+
startLine: parsed[0].line,
|
|
139
|
+
startColumn: parsed[0].column,
|
|
140
|
+
endLine: proofFailure.stop.line,
|
|
141
|
+
endColumn: proofFailure.stop.column,
|
|
142
|
+
};
|
|
143
|
+
onWarning(getErrorNote(locus, proofFailure.printed));
|
|
144
|
+
onWarning(getErrorSetting(locus, parsed[0].reason));
|
|
145
|
+
throw new TlaProofError(parsed[0].reason, { failure: proofFailure.exception });
|
|
146
|
+
}
|
|
133
147
|
if (Array.isArray(parsed)) {
|
|
134
148
|
parsed.forEach((failure) => {
|
|
135
149
|
const text = `File ${JSON.stringify(input.file)}, line ${failure.line}, character ${failure.column}\n${failure.reason}`;
|
|
136
150
|
onWarning({ text, channel: "stderr" });
|
|
137
151
|
onWarning({ text: `${text}\n`, channel: "toolboxOnly" });
|
|
152
|
+
onWarning(
|
|
153
|
+
getErrorSetting(
|
|
154
|
+
{
|
|
155
|
+
file: input.file,
|
|
156
|
+
startLine: failure.line,
|
|
157
|
+
startColumn: failure.column,
|
|
158
|
+
endLine: failure.line,
|
|
159
|
+
endColumn: failure.column + 1,
|
|
160
|
+
},
|
|
161
|
+
`${failure.reason}\n`,
|
|
162
|
+
),
|
|
163
|
+
);
|
|
138
164
|
});
|
|
139
165
|
const message = `Could not parse ${JSON.stringify(input.file)} successfully.`;
|
|
140
166
|
onWarning({ text: `${errorPrefix}Error: ${message}`, channel: "stderr" });
|
|
141
167
|
throw new TlaProofError(message, { failure: "Module.Parser.parse_file" });
|
|
142
168
|
}
|
|
143
|
-
const mule =
|
|
169
|
+
const mule = createModuleConverter(input.file, input.source, counter, isMain)(parsed);
|
|
144
170
|
const fileName = input.file.slice(input.file.lastIndexOf("/") + 1);
|
|
145
171
|
const name = fileName.replace(/\.tla$/, "");
|
|
146
172
|
if (mule.name === name) return mule;
|
|
@@ -151,10 +177,9 @@ const loadMule = (
|
|
|
151
177
|
return { ...mule, name };
|
|
152
178
|
};
|
|
153
179
|
|
|
154
|
-
// Module.Dep.schedule: dependencies first, visiting modules and their dependencies by name.
|
|
155
180
|
const schedule = (modules: Map<string, Mule>) => {
|
|
156
181
|
const dependencies = new Map(
|
|
157
|
-
[...modules].map((
|
|
182
|
+
[...modules].map((entry) => [entry[0], getDependencies(entry[1]).dependencies]),
|
|
158
183
|
);
|
|
159
184
|
const seen = new Set<string>();
|
|
160
185
|
const order: Mule[] = [];
|
|
@@ -220,8 +245,6 @@ export const formatSummary = (result: ModuleObligations) => {
|
|
|
220
245
|
].join("\n");
|
|
221
246
|
};
|
|
222
247
|
|
|
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
248
|
export const getObligations = (
|
|
226
249
|
mains: ObligationSource[],
|
|
227
250
|
loadModule: (name: string) => ObligationSource | undefined,
|
|
@@ -238,9 +261,7 @@ export const getObligations = (
|
|
|
238
261
|
};
|
|
239
262
|
modules.set(module.name, module);
|
|
240
263
|
});
|
|
241
|
-
// Module.Save.complete_load: breadth first from every known module, by name.
|
|
242
264
|
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
265
|
const requested = new Map<string, Locus | undefined>();
|
|
245
266
|
const found = new Set<string>();
|
|
246
267
|
for (let index = 0; index < queue.length; index++) {
|
|
@@ -249,7 +270,6 @@ export const getObligations = (
|
|
|
249
270
|
found.add(name);
|
|
250
271
|
if (!modules.has(name)) modules.set(name, submodule);
|
|
251
272
|
});
|
|
252
|
-
// A file named like a standard module replaces it, and is read again for each module citing it.
|
|
253
273
|
for (const name of result.dependencies) {
|
|
254
274
|
if (modules.has(name) && !STANDARD_MODULES.has(name)) continue;
|
|
255
275
|
const input = loadModule(name);
|
|
@@ -271,7 +291,7 @@ export const getObligations = (
|
|
|
271
291
|
}
|
|
272
292
|
const missing = [...requested.keys()].filter((name) => !found.has(name)).sort(compareNames);
|
|
273
293
|
missing.forEach((name) =>
|
|
274
|
-
onWarning
|
|
294
|
+
warnError(onWarning, requested.get(name), `Unknown module ${JSON.stringify(name)}`),
|
|
275
295
|
);
|
|
276
296
|
if (missing.length > 0)
|
|
277
297
|
throw new TlaProofError(`Unknown module ${JSON.stringify(missing[0])}`, {
|
|
@@ -279,7 +299,7 @@ export const getObligations = (
|
|
|
279
299
|
});
|
|
280
300
|
const pipeline: Pipeline = {
|
|
281
301
|
anonymizer: createAnonymizer(
|
|
282
|
-
counter
|
|
302
|
+
() => `_a${getUnique(counter)}`,
|
|
283
303
|
(scope, definition) => expandInstance(pipeline, scope, definition),
|
|
284
304
|
onWarning,
|
|
285
305
|
),
|
|
@@ -292,14 +312,12 @@ export const getObligations = (
|
|
|
292
312
|
module.isStandard ? module : flatten(modules, module, new Set()),
|
|
293
313
|
);
|
|
294
314
|
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
315
|
const normalized = new Map(order.map((module) => [module.name, module]));
|
|
297
316
|
return order.flatMap((module): ModuleObligations[] => {
|
|
298
317
|
if (module.isStandard) return [];
|
|
299
318
|
const result = normalize(pipeline, normalized, undefined, module);
|
|
300
319
|
if (!module.isImportant) return [];
|
|
301
320
|
const generated = generateModule([], result);
|
|
302
|
-
// tlapm numbers the obligations, then drops the omitted ones and those outside the lines.
|
|
303
321
|
const obligations = generated.obligations.flatMap((obligation, index): PrintedObligation[] => {
|
|
304
322
|
const location = obligation.location;
|
|
305
323
|
if (
|
|
@@ -310,7 +328,7 @@ export const getObligations = (
|
|
|
310
328
|
const text =
|
|
311
329
|
obligation.kind.kind === "Error"
|
|
312
330
|
? obligation.kind.message
|
|
313
|
-
: `${formatObligation(obligation.sequent)}\n`;
|
|
331
|
+
: `${formatObligation(obligation.sequent, options.printing)}\n`;
|
|
314
332
|
return [
|
|
315
333
|
{
|
|
316
334
|
id: index + 1,
|
|
@@ -320,6 +338,7 @@ export const getObligations = (
|
|
|
320
338
|
kind: obligation.kind,
|
|
321
339
|
sequent: obligation.sequent,
|
|
322
340
|
method: obligation.method,
|
|
341
|
+
isEnabledAxiomsSound: obligation.isEnabledAxiomsSound,
|
|
323
342
|
},
|
|
324
343
|
];
|
|
325
344
|
});
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Expr.Levels: the level of an expression (0 constant, 1 state, 2 action, 3 temporal, 4 undefined),
|
|
2
|
-
// the weights of an operator's arguments, and the declared names the level depends on.
|
|
3
|
-
|
|
4
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
2
|
import {
|
|
6
3
|
adjoin,
|
|
@@ -16,6 +13,7 @@ import {
|
|
|
16
13
|
type Bound,
|
|
17
14
|
type Builtin,
|
|
18
15
|
type Expr,
|
|
16
|
+
type Hyp,
|
|
19
17
|
type Level,
|
|
20
18
|
type Scope,
|
|
21
19
|
} from "./expression";
|
|
@@ -114,15 +112,14 @@ export const LEVEL_NUMBERS: Record<Level, number> = {
|
|
|
114
112
|
Unknown: 0,
|
|
115
113
|
};
|
|
116
114
|
|
|
117
|
-
const
|
|
115
|
+
const getUnion = (sets: Set<string>[]) => new Set(sets.flatMap((set) => [...set]));
|
|
118
116
|
|
|
119
117
|
const combineLevels = (infos: LevelInfo[]): LevelInfo => ({
|
|
120
118
|
level: Math.max(0, ...infos.map((info) => info.level)),
|
|
121
119
|
weights: [],
|
|
122
|
-
params:
|
|
120
|
+
params: getUnion(infos.map((info) => info.params)),
|
|
123
121
|
});
|
|
124
122
|
|
|
125
|
-
// The level of each hypothesis depends only on the scope before it.
|
|
126
123
|
const hypLevels = new WeakMap<Scope, LevelInfo>();
|
|
127
124
|
|
|
128
125
|
const computeHypLevel = (scope: Scope): LevelInfo => {
|
|
@@ -162,18 +159,29 @@ const getBoundsLevel = (scope: Scope | undefined, bounds: Bound[], body: Expr) =
|
|
|
162
159
|
]);
|
|
163
160
|
};
|
|
164
161
|
|
|
165
|
-
const applyOperator = (operator: LevelInfo, args: LevelInfo[]): LevelInfo => {
|
|
162
|
+
const applyOperator = (operator: LevelInfo, args: LevelInfo[], from: Expr): LevelInfo => {
|
|
166
163
|
if (operator.weights.length !== args.length) {
|
|
167
|
-
throw new TlaProofError("Invalid number of arguments"
|
|
164
|
+
throw new TlaProofError("Invalid number of arguments", {
|
|
165
|
+
failure: "Expr.Levels: ARITY",
|
|
166
|
+
locus: from.location,
|
|
167
|
+
});
|
|
168
168
|
}
|
|
169
169
|
const weighted = args.filter((_arg, index) => operator.weights[index]);
|
|
170
170
|
return {
|
|
171
171
|
level: Math.max(operator.level, ...weighted.map((arg) => arg.level)),
|
|
172
172
|
weights: [],
|
|
173
|
-
params:
|
|
173
|
+
params: getUnion([operator.params, ...weighted.map((arg) => arg.params)]),
|
|
174
174
|
};
|
|
175
175
|
};
|
|
176
176
|
|
|
177
|
+
export const getContextLevel = (scope: Scope | undefined, hyps: Hyp[]) => {
|
|
178
|
+
const [inner, levels] = mapAccumulate(scope, hyps, (current, hyp) => {
|
|
179
|
+
const next = adjoin(current, hyp);
|
|
180
|
+
return [next, getHypLevel(next).level];
|
|
181
|
+
});
|
|
182
|
+
return { scope: inner, level: Math.max(0, ...levels) };
|
|
183
|
+
};
|
|
184
|
+
|
|
177
185
|
export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelInfo => {
|
|
178
186
|
const recurse = (inner: Expr) => getLevelInfo(scope, inner);
|
|
179
187
|
switch (expression.kind) {
|
|
@@ -205,13 +213,15 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
205
213
|
}
|
|
206
214
|
case "Apply": {
|
|
207
215
|
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
216
|
if (isBuiltinApply(operator, "Prime") && operator.args.length === 1) {
|
|
211
217
|
return recurse({ ...expression, operator: operator.args[0] });
|
|
212
218
|
}
|
|
213
219
|
if (operator.kind === "Opaque") {
|
|
214
|
-
return applyOperator(
|
|
220
|
+
return applyOperator(
|
|
221
|
+
getInfo(0, expression.args.length),
|
|
222
|
+
expression.args.map(recurse),
|
|
223
|
+
expression,
|
|
224
|
+
);
|
|
215
225
|
}
|
|
216
226
|
if (operator.kind === "Internal" && expression.args.length === 1) {
|
|
217
227
|
const arg = expression.args[0];
|
|
@@ -240,14 +250,13 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
240
250
|
expression.args.forEach(recurse);
|
|
241
251
|
return getInfo(3, 2);
|
|
242
252
|
}
|
|
243
|
-
return applyOperator(recurse(operator), expression.args.map(recurse));
|
|
253
|
+
return applyOperator(recurse(operator), expression.args.map(recurse), expression);
|
|
244
254
|
}
|
|
245
255
|
case "Sequent": {
|
|
246
|
-
const
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
return getInfo(Math.max(0, ...levels, getLevelInfo(inner, expression.sequent.active).level));
|
|
256
|
+
const context = getContextLevel(scope, expression.sequent.context);
|
|
257
|
+
return getInfo(
|
|
258
|
+
Math.max(context.level, getLevelInfo(context.scope, expression.sequent.active).level),
|
|
259
|
+
);
|
|
251
260
|
}
|
|
252
261
|
case "With":
|
|
253
262
|
case "Dot":
|