tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32
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 +32 -6
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +27 -27
- package/dist/deciders.js +34 -34
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -14
- package/dist/index.d.ts +12 -14
- 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 +516 -25
- package/dist/prove.js +518 -27
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +76 -86
- package/dist/transfer.js +73 -83
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +112 -761
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +12 -36
- package/src/evaluate.ts +81 -101
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +2 -2
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- package/src/obligations/action.ts +58 -105
- package/src/obligations/{anon.ts → anonymize.ts} +44 -52
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +42 -530
- package/src/obligations/format.ts +7 -8
- package/src/obligations/generate.ts +93 -783
- package/src/obligations/index.ts +23 -23
- package/src/obligations/levels.ts +38 -44
- package/src/obligations/module.ts +106 -729
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +35 -29
- package/src/obligations/printer.ts +98 -209
- package/src/obligations/proof.ts +0 -1
- package/src/obligations/regroup.ts +100 -0
- package/src/obligations/simplify.ts +668 -0
- package/src/obligations/source.ts +92 -192
- package/src/obligations/{deref.ts → subexpression.ts} +82 -113
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +32 -30
- package/src/obligations/tuples.ts +37 -53
- package/src/parallel-worker.ts +37 -33
- package/src/parallel.ts +30 -24
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/{prove → prover}/decide-pool.ts +14 -19
- package/src/{prove → prover}/deciders.ts +7 -1
- package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
- package/src/{prove → prover}/isabelle/decide.ts +3 -6
- package/src/{prove → prover}/isabelle/encode.ts +106 -138
- package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
- package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
- package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
- package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
- package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
- package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
- package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
- package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
- package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
- package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
- package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
- package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
- package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
- package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
- package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
- package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
- package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
- package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
- package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
- package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
- package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
- package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
- package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
- package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
- package/src/{prove → prover}/ocaml.ts +1 -1
- package/src/{prove → prover}/prep/action.ts +54 -66
- package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
- package/src/{prove → prover}/prep/fingerprint.ts +3 -3
- package/src/{prove → prover}/prep/level-comparison.ts +15 -38
- package/src/{prove → prover}/prep/md5.ts +2 -9
- package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
- package/src/prover/prep/normalize.ts +309 -0
- package/src/{prove → prover}/prove-worker.ts +4 -11
- package/src/prover/prove.ts +492 -0
- package/src/{prove → prover}/ptl/encode.ts +19 -31
- package/src/{prove → prover}/smt/axioms.ts +78 -79
- package/src/{prove → prover}/smt/data.ts +16 -45
- package/src/{prove → prover}/smt/encode.ts +134 -28
- package/src/{prove → prover}/smt/extensionality.ts +14 -12
- package/src/{prove → prover}/smt/flatten.ts +3 -18
- package/src/{prove → prover}/smt/format.ts +14 -3
- package/src/{prove → prover}/smt/instances.ts +4 -5
- package/src/{prove → prover}/smt/rewrite.ts +41 -59
- package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
- package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
- package/src/{prove → prover}/smt/solver/enode.ts +1 -1
- package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
- package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
- package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
- package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
- package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
- package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
- package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
- package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
- package/src/{prove → prover}/smt/solver/solver.ts +2 -2
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
- package/src/prover/verdict.ts +13 -0
- package/src/{prove → prover}/zenon/decide.ts +5 -11
- package/src/{prove → prover}/zenon/encode.ts +40 -106
- package/src/{prove → prover}/zenon/eqrel.ts +1 -1
- package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
- package/src/{prove → prover}/zenon/expr.ts +2 -2
- package/src/{prove → prover}/zenon/index-table.ts +1 -1
- package/src/{prove → prover}/zenon/isar.ts +1 -1
- package/src/{prove → prover}/zenon/llproof.ts +1 -1
- package/src/{prove → prover}/zenon/mltoll.ts +1 -1
- package/src/{prove → prover}/zenon/node.ts +1 -1
- package/src/{prove → prover}/zenon/search.ts +1 -1
- package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
- package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +72 -67
- package/src/worker.ts +1 -4
- package/dist/run-cli.cjs +0 -38
- package/dist/run-cli.js +0 -38
- package/src/canonical.ts +0 -40
- package/src/obligations/ctx.ts +0 -64
- package/src/prove/prep/defs.ts +0 -27
- package/src/prove/prep/elab.ts +0 -156
- package/src/prove/prep/enabled.ts +0 -43
- package/src/prove/prep/flatten.ts +0 -70
- package/src/prove/prep/trivial.ts +0 -22
- package/src/prove/prove.ts +0 -417
- package/src/prove/smt/axiomatize.ts +0 -69
- package/src/prove/smt/simplify.ts +0 -57
- package/src/prove/verdict.ts +0 -13
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{prove → prover}/isabelle/LICENSE +0 -0
- /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
- /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
- /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
- /package/src/{prove → prover}/ptl/decide.ts +0 -0
- /package/src/{prove → prover}/ptl/sat.ts +0 -0
- /package/src/{prove → prover}/ptl/tableau.ts +0 -0
- /package/src/{prove → prover}/smt/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
- /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/array.ts +0 -0
- /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
- /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
- /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
- /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
- /package/src/{prove → prover}/smt/solver/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
- /package/src/{prove → prover}/smt/solver/der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
- /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
- /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
- /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
- /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
- /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
- /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
- /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
- /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
- /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
- /package/src/{prove → prover}/smt/table.ts +0 -0
- /package/src/{prove → prover}/tlaps-module.ts +0 -0
- /package/src/{prove → prover}/zenon/LICENSE +0 -0
- /package/src/{prove → prover}/zenon/check/check.ts +0 -0
- /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
- /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
- /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
- /package/src/{prove → prover}/zenon/check/records.ts +0 -0
- /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
- /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
- /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
- /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
- /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
- /package/src/{prove → prover}/zenon/limits.ts +0 -0
- /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
- /package/src/{prove → prover}/zenon/parse.ts +0 -0
- /package/src/{prove → prover}/zenon/phrase.ts +0 -0
- /package/src/{prove → prover}/zenon/proof.ts +0 -0
- /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
- /package/src/{prove → prover}/zenon/rules.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
|
@@ -18,6 +18,7 @@ import type {
|
|
|
18
18
|
import { TlaProofError, TlaUnsupportedError } from "../errors";
|
|
19
19
|
import {
|
|
20
20
|
at,
|
|
21
|
+
getFact,
|
|
21
22
|
type Bound,
|
|
22
23
|
type Builtin,
|
|
23
24
|
type Defn,
|
|
@@ -29,17 +30,17 @@ import {
|
|
|
29
30
|
type Sequent,
|
|
30
31
|
} from "./expression";
|
|
31
32
|
import type { ModuleUnit, Mule } from "./module";
|
|
32
|
-
import { readNewMethod, readOldMethod } from "./pragma";
|
|
33
|
+
import { findPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
33
34
|
import {
|
|
34
35
|
expandChoose,
|
|
35
36
|
expandFcn,
|
|
36
37
|
expandQuant,
|
|
37
38
|
expandSetOf,
|
|
38
|
-
expandSetSt,
|
|
39
39
|
getUnbounded,
|
|
40
40
|
type TuplyBound,
|
|
41
41
|
} from "./tuples";
|
|
42
|
-
import { lookupOperator, type Fixity
|
|
42
|
+
import { lookupOperator, type Fixity } from "./operators";
|
|
43
|
+
import { regroup } from "./regroup";
|
|
43
44
|
import {
|
|
44
45
|
getUnique,
|
|
45
46
|
type Counter,
|
|
@@ -81,9 +82,7 @@ const BUILTINS: Record<string, Builtin> = {
|
|
|
81
82
|
STRING: "STRING",
|
|
82
83
|
};
|
|
83
84
|
|
|
84
|
-
|
|
85
|
-
const getCanonicalName = (name: string, isPrefix = false) =>
|
|
86
|
-
isPrefix && name === "-" ? "-." : lookupOperator(name).name;
|
|
85
|
+
const getCanonicalName = (name: string) => lookupOperator(name).name;
|
|
87
86
|
|
|
88
87
|
const STEP_PATTERN = /^<(\d+|\*|\+)>([A-Za-z0-9_]*)\.*$/;
|
|
89
88
|
|
|
@@ -104,106 +103,17 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
|
|
|
104
103
|
};
|
|
105
104
|
};
|
|
106
105
|
|
|
107
|
-
type Grouping =
|
|
108
|
-
| { kind: "Attached"; expression: Expression }
|
|
109
|
-
| { kind: "Reduced"; isFinal: boolean };
|
|
110
|
-
|
|
111
|
-
const PREFIX_KEYWORDS: Partial<Record<Expression["kind"], string>> = {
|
|
112
|
-
Always: "[]",
|
|
113
|
-
Eventually: "<>",
|
|
114
|
-
Enabled: "ENABLED",
|
|
115
|
-
Unchanged: "UNCHANGED",
|
|
116
|
-
};
|
|
117
|
-
|
|
118
|
-
const isSamePosition = (left: SourceLocation | undefined, right: SourceLocation | undefined) =>
|
|
119
|
-
left !== undefined &&
|
|
120
|
-
right !== undefined &&
|
|
121
|
-
left.line === right.line &&
|
|
122
|
-
left.column === right.column;
|
|
123
|
-
|
|
124
|
-
const getStart = (expression: Expression) => expression.location.range?.start;
|
|
125
|
-
|
|
126
|
-
const getEnd = (expression: Expression) => expression.location.range?.end;
|
|
127
|
-
|
|
128
|
-
const withEnd = (expression: Expression, end: SourceLocation | undefined): Expression => {
|
|
129
|
-
const range = expression.location.range;
|
|
130
|
-
return range && end
|
|
131
|
-
? { ...expression, location: { ...expression.location, range: { ...range, end } } }
|
|
132
|
-
: expression;
|
|
133
|
-
};
|
|
134
|
-
|
|
135
|
-
// The operator an expression leaves open on tlapm's parse stack, with the operand after it.
|
|
136
|
-
const getOpenOperator = (expression: Expression) => {
|
|
137
|
-
if (expression.kind === "Apply") {
|
|
138
|
-
const operator = lookupOperator(expression.operator);
|
|
139
|
-
const isInfix = expression.args.length === 2 && operator.fixity.startsWith("Infix");
|
|
140
|
-
const isPrefix = expression.args.length === 1 && operator.fixity === "Prefix";
|
|
141
|
-
if (!isInfix && !isPrefix) return undefined;
|
|
142
|
-
const last = expression.args.length - 1;
|
|
143
|
-
return {
|
|
144
|
-
operator,
|
|
145
|
-
isInfix,
|
|
146
|
-
operand: expression.args[last],
|
|
147
|
-
replace: (operand: Expression): Expression => ({
|
|
148
|
-
...expression,
|
|
149
|
-
args: [...expression.args.slice(0, last), operand],
|
|
150
|
-
}),
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
|
-
const keyword = PREFIX_KEYWORDS[expression.kind];
|
|
154
|
-
if (keyword === undefined || !("expression" in expression)) return undefined;
|
|
155
|
-
return {
|
|
156
|
-
operator: lookupOperator(keyword),
|
|
157
|
-
isInfix: false,
|
|
158
|
-
operand: expression.expression,
|
|
159
|
-
replace: (operand: Expression): Expression => ({ ...expression, expression: operand }),
|
|
160
|
-
};
|
|
161
|
-
};
|
|
162
|
-
|
|
163
|
-
const isBelow = (left: Operator, right: Operator) => left.high < right.low;
|
|
164
|
-
|
|
165
|
-
// Pco.resolve: tlapm's parser lets an operator take in every later infix operator that is not
|
|
166
|
-
// entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
|
|
167
|
-
// This regroups an infix application the way tlapm does.
|
|
168
|
-
const regroup = (expression: Extract<Expression, { kind: "Apply" }>): Expression => {
|
|
169
|
-
const operator = lookupOperator(expression.operator);
|
|
170
|
-
const [left, right] = expression.args;
|
|
171
|
-
const end = getEnd(expression);
|
|
172
|
-
const getInfix = (operand: Expression): Expression => {
|
|
173
|
-
const range = expression.location.range;
|
|
174
|
-
const start = getStart(operand);
|
|
175
|
-
return {
|
|
176
|
-
...expression,
|
|
177
|
-
args: [operand, right],
|
|
178
|
-
location:
|
|
179
|
-
range && start
|
|
180
|
-
? { ...expression.location, range: { ...range, start } }
|
|
181
|
-
: expression.location,
|
|
182
|
-
};
|
|
183
|
-
};
|
|
184
|
-
const attach = (node: Expression, isOpen: boolean): Grouping => {
|
|
185
|
-
const open = isOpen ? getOpenOperator(node) : undefined;
|
|
186
|
-
if (!open) return { kind: "Reduced", isFinal: false };
|
|
187
|
-
const inner = attach(open.operand, isSamePosition(getEnd(open.operand), getEnd(node)));
|
|
188
|
-
if (inner.kind === "Attached")
|
|
189
|
-
return { kind: "Attached", expression: withEnd(open.replace(inner.expression), end) };
|
|
190
|
-
const isReduced =
|
|
191
|
-
!inner.isFinal &&
|
|
192
|
-
(isBelow(operator, open.operator) ||
|
|
193
|
-
(open.isInfix &&
|
|
194
|
-
operator.fixity === "InfixLeft" &&
|
|
195
|
-
open.operator.fixity === "InfixLeft" &&
|
|
196
|
-
!isBelow(open.operator, operator)));
|
|
197
|
-
if (isReduced) return { kind: "Reduced", isFinal: !isBelow(operator, open.operator) };
|
|
198
|
-
return { kind: "Attached", expression: withEnd(open.replace(getInfix(open.operand)), end) };
|
|
199
|
-
};
|
|
200
|
-
const grouping = attach(left, isSamePosition(getStart(left), getStart(expression)));
|
|
201
|
-
return grouping.kind === "Attached" ? grouping.expression : expression;
|
|
202
|
-
};
|
|
203
|
-
|
|
204
106
|
const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
|
|
205
107
|
|
|
206
|
-
|
|
108
|
+
const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
|
|
109
|
+
index > 0 && bounds[index - 1].set === bounds[index].set;
|
|
110
|
+
|
|
111
|
+
export const createSource = (
|
|
112
|
+
file: string,
|
|
113
|
+
text: string,
|
|
114
|
+
counter: Counter,
|
|
115
|
+
isExpandingTuples: boolean,
|
|
116
|
+
) => {
|
|
207
117
|
const lines = text.split("\n");
|
|
208
118
|
|
|
209
119
|
const getRangeLocus = (range: SourceRange): Locus => ({
|
|
@@ -215,18 +125,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
215
125
|
});
|
|
216
126
|
|
|
217
127
|
const withPragma = (locus: Locus) => {
|
|
218
|
-
const
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
const
|
|
222
|
-
while (isBlank(line[position.column])) position.column++;
|
|
223
|
-
if (position.column < line.length) break;
|
|
224
|
-
position.line++;
|
|
225
|
-
position.column = 0;
|
|
226
|
-
}
|
|
227
|
-
if (!(lines[position.line] ?? "").startsWith("(*{", position.column)) return locus;
|
|
228
|
-
for (let index = position.line; index < lines.length; index++) {
|
|
229
|
-
const close = lines[index].indexOf("}*)", index === position.line ? position.column : 0);
|
|
128
|
+
const open = findPragma(lines, { line: locus.endLine - 1, column: locus.endColumn - 1 });
|
|
129
|
+
if (!open) return locus;
|
|
130
|
+
for (let index = open.line; index < lines.length; index++) {
|
|
131
|
+
const close = lines[index].indexOf("}*)", index === open.line ? open.column : 0);
|
|
230
132
|
if (close !== -1) return { ...locus, endLine: index + 1, endColumn: close + 4 };
|
|
231
133
|
}
|
|
232
134
|
return locus;
|
|
@@ -248,26 +150,18 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
248
150
|
return method ? at({ kind: "With", expression, method }, expression) : expression;
|
|
249
151
|
};
|
|
250
152
|
|
|
251
|
-
const
|
|
153
|
+
const getPointLocus = (location: SourceLocation, length: number): Locus => ({
|
|
252
154
|
file,
|
|
253
155
|
startLine: location.line,
|
|
254
156
|
startColumn: location.column,
|
|
255
157
|
endLine: location.line,
|
|
256
|
-
endColumn: location.column +
|
|
158
|
+
endColumn: location.column + length,
|
|
257
159
|
});
|
|
258
160
|
|
|
259
161
|
const getLocus = (location: SourceLocation): Locus =>
|
|
260
|
-
location.range
|
|
261
|
-
? getRangeLocus(location.range)
|
|
262
|
-
: {
|
|
263
|
-
file,
|
|
264
|
-
startLine: location.line,
|
|
265
|
-
startColumn: location.column,
|
|
266
|
-
endLine: location.line,
|
|
267
|
-
endColumn: location.column + 1,
|
|
268
|
-
};
|
|
162
|
+
location.range ? getRangeLocus(location.range) : getPointLocus(location, 1);
|
|
269
163
|
|
|
270
|
-
const
|
|
164
|
+
const convertOperator = (name: string, location: Locus | undefined): Expr => {
|
|
271
165
|
const canonical = getCanonicalName(name);
|
|
272
166
|
const builtin = BUILTINS[canonical];
|
|
273
167
|
return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
|
|
@@ -276,7 +170,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
276
170
|
};
|
|
277
171
|
|
|
278
172
|
// A name with ! selects through instances, which anonymization resolves by joining the names.
|
|
279
|
-
const
|
|
173
|
+
const convertName = (
|
|
280
174
|
name: string,
|
|
281
175
|
args: Expr[],
|
|
282
176
|
location: Locus,
|
|
@@ -321,11 +215,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
321
215
|
bounds.map((bound, index) => {
|
|
322
216
|
if (bound.pattern.kind === "Tuple")
|
|
323
217
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
324
|
-
const isDitto = index > 0 && bounds[index - 1].set === bound.set;
|
|
325
218
|
return {
|
|
326
219
|
name: bound.pattern.name,
|
|
327
220
|
level: "Constant",
|
|
328
|
-
domain: isDitto
|
|
221
|
+
domain: isDitto(bounds, index)
|
|
329
222
|
? { kind: "Ditto" }
|
|
330
223
|
: { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
|
|
331
224
|
};
|
|
@@ -339,18 +232,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
339
232
|
const domain = convertExpression(bound.set, isExcept);
|
|
340
233
|
if (bound.pattern.kind === "Tuple")
|
|
341
234
|
return { kind: "Tuple", names: bound.pattern.names, domain };
|
|
342
|
-
const isDitto = index > 0 && bounds[index - 1].set === bound.set;
|
|
343
235
|
return {
|
|
344
236
|
kind: "Name",
|
|
345
237
|
name: bound.pattern.name,
|
|
346
|
-
domain: isDitto ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
|
|
238
|
+
domain: isDitto(bounds, index) ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
|
|
347
239
|
};
|
|
348
240
|
});
|
|
349
241
|
|
|
350
|
-
const expandTuples = (
|
|
351
|
-
if (!
|
|
242
|
+
const expandTuples = (expanded: Expr, location: Locus) => {
|
|
243
|
+
if (!isExpandingTuples)
|
|
352
244
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
353
|
-
return at(
|
|
245
|
+
return at(expanded, { location });
|
|
354
246
|
};
|
|
355
247
|
|
|
356
248
|
const hasTuple = (bounds: QuantifierExpression["bounds"]) =>
|
|
@@ -402,7 +294,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
402
294
|
return at({ kind: "String", value: written?.[1] ?? expression.value }, { location });
|
|
403
295
|
}
|
|
404
296
|
case "Identifier":
|
|
405
|
-
return
|
|
297
|
+
return convertName(expression.name, [], location);
|
|
406
298
|
case "Apply": {
|
|
407
299
|
if (expression.args.length === 2) {
|
|
408
300
|
const regrouped = regroup(expression);
|
|
@@ -412,14 +304,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
412
304
|
const operator = lookupOperator(expression.operator);
|
|
413
305
|
if (operator.fixity !== "Nonfix") {
|
|
414
306
|
return at(
|
|
415
|
-
{ kind: "Apply", operator:
|
|
307
|
+
{ kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
|
|
416
308
|
{ location: getOperatorLocus(args, operator.fixity) },
|
|
417
309
|
);
|
|
418
310
|
}
|
|
419
|
-
return
|
|
311
|
+
return convertName(expression.operator, args, location, expression.argumentCounts);
|
|
420
312
|
}
|
|
421
313
|
case "OperatorReference":
|
|
422
|
-
return
|
|
314
|
+
return convertOperator(expression.operator, location);
|
|
423
315
|
case "Lambda":
|
|
424
316
|
return at(
|
|
425
317
|
{
|
|
@@ -493,9 +385,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
493
385
|
case "Forall":
|
|
494
386
|
case "Exists":
|
|
495
387
|
if (hasTuple(expression.bounds)) {
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
388
|
+
return expandTuples(
|
|
389
|
+
expandQuant(
|
|
390
|
+
expression.kind,
|
|
391
|
+
getTuplyBounds(expression.bounds, isExcept),
|
|
392
|
+
recurse(expression.body),
|
|
393
|
+
),
|
|
394
|
+
location,
|
|
395
|
+
);
|
|
499
396
|
}
|
|
500
397
|
return at(
|
|
501
398
|
{
|
|
@@ -518,10 +415,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
518
415
|
}
|
|
519
416
|
case "Choose":
|
|
520
417
|
if (expression.pattern.kind === "Tuple") {
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
418
|
+
return expandTuples(
|
|
419
|
+
expandChoose(
|
|
420
|
+
{ kind: "Choose", domain: expression.set && recurse(expression.set) },
|
|
421
|
+
expression.pattern.names,
|
|
422
|
+
recurse(expression.body),
|
|
423
|
+
),
|
|
424
|
+
location,
|
|
425
|
+
);
|
|
525
426
|
}
|
|
526
427
|
return at(
|
|
527
428
|
{
|
|
@@ -536,10 +437,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
536
437
|
return at({ kind: "SetEnum", elements: expression.elements.map(recurse) }, { location });
|
|
537
438
|
case "SetFilter":
|
|
538
439
|
if (expression.bound.pattern.kind === "Tuple") {
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
440
|
+
return expandTuples(
|
|
441
|
+
expandChoose(
|
|
442
|
+
{ kind: "SetSt", domain: recurse(expression.bound.set) },
|
|
443
|
+
expression.bound.pattern.names,
|
|
444
|
+
recurse(expression.predicate),
|
|
445
|
+
),
|
|
446
|
+
location,
|
|
447
|
+
);
|
|
543
448
|
}
|
|
544
449
|
return at(
|
|
545
450
|
{
|
|
@@ -552,9 +457,13 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
552
457
|
);
|
|
553
458
|
case "SetMap":
|
|
554
459
|
if (hasTuple(expression.bounds)) {
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
460
|
+
return expandTuples(
|
|
461
|
+
expandSetOf(
|
|
462
|
+
recurse(expression.expression),
|
|
463
|
+
getTuplyBounds(expression.bounds, isExcept),
|
|
464
|
+
),
|
|
465
|
+
location,
|
|
466
|
+
);
|
|
558
467
|
}
|
|
559
468
|
return at(
|
|
560
469
|
{
|
|
@@ -579,9 +488,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
579
488
|
);
|
|
580
489
|
case "FunctionConstruction":
|
|
581
490
|
if (hasTuple(expression.bounds)) {
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
491
|
+
return expandTuples(
|
|
492
|
+
expandFcn(getTuplyBounds(expression.bounds, isExcept), recurse(expression.body)),
|
|
493
|
+
location,
|
|
494
|
+
);
|
|
585
495
|
}
|
|
586
496
|
return at(
|
|
587
497
|
{
|
|
@@ -768,17 +678,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
768
678
|
location,
|
|
769
679
|
};
|
|
770
680
|
}
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
|
|
774
|
-
|
|
681
|
+
// A prefix minus is the operator -.
|
|
682
|
+
const name =
|
|
683
|
+
definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
|
|
684
|
+
? "-."
|
|
685
|
+
: getCanonicalName(definition.name);
|
|
775
686
|
const body = convertExpression(definition.body, isExcept);
|
|
776
687
|
if (definition.kind === "Function" && hasTuple(definition.bounds)) {
|
|
777
|
-
const bounds = getTuplyBounds(definition.bounds, isExcept);
|
|
778
688
|
return {
|
|
779
689
|
kind: "Operator",
|
|
780
690
|
name,
|
|
781
|
-
body: expandTuples(
|
|
691
|
+
body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
|
|
782
692
|
location,
|
|
783
693
|
};
|
|
784
694
|
}
|
|
@@ -800,7 +710,9 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
800
710
|
params: definition.params.map((param) => ({
|
|
801
711
|
name: getCanonicalName(param.name),
|
|
802
712
|
shape: param.arity,
|
|
803
|
-
...(param.location && {
|
|
713
|
+
...(param.location && {
|
|
714
|
+
location: getPointLocus(param.location, param.name.length),
|
|
715
|
+
}),
|
|
804
716
|
})),
|
|
805
717
|
body,
|
|
806
718
|
},
|
|
@@ -834,24 +746,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
834
746
|
return {
|
|
835
747
|
context: statement.assumptions.map((assumption): Hyp => {
|
|
836
748
|
if (assumption.kind === "NewSymbol") return convertNewSymbol(assumption);
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
};
|
|
846
|
-
}
|
|
847
|
-
const expression = convertFactLabel(assumption);
|
|
848
|
-
return {
|
|
849
|
-
kind: "Fact",
|
|
850
|
-
expression,
|
|
851
|
-
visibility: "Visible",
|
|
852
|
-
time: "Now",
|
|
853
|
-
location: expression.location,
|
|
854
|
-
};
|
|
749
|
+
const expression =
|
|
750
|
+
assumption.kind === "AssumeProve"
|
|
751
|
+
? at(
|
|
752
|
+
{ kind: "Sequent", sequent: convertSequent(assumption) },
|
|
753
|
+
{ location: getLocus(assumption.location) },
|
|
754
|
+
)
|
|
755
|
+
: convertFactLabel(assumption);
|
|
756
|
+
return getFact(expression, "Visible", "Now", expression.location);
|
|
855
757
|
}),
|
|
856
758
|
active: convertExpression(statement.conclusion, false),
|
|
857
759
|
};
|
|
@@ -897,12 +799,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
897
799
|
defs: use.defs.map(convertDef),
|
|
898
800
|
});
|
|
899
801
|
|
|
900
|
-
const getStepNumber = (token: RegExpExecArray | null, level: number): StepNumber =>
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
: { kind: "Named", level, label, isAnonymous: false };
|
|
905
|
-
};
|
|
802
|
+
const getStepNumber = (token: RegExpExecArray | null, level: number): StepNumber =>
|
|
803
|
+
token?.[2]
|
|
804
|
+
? { kind: "Named", level, label: token[2], isAnonymous: false }
|
|
805
|
+
: { kind: "Unnamed", level, id: getUnique(counter) };
|
|
906
806
|
|
|
907
807
|
// to_proof: a missing proof is implicitly omitted where the enclosing step is.
|
|
908
808
|
const convertProof = (
|
|
@@ -970,7 +870,6 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
970
870
|
const proof = convertProof(step.proof, level + 1, head);
|
|
971
871
|
return { ...make(proof), location: mergeLoci(head, proof.location), step: number };
|
|
972
872
|
};
|
|
973
|
-
const plain = (converted: Step): Step => ({ ...converted, location: head, step: number });
|
|
974
873
|
const withStepMethod = (converted: Step): Step => ({
|
|
975
874
|
...converted,
|
|
976
875
|
...withMethod(step.head),
|
|
@@ -998,10 +897,12 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
998
897
|
case "Instance":
|
|
999
898
|
throw new TlaProofError("Unexpected keyword INSTANCE");
|
|
1000
899
|
case "Define":
|
|
1001
|
-
return
|
|
900
|
+
return {
|
|
1002
901
|
kind: "Define",
|
|
1003
902
|
definitions: body.definitions.map((definition) => convertDefinition(definition)),
|
|
1004
|
-
|
|
903
|
+
location: head,
|
|
904
|
+
step: number,
|
|
905
|
+
};
|
|
1005
906
|
case "Have":
|
|
1006
907
|
return withStepMethod({
|
|
1007
908
|
kind: "Have",
|
|
@@ -1128,7 +1029,6 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
1128
1029
|
return {
|
|
1129
1030
|
kind: "Mutate",
|
|
1130
1031
|
mode: unit.use.kind,
|
|
1131
|
-
isSuppressed: false,
|
|
1132
1032
|
usable: convertUsable(unit.use),
|
|
1133
1033
|
location: getUseLocus(unit.use),
|
|
1134
1034
|
};
|