tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- 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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -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 +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- 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 +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- 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 +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- 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 -14
- 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 +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- 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 +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- 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 +13 -36
- 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 +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- 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 +10 -31
- 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 +12 -98
- 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 +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- 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 +20 -45
- 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 +35 -130
- 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 +15 -69
- 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-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- 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 +5 -52
- 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 +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- 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 +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- 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 +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- 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 +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -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 +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -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 +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -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 +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's obligation printer
|
|
2
|
-
// identifier renaming in Ctx.
|
|
1
|
+
// A port of tlapm's obligation printer (E_fmt, Fmtutil and Ctx).
|
|
3
2
|
|
|
4
3
|
import { TlaProofError } from "../errors";
|
|
5
4
|
import {
|
|
@@ -16,8 +15,6 @@ import {
|
|
|
16
15
|
import { format, formatDelimited, renderDoc, text, type Doc } from "./format";
|
|
17
16
|
import { getStandardForm, lookupOperator } from "./operators";
|
|
18
17
|
|
|
19
|
-
// Ctx, which names each binder apart from the names in scope by adding a salt, as a mutable stack:
|
|
20
|
-
// printers bind and unbind names in strict nesting order.
|
|
21
18
|
interface Ident {
|
|
22
19
|
rep: string;
|
|
23
20
|
salt: number;
|
|
@@ -38,7 +35,6 @@ export const createContext = (): Context => ({
|
|
|
38
35
|
defined: new Map(),
|
|
39
36
|
});
|
|
40
37
|
|
|
41
|
-
// The name of the binder index places in, counting from 1 for the innermost.
|
|
42
38
|
export const getBoundName = (context: Context, index: number) => {
|
|
43
39
|
const ident = context.stack[context.stack.length - index];
|
|
44
40
|
return ident && getIdentName(ident);
|
|
@@ -139,9 +135,9 @@ const printMinimal = (expression: Minimal): Doc => {
|
|
|
139
135
|
}
|
|
140
136
|
};
|
|
141
137
|
|
|
142
|
-
const
|
|
138
|
+
const createAtom = (doc: Doc): Minimal => ({ kind: "Atm", doc });
|
|
143
139
|
|
|
144
|
-
const
|
|
140
|
+
const createBig = (doc: Doc): Minimal => ({ kind: "Big", doc });
|
|
145
141
|
|
|
146
142
|
const isWith = (expression: Expr): boolean => {
|
|
147
143
|
if (expression.kind === "Lambda") return isWith(expression.body);
|
|
@@ -180,7 +176,6 @@ const LEVEL_NAMES = {
|
|
|
180
176
|
Unknown: "UNKNOWN",
|
|
181
177
|
};
|
|
182
178
|
|
|
183
|
-
// hyps names the indices beyond the printer's own context, as the hypothesis deque does in E_fmt.
|
|
184
179
|
const createPrinter = (hyps: Hyp[] = []) => {
|
|
185
180
|
const context = createContext();
|
|
186
181
|
const printExpr = (expression: Expr): Doc => printMinimal(formatExpr(expression));
|
|
@@ -197,8 +192,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
197
192
|
),
|
|
198
193
|
);
|
|
199
194
|
|
|
200
|
-
// fmt_bounds: names bind left to right, domains print in the enclosing context, and dittos
|
|
201
|
-
// share the previous domain.
|
|
202
195
|
const formatBounds = <Result>(bounds: Bound[], body: (boundsDoc: Doc) => Result): Result => {
|
|
203
196
|
const domains = bounds.map((bound) =>
|
|
204
197
|
bound.domain.kind === "Domain" ? printExpr(bound.domain.expression) : undefined,
|
|
@@ -274,15 +267,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
274
267
|
skeleton: {
|
|
275
268
|
kind: "Infix",
|
|
276
269
|
assoc: "Left",
|
|
277
|
-
left:
|
|
278
|
-
right:
|
|
270
|
+
left: createBig(printLambda(operator.params, operator.body)),
|
|
271
|
+
right: createAtom(format("(%a)", formatDelimited(args, printExpr))),
|
|
279
272
|
},
|
|
280
273
|
};
|
|
281
274
|
}
|
|
282
275
|
if (operator.kind === "Bang") {
|
|
283
276
|
return args.length === 0
|
|
284
277
|
? formatExpr(operator)
|
|
285
|
-
:
|
|
278
|
+
: createAtom(
|
|
286
279
|
format("@[<b2>%a@[<b1>(%a)@]@]", printExpr(operator), formatDelimited(args, printExpr)),
|
|
287
280
|
);
|
|
288
281
|
}
|
|
@@ -291,7 +284,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
291
284
|
return formatExpr(args[0]);
|
|
292
285
|
}
|
|
293
286
|
if (operator.builtin === "Irregular") {
|
|
294
|
-
return
|
|
287
|
+
return createAtom(format("@[<h>@<1>%s%a@<1>%s@]", "<[", printExpr(args[0]), "]>"));
|
|
295
288
|
}
|
|
296
289
|
}
|
|
297
290
|
const form = (() => {
|
|
@@ -316,9 +309,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
316
309
|
high: form.high,
|
|
317
310
|
skeleton,
|
|
318
311
|
});
|
|
319
|
-
if (args.length === 0) return
|
|
312
|
+
if (args.length === 0) return createAtom(text(form.name));
|
|
320
313
|
if (form.fixity === "Nonfix") {
|
|
321
|
-
return
|
|
314
|
+
return createAtom(
|
|
315
|
+
format("@[<b2>%s@[<b1>(%a)@]@]", form.name, formatDelimited(args, printExpr)),
|
|
316
|
+
);
|
|
322
317
|
}
|
|
323
318
|
if (form.fixity === "Prefix" && args.length === 1) {
|
|
324
319
|
return getOperation(
|
|
@@ -352,17 +347,17 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
352
347
|
case "Internal":
|
|
353
348
|
return formatApply(expression, []);
|
|
354
349
|
case "Lambda":
|
|
355
|
-
return
|
|
350
|
+
return createBig(printLambda(expression.params, expression.body));
|
|
356
351
|
case "Bang":
|
|
357
|
-
return
|
|
352
|
+
return createAtom([printExpr(expression.expression), printSelectors(expression.selectors)]);
|
|
358
353
|
case "Apply":
|
|
359
354
|
return formatApply(expression.operator, expression.args);
|
|
360
355
|
case "Sequent":
|
|
361
|
-
return
|
|
356
|
+
return createBig(printSequent(expression.sequent));
|
|
362
357
|
case "With":
|
|
363
358
|
return formatExpr(expression.expression);
|
|
364
359
|
case "If":
|
|
365
|
-
return
|
|
360
|
+
return createBig(
|
|
366
361
|
format(
|
|
367
362
|
"@[<hv2>@[<b2>IF@ %a@]@ @[<b2>THEN %a@]@ @[<b2>ELSE %a@]@]",
|
|
368
363
|
printExpr(expression.condition),
|
|
@@ -372,13 +367,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
372
367
|
);
|
|
373
368
|
case "List": {
|
|
374
369
|
if (expression.bullet === "Refs" && expression.items.length === 0) {
|
|
375
|
-
return
|
|
370
|
+
return createAtom(format("TRUE"));
|
|
376
371
|
}
|
|
377
372
|
if (expression.bullet === "Refs" && expression.items.length === 1) {
|
|
378
373
|
return formatExpr(expression.items[0]);
|
|
379
374
|
}
|
|
380
375
|
const bullet = expression.bullet === "Or" ? "\\/" : "/\\";
|
|
381
|
-
return
|
|
376
|
+
return createBig(
|
|
382
377
|
format(
|
|
383
378
|
"@[<v0>%a@]",
|
|
384
379
|
formatDelimited(
|
|
@@ -397,11 +392,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
397
392
|
);
|
|
398
393
|
const bodyDoc = printExpr(expression.body);
|
|
399
394
|
popNames(context, expression.definitions.length);
|
|
400
|
-
return
|
|
395
|
+
return createBig([
|
|
396
|
+
format("@[<hv0>LET @[<v0>"),
|
|
397
|
+
definitionsDoc,
|
|
398
|
+
format("@]@\nIN %a@]", bodyDoc),
|
|
399
|
+
]);
|
|
401
400
|
}
|
|
402
401
|
case "Quant":
|
|
403
402
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
404
|
-
|
|
403
|
+
createBig(
|
|
405
404
|
format(
|
|
406
405
|
"@[<b3>%s @[<b0>%a@] :@ %a@]",
|
|
407
406
|
expression.quantifier === "Forall" ? "\\A" : "\\E",
|
|
@@ -412,7 +411,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
412
411
|
);
|
|
413
412
|
case "Tquant":
|
|
414
413
|
return withNames(context, expression.names, (names) =>
|
|
415
|
-
|
|
414
|
+
createBig(
|
|
416
415
|
format(
|
|
417
416
|
"@[<b4>%s @[<b0>%a@] : %a@]",
|
|
418
417
|
expression.quantifier === "Forall" ? "\\AA" : "\\EE",
|
|
@@ -424,7 +423,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
424
423
|
case "Choose": {
|
|
425
424
|
const domainDoc = expression.domain && printExpr(expression.domain);
|
|
426
425
|
return withNames(context, [expression.name], ([name]) =>
|
|
427
|
-
|
|
426
|
+
createBig(
|
|
428
427
|
domainDoc
|
|
429
428
|
? format(
|
|
430
429
|
"@[<b2>CHOOSE @[<b2>%s \\in@ %a@] :@ %a@]",
|
|
@@ -439,7 +438,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
439
438
|
case "SetSt": {
|
|
440
439
|
const domainDoc = printExpr(expression.domain);
|
|
441
440
|
return withNames(context, [expression.name], ([name]) =>
|
|
442
|
-
|
|
441
|
+
createAtom(
|
|
443
442
|
format(
|
|
444
443
|
"@[<b3>{@[<b2>%s \\in@ %a@] :@ %a}@]",
|
|
445
444
|
name,
|
|
@@ -451,22 +450,24 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
451
450
|
}
|
|
452
451
|
case "SetOf":
|
|
453
452
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
454
|
-
|
|
453
|
+
createAtom(format("@[<b3>{%a :@ %a}@]", printExpr(expression.element), boundsDoc)),
|
|
455
454
|
);
|
|
456
455
|
case "SetEnum":
|
|
457
|
-
return
|
|
456
|
+
return createAtom(
|
|
457
|
+
format("@[<h>{@[<b0>%a@]}@]", formatDelimited(expression.elements, printExpr)),
|
|
458
|
+
);
|
|
458
459
|
case "Arrow":
|
|
459
|
-
return
|
|
460
|
+
return createAtom(
|
|
460
461
|
format("@[<b3>[%a ->@ %a]@]", printExpr(expression.domain), printExpr(expression.range)),
|
|
461
462
|
);
|
|
462
463
|
case "Fcn":
|
|
463
464
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
464
|
-
|
|
465
|
+
createAtom(format("@[<b3>[%a |->@ %a]@]", boundsDoc, printExpr(expression.body))),
|
|
465
466
|
);
|
|
466
467
|
case "FcnApp": {
|
|
467
468
|
const target = formatExpr(expression.function);
|
|
468
469
|
const isAtom = target.kind === "Atm";
|
|
469
|
-
return
|
|
470
|
+
return createAtom(
|
|
470
471
|
format(
|
|
471
472
|
"@[<h>%s%a%s@[<b1>[%a]@]@]",
|
|
472
473
|
isAtom ? "" : "(",
|
|
@@ -495,11 +496,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
495
496
|
};
|
|
496
497
|
}
|
|
497
498
|
case "Tuple":
|
|
498
|
-
return
|
|
499
|
+
return createAtom(
|
|
500
|
+
format("@[<b2><<%a>>@]", formatDelimited(expression.elements, printExpr)),
|
|
501
|
+
);
|
|
499
502
|
case "Rect":
|
|
500
503
|
case "Record": {
|
|
501
504
|
const separator = expression.kind === "Rect" ? ":" : "|->";
|
|
502
|
-
return
|
|
505
|
+
return createAtom(
|
|
503
506
|
format(
|
|
504
507
|
"@[<b1>[%a]@]",
|
|
505
508
|
formatDelimited(expression.fields, (field) =>
|
|
@@ -509,7 +512,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
509
512
|
);
|
|
510
513
|
}
|
|
511
514
|
case "Except":
|
|
512
|
-
return
|
|
515
|
+
return createAtom(
|
|
513
516
|
format(
|
|
514
517
|
"@[<b3>[%a EXCEPT@ @[<v0>%a@]]@]",
|
|
515
518
|
printExpr(expression.function),
|
|
@@ -537,14 +540,14 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
537
540
|
kind: "Infix",
|
|
538
541
|
assoc: "Left",
|
|
539
542
|
left: formatExpr(expression.expression),
|
|
540
|
-
right:
|
|
543
|
+
right: createAtom(text(expression.field)),
|
|
541
544
|
},
|
|
542
545
|
};
|
|
543
546
|
case "Sub":
|
|
544
547
|
case "Tsub": {
|
|
545
548
|
const isBox = expression.modal === "Box";
|
|
546
549
|
const open = expression.kind === "Sub" ? (isBox ? "[" : "<<") : isBox ? "[][" : "<><<";
|
|
547
|
-
return
|
|
550
|
+
return createAtom(
|
|
548
551
|
format(
|
|
549
552
|
"@[<h>%s@[<b2>%a@]%s%a@]",
|
|
550
553
|
open,
|
|
@@ -555,7 +558,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
555
558
|
);
|
|
556
559
|
}
|
|
557
560
|
case "Fair":
|
|
558
|
-
return
|
|
561
|
+
return createBig(
|
|
559
562
|
format(
|
|
560
563
|
"@[<h>%s_%a (%a)@]",
|
|
561
564
|
expression.fairness === "Weak" ? "WF" : "SF",
|
|
@@ -564,7 +567,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
564
567
|
),
|
|
565
568
|
);
|
|
566
569
|
case "Case":
|
|
567
|
-
return
|
|
570
|
+
return createBig(
|
|
568
571
|
format(
|
|
569
572
|
"@[<v2>CASE %a%a@]",
|
|
570
573
|
formatDelimited(
|
|
@@ -578,9 +581,9 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
578
581
|
),
|
|
579
582
|
);
|
|
580
583
|
case "String":
|
|
581
|
-
return
|
|
584
|
+
return createAtom(format('"%s"', expression.value));
|
|
582
585
|
case "Num":
|
|
583
|
-
return
|
|
586
|
+
return createAtom(
|
|
584
587
|
text(
|
|
585
588
|
expression.fraction === ""
|
|
586
589
|
? expression.integer
|
|
@@ -588,7 +591,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
588
591
|
),
|
|
589
592
|
);
|
|
590
593
|
case "At":
|
|
591
|
-
return
|
|
594
|
+
return createAtom(text("@"));
|
|
592
595
|
case "Parens": {
|
|
593
596
|
const form = expression.form;
|
|
594
597
|
if (form.kind === "Syntax") return formatExpr(expression.expression);
|
|
@@ -603,7 +606,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
603
606
|
const inner = formatExpr(expression.expression);
|
|
604
607
|
if (names.length === 0) {
|
|
605
608
|
const pattern = inner.kind === "Op" ? "%s::(%a)" : "%s::%a";
|
|
606
|
-
return
|
|
609
|
+
return createAtom(format(pattern, form.label, printMinimal(inner)));
|
|
607
610
|
}
|
|
608
611
|
const namesDoc = formatDelimited(names, text);
|
|
609
612
|
const pattern =
|
|
@@ -612,12 +615,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
612
615
|
: inner.kind === "Big"
|
|
613
616
|
? "%s(%a)::(%a)"
|
|
614
617
|
: "(%s(%a):: %a)";
|
|
615
|
-
return
|
|
618
|
+
return createAtom(format(pattern, form.label, namesDoc, printMinimal(inner)));
|
|
616
619
|
}
|
|
617
620
|
}
|
|
618
621
|
};
|
|
619
622
|
|
|
620
|
-
// pp_print_defn: returns the definition's document and binds its name for what follows.
|
|
621
623
|
const printDefinition = (definition: Defn): Doc => {
|
|
622
624
|
switch (definition.kind) {
|
|
623
625
|
case "Operator":
|
|
@@ -671,7 +673,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
671
673
|
}
|
|
672
674
|
};
|
|
673
675
|
|
|
674
|
-
// pp_print_hyp: prints the hypothesis in the context before it, then binds it.
|
|
675
676
|
const printHyp = (hyp: Hyp): Doc => {
|
|
676
677
|
switch (hyp.kind) {
|
|
677
678
|
case "Fresh": {
|
package/src/obligations/proof.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's proof IR (P_t).
|
|
1
|
+
// A port of tlapm's proof IR (P_t).
|
|
2
2
|
|
|
3
3
|
import type { Bound, Defn, Expr, Locus, Sequent } from "./expression";
|
|
4
4
|
import type { OldMethod } from "./pragma";
|
|
@@ -24,7 +24,6 @@ export type ObligationKind =
|
|
|
24
24
|
| { kind: "Error"; message: string }
|
|
25
25
|
| { kind: "Omitted"; omission: Omission };
|
|
26
26
|
|
|
27
|
-
// method is the one an old-style pragma names, which keeps find_meth from choosing.
|
|
28
27
|
export interface Obligation {
|
|
29
28
|
sequent: Sequent;
|
|
30
29
|
location: Locus | undefined;
|
|
@@ -32,7 +31,6 @@ export interface Obligation {
|
|
|
32
31
|
method?: OldMethod;
|
|
33
32
|
}
|
|
34
33
|
|
|
35
|
-
// useLocation is where a USE step comes from, so find_meth can tell apart the facts of each BY.
|
|
36
34
|
interface ProofProps {
|
|
37
35
|
location?: Locus;
|
|
38
36
|
step?: StepNumber;
|
|
@@ -72,8 +70,6 @@ type StepCore =
|
|
|
72
70
|
export const getStepName = (step: StepNumber) =>
|
|
73
71
|
step.kind === "Named" ? `<${step.level}>${step.label}` : `<${step.level}>`;
|
|
74
72
|
|
|
75
|
-
// Std.unique: one counter for the whole run, shared by the parser, anonymization, and
|
|
76
|
-
// simplification, so anonymous step names match tlapm's.
|
|
77
73
|
export interface Counter {
|
|
78
74
|
value: number;
|
|
79
75
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
|
|
3
|
-
// This regroups an infix application the way tlapm does.
|
|
1
|
+
// A port of tlapm's Pco.resolve.
|
|
4
2
|
|
|
5
3
|
import type { Expression, SourceLocation } from "../ast";
|
|
6
4
|
import { lookupOperator, type Operator } from "./operators";
|
|
@@ -33,7 +31,6 @@ const withEnd = (expression: Expression, end: SourceLocation | undefined): Expre
|
|
|
33
31
|
: expression;
|
|
34
32
|
};
|
|
35
33
|
|
|
36
|
-
// The operator an expression leaves open on tlapm's parse stack, with the operand after it.
|
|
37
34
|
const getOpenOperator = (expression: Expression) => {
|
|
38
35
|
if (expression.kind === "Apply") {
|
|
39
36
|
const operator = lookupOperator(expression.operator);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's Proof.Simplify
|
|
2
|
-
// BY becomes USE steps and an OBVIOUS QED, and HAVE, TAKE, WITNESS, CASE and PICK become
|
|
3
|
-
// assertions.
|
|
1
|
+
// A port of tlapm's Proof.Simplify.
|
|
4
2
|
|
|
5
3
|
import { TlaProofError } from "../errors";
|
|
6
4
|
import { isEqualExpr } from "./equality";
|
|
@@ -33,7 +31,6 @@ import {
|
|
|
33
31
|
substituteExpr,
|
|
34
32
|
} from "./substitution";
|
|
35
33
|
|
|
36
|
-
// tlapm builds nodes with x @@ step, which copies all of the step's properties.
|
|
37
34
|
const getProps = (from: Step) => ({
|
|
38
35
|
location: from.location,
|
|
39
36
|
step: from.step,
|
|
@@ -51,8 +48,6 @@ const isBinary = (
|
|
|
51
48
|
const getMessage = (pattern: string, ...args: (string | Doc)[]) =>
|
|
52
49
|
renderDoc(format(pattern, ...args));
|
|
53
50
|
|
|
54
|
-
// Visit.hyps_of_bounds_unditto: dittos repeat the previous domain, and each domain shifts past the
|
|
55
|
-
// names bound before it.
|
|
56
51
|
const getBoundHyps = (bounds: Bound[]): Hyp[] =>
|
|
57
52
|
expandDittoes(bounds).map((bound, index): Hyp => {
|
|
58
53
|
const domain =
|
|
@@ -76,7 +71,6 @@ const expandDittoes = (bounds: Bound[]): Bound[] => {
|
|
|
76
71
|
});
|
|
77
72
|
};
|
|
78
73
|
|
|
79
|
-
// The bounds after a witnessed one, where a ditto takes the witnessed domain.
|
|
80
74
|
const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
81
75
|
const shifted = substituteBounds(shift(1), rest)[1];
|
|
82
76
|
return shifted[0].domain.kind === "Ditto" && first.domain.kind === "Domain"
|
|
@@ -90,7 +84,6 @@ const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
|
90
84
|
: shifted;
|
|
91
85
|
};
|
|
92
86
|
|
|
93
|
-
// A WITNESS proves each membership and subset it relies on, then the goal from them.
|
|
94
87
|
const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
95
88
|
if (sideFacts.length === 0) return { kind: "Obvious", ...getProps(step) };
|
|
96
89
|
const steps = sideFacts.map((item, index): Step => {
|
|
@@ -114,7 +107,6 @@ const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
|
114
107
|
at({ kind: "Ix", index: 2 * (sideFacts.length - index) }, step),
|
|
115
108
|
),
|
|
116
109
|
];
|
|
117
|
-
// tlapm removes the method from the QED.
|
|
118
110
|
const qedProof: Proof = {
|
|
119
111
|
kind: "By",
|
|
120
112
|
usable: { facts, defs: [] },
|
|
@@ -211,7 +203,6 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
211
203
|
return active.kind === "Apply" && active.args.length === 2 ? active.args[1] : undefined;
|
|
212
204
|
};
|
|
213
205
|
|
|
214
|
-
// at_expand: @ in a step stands for the right side of the previous step's assertion.
|
|
215
206
|
const expandAt = (proof: Proof): Proof => {
|
|
216
207
|
if (proof.kind !== "Steps") return proof;
|
|
217
208
|
const steps: Step[] = [];
|
|
@@ -358,10 +349,8 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
358
349
|
`USE DEF ${name} invalid because ${name} is not a defined operator`,
|
|
359
350
|
);
|
|
360
351
|
}
|
|
361
|
-
return current.map((entry, position) =>
|
|
362
|
-
position === index
|
|
363
|
-
? { ...hyp, visibility: "Hidden" as const, location: step.location }
|
|
364
|
-
: entry,
|
|
352
|
+
return current.map((entry, position): Hyp =>
|
|
353
|
+
position === index ? { ...hyp, visibility: "Hidden", location: step.location } : entry,
|
|
365
354
|
);
|
|
366
355
|
}, context);
|
|
367
356
|
return [hidden, goal, [step], time];
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Converts the tla-ts AST into tlapm's parse trees: expressions name operators opaquely until
|
|
2
|
-
// anonymization resolves them, and proof steps get tlapm's levels and anonymous step numbers.
|
|
3
|
-
|
|
4
1
|
import type {
|
|
5
2
|
AssumeProve,
|
|
6
3
|
Definition,
|
|
@@ -137,14 +134,12 @@ export const createSource = (
|
|
|
137
134
|
const getMethod = (range: SourceRange | undefined) =>
|
|
138
135
|
range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
|
|
139
136
|
|
|
140
|
-
// A method pragma belongs to the node it follows, whose locus then takes it in.
|
|
141
137
|
const withMethod = (range: SourceRange) => {
|
|
142
138
|
const method = getMethod(range);
|
|
143
139
|
const location = getRangeLocus(range);
|
|
144
140
|
return method ? { location: withPragma(location), method } : { location };
|
|
145
141
|
};
|
|
146
142
|
|
|
147
|
-
// Module.Parser's with_meth, which wraps the expression a method follows.
|
|
148
143
|
const withExpressionMethod = (expression: Expr, range: SourceRange | undefined): Expr => {
|
|
149
144
|
const method = getMethod(range);
|
|
150
145
|
return method ? at({ kind: "With", expression, method }, expression) : expression;
|
|
@@ -169,7 +164,6 @@ export const createSource = (
|
|
|
169
164
|
});
|
|
170
165
|
};
|
|
171
166
|
|
|
172
|
-
// A name with ! selects through instances, which anonymization resolves by joining the names.
|
|
173
167
|
const convertName = (
|
|
174
168
|
name: string,
|
|
175
169
|
args: Expr[],
|
|
@@ -251,8 +245,6 @@ export const createSource = (
|
|
|
251
245
|
const convertExpression = (expression: Expression, isExcept: boolean): Expr => {
|
|
252
246
|
const location = getLocus(expression.location);
|
|
253
247
|
const recurse = (inner: Expression) => convertExpression(inner, isExcept);
|
|
254
|
-
// tlapm locates an operator application by its operator and operands, and a parenthesized
|
|
255
|
-
// operand by what is inside the parentheses.
|
|
256
248
|
const getOperatorLocus = (args: Expr[], fixity: Fixity) => {
|
|
257
249
|
if (args.length === 2) return mergeLoci(args[0].location, args[1].location);
|
|
258
250
|
if (args.length !== 1 || !args[0].location) return location;
|
|
@@ -286,8 +278,6 @@ export const createSource = (
|
|
|
286
278
|
return at({ kind: "Num", integer, fraction }, { location });
|
|
287
279
|
}
|
|
288
280
|
case "String": {
|
|
289
|
-
// tlapm's lexer keeps a string's escapes as written. The location ends at the closing
|
|
290
|
-
// quote.
|
|
291
281
|
const written = /"((?:[^"\\]|\\.)*)"$/.exec(
|
|
292
282
|
(lines[location.endLine - 1] ?? "").slice(0, location.endColumn - 1),
|
|
293
283
|
);
|
|
@@ -474,8 +464,7 @@ export const createSource = (
|
|
|
474
464
|
{ location },
|
|
475
465
|
);
|
|
476
466
|
case "Tuple":
|
|
477
|
-
// tlapm's tuple parser
|
|
478
|
-
// of the closing >>.
|
|
467
|
+
// tlapm's tuple parser keeps only the location of the closing >>.
|
|
479
468
|
return at(
|
|
480
469
|
{ kind: "Tuple", elements: expression.elements.map(recurse) },
|
|
481
470
|
{
|
|
@@ -678,7 +667,6 @@ export const createSource = (
|
|
|
678
667
|
location,
|
|
679
668
|
};
|
|
680
669
|
}
|
|
681
|
-
// A prefix minus is the operator -.
|
|
682
670
|
const name =
|
|
683
671
|
definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
|
|
684
672
|
? "-."
|
|
@@ -739,7 +727,6 @@ export const createSource = (
|
|
|
739
727
|
};
|
|
740
728
|
};
|
|
741
729
|
|
|
742
|
-
// Anonymization judges the time of each assumption once it resolves the names in it.
|
|
743
730
|
const convertSequent = (statement: Expression | AssumeProve): Sequent => {
|
|
744
731
|
if (statement.kind !== "AssumeProve")
|
|
745
732
|
return { context: [], active: convertExpression(statement, false) };
|
|
@@ -759,7 +746,6 @@ export const createSource = (
|
|
|
759
746
|
};
|
|
760
747
|
};
|
|
761
748
|
|
|
762
|
-
// A labeled hypothesis is an Xlabel without parameters, not an Nlabel like a labeled expression.
|
|
763
749
|
const convertFactLabel = (expression: Expression): Expr => {
|
|
764
750
|
if (expression.kind !== "Label" || expression.params.length > 0)
|
|
765
751
|
return convertExpression(expression, false);
|
|
@@ -804,7 +790,6 @@ export const createSource = (
|
|
|
804
790
|
? { kind: "Named", level, label: token[2], isAnonymous: false }
|
|
805
791
|
: { kind: "Unnamed", level, id: getUnique(counter) };
|
|
806
792
|
|
|
807
|
-
// to_proof: a missing proof is implicitly omitted where the enclosing step is.
|
|
808
793
|
const convertProof = (
|
|
809
794
|
proof: ProofStep["proof"],
|
|
810
795
|
level: number,
|
|
@@ -830,12 +815,9 @@ export const createSource = (
|
|
|
830
815
|
method: getMethod(proof.location.range),
|
|
831
816
|
};
|
|
832
817
|
case "Steps": {
|
|
833
|
-
// A <*> first step takes the enclosing level only after PROOF, and the top level
|
|
834
|
-
// always counts as PROOF.
|
|
835
818
|
const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
|
|
836
819
|
const first = tokens[0];
|
|
837
820
|
const stepLevel = first && first[1] !== "*" && first[1] !== "+" ? Number(first[1]) : level;
|
|
838
|
-
// The parser ends the steps at the first QED.
|
|
839
821
|
const steps = proof.steps
|
|
840
822
|
.slice(0, -1)
|
|
841
823
|
.map((step, index) =>
|
|
@@ -855,8 +837,6 @@ export const createSource = (
|
|
|
855
837
|
}
|
|
856
838
|
};
|
|
857
839
|
|
|
858
|
-
// tlapm locates a USE or HIDE by its keywords and DEF clause, since its parser drops the
|
|
859
|
-
// facts' location.
|
|
860
840
|
const getUseLocus = (use: UseOrHide) =>
|
|
861
841
|
mergeLoci(
|
|
862
842
|
getRangeLocus(use.keyword),
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Deref
|
|
2
|
-
// subexpression it names, abstracted over the bound names it uses.
|
|
1
|
+
// A port of tlapm's Expr.Deref.
|
|
3
2
|
|
|
4
3
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
4
|
import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
|
|
@@ -48,7 +47,6 @@ const stripParensAndAtomic = (expression: Expr): Expr => {
|
|
|
48
47
|
return rest;
|
|
49
48
|
};
|
|
50
49
|
|
|
51
|
-
// Parentheses go everywhere but in the definitions of a LET.
|
|
52
50
|
const stripParens = (expression: Expr): Expr => {
|
|
53
51
|
if (expression.kind === "Let") {
|
|
54
52
|
return at(
|
|
@@ -63,8 +61,6 @@ const stripParens = (expression: Expr): Expr => {
|
|
|
63
61
|
const hasNegativeIndex = (expression: Expr): boolean =>
|
|
64
62
|
expression.kind === "Ix" ? expression.index <= 0 : getChildren(expression).some(hasNegativeIndex);
|
|
65
63
|
|
|
66
|
-
// Visit.iter's context for each binder, stopping at labels with other names and at declarations
|
|
67
|
-
// in an ASSUME.
|
|
68
64
|
const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch | undefined => {
|
|
69
65
|
const search = (inner: Expr, innerContext = context) => findLabel(inner, label, innerContext);
|
|
70
66
|
const searchBounds = (bounds: Bound[], body: Expr) =>
|
|
@@ -133,7 +129,6 @@ const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch
|
|
|
133
129
|
}
|
|
134
130
|
};
|
|
135
131
|
|
|
136
|
-
// The first count indices in reverse, and the rest past the parameters.
|
|
137
132
|
const getReversal = (count: number, paramCount: number) =>
|
|
138
133
|
consAll(
|
|
139
134
|
Array.from({ length: count }, (_item, index): Expr => ({ kind: "Ix", index: index + 1 })),
|
|
@@ -354,7 +349,6 @@ const getNumbered = (
|
|
|
354
349
|
return [expression.kind === "Let" ? expression.definitions : [], result];
|
|
355
350
|
};
|
|
356
351
|
|
|
357
|
-
// Reorders label arguments given in source order to the order of the label's de Bruijn indices.
|
|
358
352
|
const permute = (indices: number[], args: Expr[]) => {
|
|
359
353
|
const count = indices.length;
|
|
360
354
|
let current = indices;
|
|
@@ -513,7 +507,7 @@ const resolveSelectors = (
|
|
|
513
507
|
const expression = isLabel ? state.expression : stripParens(state.expression);
|
|
514
508
|
const count = state.definitions.length;
|
|
515
509
|
const next = ((): Resolution & { rest: Selector[]; isLabel: boolean } => {
|
|
516
|
-
const
|
|
510
|
+
const resolveNumbered = (position: number, message: string) => {
|
|
517
511
|
const [definitions, inner] = getNumbered(
|
|
518
512
|
onWarning,
|
|
519
513
|
expression,
|
|
@@ -536,11 +530,11 @@ const resolveSelectors = (
|
|
|
536
530
|
});
|
|
537
531
|
}
|
|
538
532
|
case "Number":
|
|
539
|
-
return
|
|
533
|
+
return resolveNumbered(selector.value, `Cannot resolve !${selector.value}`);
|
|
540
534
|
case "Left":
|
|
541
|
-
return
|
|
535
|
+
return resolveNumbered(1, "Cannot resolve !<<");
|
|
542
536
|
case "Right":
|
|
543
|
-
return
|
|
537
|
+
return resolveNumbered(2, "Cannot resolve !>>");
|
|
544
538
|
case "Instance":
|
|
545
539
|
return {
|
|
546
540
|
params: [],
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's E_subst
|
|
1
|
+
// A port of tlapm's E_subst.
|
|
2
2
|
|
|
3
3
|
import { TlaProofError } from "../errors";
|
|
4
4
|
import {
|
|
@@ -31,7 +31,6 @@ export const consSubstitution = (expression: Expr, rest: Substitution): Substitu
|
|
|
31
31
|
rest,
|
|
32
32
|
});
|
|
33
33
|
|
|
34
|
-
// Binds the expressions in order, so the last one becomes index 1.
|
|
35
34
|
export const consAll = (expressions: Expr[], rest: Substitution) =>
|
|
36
35
|
expressions.reduce((inner, expression) => consSubstitution(expression, inner), rest);
|
|
37
36
|
|
|
@@ -63,7 +62,6 @@ const applyIndex = (substitution: Substitution, index: number, from: Expr): Expr
|
|
|
63
62
|
export const substituteExprs = (substitution: Substitution, expressions: Expr[]) =>
|
|
64
63
|
expressions.map((expression) => substituteExpr(substitution, expression));
|
|
65
64
|
|
|
66
|
-
// Beta-reduces a lambda applied to arguments, as E_subst.normalize does.
|
|
67
65
|
export const normalizeApply = (operator: Expr, args: Expr[]): ExprCore => {
|
|
68
66
|
if (operator.kind === "Lambda") {
|
|
69
67
|
if (operator.params.length !== args.length) throw new TlaProofError("Arity mismatch");
|