tla-ts 0.0.4 → 0.0.5
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 +37 -126
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +46 -12
- package/dist/index.d.ts +46 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +76 -92
- package/dist/transfer.js +76 -92
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1153
- 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} +115 -721
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +43 -22
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +97 -35
- package/src/evaluate.ts +361 -181
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +10 -0
- 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} +207 -141
- package/src/liveness.ts +38 -34
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +172 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +39 -51
- package/src/parallel.ts +39 -66
- 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/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- 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 +21 -22
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +39 -23
- 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 -190
- 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/{tlc-version.ts → tlc/version.ts} +8 -7
- package/src/transfer.ts +32 -32
- package/src/values.ts +166 -111
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -55
- package/dist/run-cli.js +0 -55
- package/src/canonical.ts +0 -40
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
|
@@ -14,10 +14,11 @@ import type {
|
|
|
14
14
|
SourceLocation,
|
|
15
15
|
SourceRange,
|
|
16
16
|
UseOrHide,
|
|
17
|
-
} from "
|
|
18
|
-
import { TlaProofError, TlaUnsupportedError } from "
|
|
17
|
+
} from "../ast";
|
|
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,
|
|
@@ -27,18 +28,19 @@ import {
|
|
|
27
28
|
type Locus,
|
|
28
29
|
type Selector,
|
|
29
30
|
type Sequent,
|
|
30
|
-
} from "./
|
|
31
|
-
import type { ModuleUnit, Mule } from "./
|
|
31
|
+
} from "./expression";
|
|
32
|
+
import type { ModuleUnit, Mule } from "./module";
|
|
33
|
+
import { findPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
32
34
|
import {
|
|
33
35
|
expandChoose,
|
|
34
36
|
expandFcn,
|
|
35
37
|
expandQuant,
|
|
36
38
|
expandSetOf,
|
|
37
|
-
expandSetSt,
|
|
38
39
|
getUnbounded,
|
|
39
40
|
type TuplyBound,
|
|
40
|
-
} from "./
|
|
41
|
-
import { lookupOperator, type Fixity
|
|
41
|
+
} from "./tuples";
|
|
42
|
+
import { lookupOperator, type Fixity } from "./operators";
|
|
43
|
+
import { regroup } from "./regroup";
|
|
42
44
|
import {
|
|
43
45
|
getUnique,
|
|
44
46
|
type Counter,
|
|
@@ -47,7 +49,7 @@ import {
|
|
|
47
49
|
type StepNumber,
|
|
48
50
|
type UseDef,
|
|
49
51
|
type Usable,
|
|
50
|
-
} from "./
|
|
52
|
+
} from "./proof";
|
|
51
53
|
|
|
52
54
|
const BUILTINS: Record<string, Builtin> = {
|
|
53
55
|
"=>": "Implies",
|
|
@@ -80,9 +82,7 @@ const BUILTINS: Record<string, Builtin> = {
|
|
|
80
82
|
STRING: "STRING",
|
|
81
83
|
};
|
|
82
84
|
|
|
83
|
-
|
|
84
|
-
const getCanonicalName = (name: string, isPrefix = false) =>
|
|
85
|
-
isPrefix && name === "-" ? "-." : lookupOperator(name).name;
|
|
85
|
+
const getCanonicalName = (name: string) => lookupOperator(name).name;
|
|
86
86
|
|
|
87
87
|
const STEP_PATTERN = /^<(\d+|\*|\+)>([A-Za-z0-9_]*)\.*$/;
|
|
88
88
|
|
|
@@ -103,106 +103,17 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
|
|
|
103
103
|
};
|
|
104
104
|
};
|
|
105
105
|
|
|
106
|
-
type Grouping =
|
|
107
|
-
| { kind: "Attached"; expression: Expression }
|
|
108
|
-
| { kind: "Reduced"; isFinal: boolean };
|
|
109
|
-
|
|
110
|
-
const PREFIX_KEYWORDS: Partial<Record<Expression["kind"], string>> = {
|
|
111
|
-
Always: "[]",
|
|
112
|
-
Eventually: "<>",
|
|
113
|
-
Enabled: "ENABLED",
|
|
114
|
-
Unchanged: "UNCHANGED",
|
|
115
|
-
};
|
|
116
|
-
|
|
117
|
-
const isSamePosition = (left: SourceLocation | undefined, right: SourceLocation | undefined) =>
|
|
118
|
-
left !== undefined &&
|
|
119
|
-
right !== undefined &&
|
|
120
|
-
left.line === right.line &&
|
|
121
|
-
left.column === right.column;
|
|
122
|
-
|
|
123
|
-
const getStart = (expression: Expression) => expression.location.range?.start;
|
|
124
|
-
|
|
125
|
-
const getEnd = (expression: Expression) => expression.location.range?.end;
|
|
126
|
-
|
|
127
|
-
const withEnd = (expression: Expression, end: SourceLocation | undefined): Expression => {
|
|
128
|
-
const range = expression.location.range;
|
|
129
|
-
return range && end
|
|
130
|
-
? { ...expression, location: { ...expression.location, range: { ...range, end } } }
|
|
131
|
-
: expression;
|
|
132
|
-
};
|
|
133
|
-
|
|
134
|
-
// The operator an expression leaves open on tlapm's parse stack, with the operand after it.
|
|
135
|
-
const getOpenOperator = (expression: Expression) => {
|
|
136
|
-
if (expression.kind === "Apply") {
|
|
137
|
-
const operator = lookupOperator(expression.operator);
|
|
138
|
-
const isInfix = expression.args.length === 2 && operator.fixity.startsWith("Infix");
|
|
139
|
-
const isPrefix = expression.args.length === 1 && operator.fixity === "Prefix";
|
|
140
|
-
if (!isInfix && !isPrefix) return undefined;
|
|
141
|
-
const last = expression.args.length - 1;
|
|
142
|
-
return {
|
|
143
|
-
operator,
|
|
144
|
-
isInfix,
|
|
145
|
-
operand: expression.args[last],
|
|
146
|
-
replace: (operand: Expression): Expression => ({
|
|
147
|
-
...expression,
|
|
148
|
-
args: [...expression.args.slice(0, last), operand],
|
|
149
|
-
}),
|
|
150
|
-
};
|
|
151
|
-
}
|
|
152
|
-
const keyword = PREFIX_KEYWORDS[expression.kind];
|
|
153
|
-
if (keyword === undefined || !("expression" in expression)) return undefined;
|
|
154
|
-
return {
|
|
155
|
-
operator: lookupOperator(keyword),
|
|
156
|
-
isInfix: false,
|
|
157
|
-
operand: expression.expression,
|
|
158
|
-
replace: (operand: Expression): Expression => ({ ...expression, expression: operand }),
|
|
159
|
-
};
|
|
160
|
-
};
|
|
161
|
-
|
|
162
|
-
const isBelow = (left: Operator, right: Operator) => left.high < right.low;
|
|
163
|
-
|
|
164
|
-
// Pco.resolve: tlapm's parser lets an operator take in every later infix operator that is not
|
|
165
|
-
// entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
|
|
166
|
-
// This regroups an infix application the way tlapm does.
|
|
167
|
-
const regroup = (expression: Extract<Expression, { kind: "Apply" }>): Expression => {
|
|
168
|
-
const operator = lookupOperator(expression.operator);
|
|
169
|
-
const [left, right] = expression.args;
|
|
170
|
-
const end = getEnd(expression);
|
|
171
|
-
const getInfix = (operand: Expression): Expression => {
|
|
172
|
-
const range = expression.location.range;
|
|
173
|
-
const start = getStart(operand);
|
|
174
|
-
return {
|
|
175
|
-
...expression,
|
|
176
|
-
args: [operand, right],
|
|
177
|
-
location:
|
|
178
|
-
range && start
|
|
179
|
-
? { ...expression.location, range: { ...range, start } }
|
|
180
|
-
: expression.location,
|
|
181
|
-
};
|
|
182
|
-
};
|
|
183
|
-
const attach = (node: Expression, isOpen: boolean): Grouping => {
|
|
184
|
-
const open = isOpen ? getOpenOperator(node) : undefined;
|
|
185
|
-
if (!open) return { kind: "Reduced", isFinal: false };
|
|
186
|
-
const inner = attach(open.operand, isSamePosition(getEnd(open.operand), getEnd(node)));
|
|
187
|
-
if (inner.kind === "Attached")
|
|
188
|
-
return { kind: "Attached", expression: withEnd(open.replace(inner.expression), end) };
|
|
189
|
-
const isReduced =
|
|
190
|
-
!inner.isFinal &&
|
|
191
|
-
(isBelow(operator, open.operator) ||
|
|
192
|
-
(open.isInfix &&
|
|
193
|
-
operator.fixity === "InfixLeft" &&
|
|
194
|
-
open.operator.fixity === "InfixLeft" &&
|
|
195
|
-
!isBelow(open.operator, operator)));
|
|
196
|
-
if (isReduced) return { kind: "Reduced", isFinal: !isBelow(operator, open.operator) };
|
|
197
|
-
return { kind: "Attached", expression: withEnd(open.replace(getInfix(open.operand)), end) };
|
|
198
|
-
};
|
|
199
|
-
const grouping = attach(left, isSamePosition(getStart(left), getStart(expression)));
|
|
200
|
-
return grouping.kind === "Attached" ? grouping.expression : expression;
|
|
201
|
-
};
|
|
202
|
-
|
|
203
106
|
const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
|
|
204
107
|
|
|
205
|
-
|
|
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
|
+
) => {
|
|
206
117
|
const lines = text.split("\n");
|
|
207
118
|
|
|
208
119
|
const getRangeLocus = (range: SourceRange): Locus => ({
|
|
@@ -214,43 +125,43 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
214
125
|
});
|
|
215
126
|
|
|
216
127
|
const withPragma = (locus: Locus) => {
|
|
217
|
-
const
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
const
|
|
221
|
-
while (isBlank(line[position.column])) position.column++;
|
|
222
|
-
if (position.column < line.length) break;
|
|
223
|
-
position.line++;
|
|
224
|
-
position.column = 0;
|
|
225
|
-
}
|
|
226
|
-
if (!(lines[position.line] ?? "").startsWith("(*{", position.column)) return locus;
|
|
227
|
-
for (let index = position.line; index < lines.length; index++) {
|
|
228
|
-
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);
|
|
229
132
|
if (close !== -1) return { ...locus, endLine: index + 1, endColumn: close + 4 };
|
|
230
133
|
}
|
|
231
134
|
return locus;
|
|
232
135
|
};
|
|
233
136
|
|
|
234
|
-
const
|
|
137
|
+
const getMethod = (range: SourceRange | undefined) =>
|
|
138
|
+
range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
|
|
139
|
+
|
|
140
|
+
// A method pragma belongs to the node it follows, whose locus then takes it in.
|
|
141
|
+
const withMethod = (range: SourceRange) => {
|
|
142
|
+
const method = getMethod(range);
|
|
143
|
+
const location = getRangeLocus(range);
|
|
144
|
+
return method ? { location: withPragma(location), method } : { location };
|
|
145
|
+
};
|
|
146
|
+
|
|
147
|
+
// Module.Parser's with_meth, which wraps the expression a method follows.
|
|
148
|
+
const withExpressionMethod = (expression: Expr, range: SourceRange | undefined): Expr => {
|
|
149
|
+
const method = getMethod(range);
|
|
150
|
+
return method ? at({ kind: "With", expression, method }, expression) : expression;
|
|
151
|
+
};
|
|
152
|
+
|
|
153
|
+
const getPointLocus = (location: SourceLocation, length: number): Locus => ({
|
|
235
154
|
file,
|
|
236
155
|
startLine: location.line,
|
|
237
156
|
startColumn: location.column,
|
|
238
157
|
endLine: location.line,
|
|
239
|
-
endColumn: location.column +
|
|
158
|
+
endColumn: location.column + length,
|
|
240
159
|
});
|
|
241
160
|
|
|
242
161
|
const getLocus = (location: SourceLocation): Locus =>
|
|
243
|
-
location.range
|
|
244
|
-
? getRangeLocus(location.range)
|
|
245
|
-
: {
|
|
246
|
-
file,
|
|
247
|
-
startLine: location.line,
|
|
248
|
-
startColumn: location.column,
|
|
249
|
-
endLine: location.line,
|
|
250
|
-
endColumn: location.column + 1,
|
|
251
|
-
};
|
|
162
|
+
location.range ? getRangeLocus(location.range) : getPointLocus(location, 1);
|
|
252
163
|
|
|
253
|
-
const
|
|
164
|
+
const convertOperator = (name: string, location: Locus | undefined): Expr => {
|
|
254
165
|
const canonical = getCanonicalName(name);
|
|
255
166
|
const builtin = BUILTINS[canonical];
|
|
256
167
|
return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
|
|
@@ -259,7 +170,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
259
170
|
};
|
|
260
171
|
|
|
261
172
|
// A name with ! selects through instances, which anonymization resolves by joining the names.
|
|
262
|
-
const
|
|
173
|
+
const convertName = (
|
|
263
174
|
name: string,
|
|
264
175
|
args: Expr[],
|
|
265
176
|
location: Locus,
|
|
@@ -304,11 +215,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
304
215
|
bounds.map((bound, index) => {
|
|
305
216
|
if (bound.pattern.kind === "Tuple")
|
|
306
217
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
307
|
-
const isDitto = index > 0 && bounds[index - 1].set === bound.set;
|
|
308
218
|
return {
|
|
309
219
|
name: bound.pattern.name,
|
|
310
220
|
level: "Constant",
|
|
311
|
-
domain: isDitto
|
|
221
|
+
domain: isDitto(bounds, index)
|
|
312
222
|
? { kind: "Ditto" }
|
|
313
223
|
: { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
|
|
314
224
|
};
|
|
@@ -322,18 +232,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
322
232
|
const domain = convertExpression(bound.set, isExcept);
|
|
323
233
|
if (bound.pattern.kind === "Tuple")
|
|
324
234
|
return { kind: "Tuple", names: bound.pattern.names, domain };
|
|
325
|
-
const isDitto = index > 0 && bounds[index - 1].set === bound.set;
|
|
326
235
|
return {
|
|
327
236
|
kind: "Name",
|
|
328
237
|
name: bound.pattern.name,
|
|
329
|
-
domain: isDitto ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
|
|
238
|
+
domain: isDitto(bounds, index) ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
|
|
330
239
|
};
|
|
331
240
|
});
|
|
332
241
|
|
|
333
|
-
const expandTuples = (
|
|
334
|
-
if (!
|
|
242
|
+
const expandTuples = (expanded: Expr, location: Locus) => {
|
|
243
|
+
if (!isExpandingTuples)
|
|
335
244
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
336
|
-
return at(
|
|
245
|
+
return at(expanded, { location });
|
|
337
246
|
};
|
|
338
247
|
|
|
339
248
|
const hasTuple = (bounds: QuantifierExpression["bounds"]) =>
|
|
@@ -376,10 +285,16 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
376
285
|
const [integer, fraction] = expression.text.split(".");
|
|
377
286
|
return at({ kind: "Num", integer, fraction }, { location });
|
|
378
287
|
}
|
|
379
|
-
case "String":
|
|
380
|
-
|
|
288
|
+
case "String": {
|
|
289
|
+
// tlapm's lexer keeps a string's escapes as written. The location ends at the closing
|
|
290
|
+
// quote.
|
|
291
|
+
const written = /"((?:[^"\\]|\\.)*)"$/.exec(
|
|
292
|
+
(lines[location.endLine - 1] ?? "").slice(0, location.endColumn - 1),
|
|
293
|
+
);
|
|
294
|
+
return at({ kind: "String", value: written?.[1] ?? expression.value }, { location });
|
|
295
|
+
}
|
|
381
296
|
case "Identifier":
|
|
382
|
-
return
|
|
297
|
+
return convertName(expression.name, [], location);
|
|
383
298
|
case "Apply": {
|
|
384
299
|
if (expression.args.length === 2) {
|
|
385
300
|
const regrouped = regroup(expression);
|
|
@@ -389,14 +304,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
389
304
|
const operator = lookupOperator(expression.operator);
|
|
390
305
|
if (operator.fixity !== "Nonfix") {
|
|
391
306
|
return at(
|
|
392
|
-
{ kind: "Apply", operator:
|
|
307
|
+
{ kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
|
|
393
308
|
{ location: getOperatorLocus(args, operator.fixity) },
|
|
394
309
|
);
|
|
395
310
|
}
|
|
396
|
-
return
|
|
311
|
+
return convertName(expression.operator, args, location, expression.argumentCounts);
|
|
397
312
|
}
|
|
398
313
|
case "OperatorReference":
|
|
399
|
-
return
|
|
314
|
+
return convertOperator(expression.operator, location);
|
|
400
315
|
case "Lambda":
|
|
401
316
|
return at(
|
|
402
317
|
{
|
|
@@ -470,9 +385,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
470
385
|
case "Forall":
|
|
471
386
|
case "Exists":
|
|
472
387
|
if (hasTuple(expression.bounds)) {
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
388
|
+
return expandTuples(
|
|
389
|
+
expandQuant(
|
|
390
|
+
expression.kind,
|
|
391
|
+
getTuplyBounds(expression.bounds, isExcept),
|
|
392
|
+
recurse(expression.body),
|
|
393
|
+
),
|
|
394
|
+
location,
|
|
395
|
+
);
|
|
476
396
|
}
|
|
477
397
|
return at(
|
|
478
398
|
{
|
|
@@ -495,10 +415,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
495
415
|
}
|
|
496
416
|
case "Choose":
|
|
497
417
|
if (expression.pattern.kind === "Tuple") {
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
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
|
+
);
|
|
502
426
|
}
|
|
503
427
|
return at(
|
|
504
428
|
{
|
|
@@ -513,10 +437,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
513
437
|
return at({ kind: "SetEnum", elements: expression.elements.map(recurse) }, { location });
|
|
514
438
|
case "SetFilter":
|
|
515
439
|
if (expression.bound.pattern.kind === "Tuple") {
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
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
|
+
);
|
|
520
448
|
}
|
|
521
449
|
return at(
|
|
522
450
|
{
|
|
@@ -529,9 +457,13 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
529
457
|
);
|
|
530
458
|
case "SetMap":
|
|
531
459
|
if (hasTuple(expression.bounds)) {
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
460
|
+
return expandTuples(
|
|
461
|
+
expandSetOf(
|
|
462
|
+
recurse(expression.expression),
|
|
463
|
+
getTuplyBounds(expression.bounds, isExcept),
|
|
464
|
+
),
|
|
465
|
+
location,
|
|
466
|
+
);
|
|
535
467
|
}
|
|
536
468
|
return at(
|
|
537
469
|
{
|
|
@@ -556,9 +488,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
556
488
|
);
|
|
557
489
|
case "FunctionConstruction":
|
|
558
490
|
if (hasTuple(expression.bounds)) {
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
491
|
+
return expandTuples(
|
|
492
|
+
expandFcn(getTuplyBounds(expression.bounds, isExcept), recurse(expression.body)),
|
|
493
|
+
location,
|
|
494
|
+
);
|
|
562
495
|
}
|
|
563
496
|
return at(
|
|
564
497
|
{
|
|
@@ -745,17 +678,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
745
678
|
location,
|
|
746
679
|
};
|
|
747
680
|
}
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
|
|
751
|
-
|
|
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);
|
|
752
686
|
const body = convertExpression(definition.body, isExcept);
|
|
753
687
|
if (definition.kind === "Function" && hasTuple(definition.bounds)) {
|
|
754
|
-
const bounds = getTuplyBounds(definition.bounds, isExcept);
|
|
755
688
|
return {
|
|
756
689
|
kind: "Operator",
|
|
757
690
|
name,
|
|
758
|
-
body: expandTuples(
|
|
691
|
+
body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
|
|
759
692
|
location,
|
|
760
693
|
};
|
|
761
694
|
}
|
|
@@ -768,24 +701,28 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
768
701
|
location,
|
|
769
702
|
};
|
|
770
703
|
}
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
704
|
+
const operatorBody =
|
|
705
|
+
definition.params.length === 0
|
|
706
|
+
? body
|
|
707
|
+
: at(
|
|
708
|
+
{
|
|
709
|
+
kind: "Lambda",
|
|
710
|
+
params: definition.params.map((param) => ({
|
|
711
|
+
name: getCanonicalName(param.name),
|
|
712
|
+
shape: param.arity,
|
|
713
|
+
...(param.location && {
|
|
714
|
+
location: getPointLocus(param.location, param.name.length),
|
|
715
|
+
}),
|
|
716
|
+
})),
|
|
717
|
+
body,
|
|
718
|
+
},
|
|
719
|
+
{ location },
|
|
720
|
+
);
|
|
721
|
+
const end = definition.location.range?.end;
|
|
722
|
+
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
|
|
723
|
+
return methods
|
|
724
|
+
? { kind: "Bpragma", name, body: operatorBody, methods, location }
|
|
725
|
+
: { kind: "Operator", name, body: operatorBody, location };
|
|
789
726
|
};
|
|
790
727
|
|
|
791
728
|
const convertNewSymbol = (symbol: NewSymbol): Hyp => {
|
|
@@ -802,23 +739,21 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
802
739
|
};
|
|
803
740
|
};
|
|
804
741
|
|
|
742
|
+
// Anonymization judges the time of each assumption once it resolves the names in it.
|
|
805
743
|
const convertSequent = (statement: Expression | AssumeProve): Sequent => {
|
|
806
744
|
if (statement.kind !== "AssumeProve")
|
|
807
745
|
return { context: [], active: convertExpression(statement, false) };
|
|
808
746
|
return {
|
|
809
747
|
context: statement.assumptions.map((assumption): Hyp => {
|
|
810
748
|
if (assumption.kind === "NewSymbol") return convertNewSymbol(assumption);
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
}
|
|
820
|
-
const expression = convertFactLabel(assumption);
|
|
821
|
-
return { kind: "Fact", expression, visibility: "Visible", location: expression.location };
|
|
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);
|
|
822
757
|
}),
|
|
823
758
|
active: convertExpression(statement.conclusion, false),
|
|
824
759
|
};
|
|
@@ -864,12 +799,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
864
799
|
defs: use.defs.map(convertDef),
|
|
865
800
|
});
|
|
866
801
|
|
|
867
|
-
const getStepNumber = (token: RegExpExecArray | null, level: number): StepNumber =>
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
|
|
871
|
-
: { kind: "Named", level, label, isAnonymous: false };
|
|
872
|
-
};
|
|
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) };
|
|
873
806
|
|
|
874
807
|
// to_proof: a missing proof is implicitly omitted where the enclosing step is.
|
|
875
808
|
const convertProof = (
|
|
@@ -880,7 +813,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
880
813
|
if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
|
|
881
814
|
switch (proof.kind) {
|
|
882
815
|
case "Obvious":
|
|
883
|
-
return { kind: "Obvious",
|
|
816
|
+
return { kind: "Obvious", ...withMethod(proof.keyword) };
|
|
884
817
|
case "Omitted":
|
|
885
818
|
return {
|
|
886
819
|
kind: "Omitted",
|
|
@@ -894,6 +827,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
894
827
|
isOnly: proof.isOnly,
|
|
895
828
|
location: getRangeLocus(proof.keyword),
|
|
896
829
|
step: { kind: "Unnamed", level, id: 0 },
|
|
830
|
+
method: getMethod(proof.location.range),
|
|
897
831
|
};
|
|
898
832
|
case "Steps": {
|
|
899
833
|
// A <*> first step takes the enclosing level only after PROOF, and the top level
|
|
@@ -936,7 +870,11 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
936
870
|
const proof = convertProof(step.proof, level + 1, head);
|
|
937
871
|
return { ...make(proof), location: mergeLoci(head, proof.location), step: number };
|
|
938
872
|
};
|
|
939
|
-
const
|
|
873
|
+
const withStepMethod = (converted: Step): Step => ({
|
|
874
|
+
...converted,
|
|
875
|
+
...withMethod(step.head),
|
|
876
|
+
step: number,
|
|
877
|
+
});
|
|
940
878
|
switch (body.kind) {
|
|
941
879
|
case "Use":
|
|
942
880
|
case "Hide": {
|
|
@@ -946,26 +884,38 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
946
884
|
);
|
|
947
885
|
const usable = convertUsable(body);
|
|
948
886
|
return body.kind === "Use"
|
|
949
|
-
? {
|
|
887
|
+
? {
|
|
888
|
+
kind: "Use",
|
|
889
|
+
usable,
|
|
890
|
+
isOnly: body.isOnly,
|
|
891
|
+
location,
|
|
892
|
+
step: number,
|
|
893
|
+
method: getMethod(body.location.range),
|
|
894
|
+
}
|
|
950
895
|
: { kind: "Hide", usable, location, step: number };
|
|
951
896
|
}
|
|
952
897
|
case "Instance":
|
|
953
898
|
throw new TlaProofError("Unexpected keyword INSTANCE");
|
|
954
899
|
case "Define":
|
|
955
|
-
return
|
|
900
|
+
return {
|
|
956
901
|
kind: "Define",
|
|
957
902
|
definitions: body.definitions.map((definition) => convertDefinition(definition)),
|
|
958
|
-
|
|
903
|
+
location: head,
|
|
904
|
+
step: number,
|
|
905
|
+
};
|
|
959
906
|
case "Have":
|
|
960
|
-
return
|
|
907
|
+
return withStepMethod({
|
|
908
|
+
kind: "Have",
|
|
909
|
+
expression: convertExpression(body.expression, false),
|
|
910
|
+
});
|
|
961
911
|
case "Take":
|
|
962
|
-
return
|
|
912
|
+
return withStepMethod({
|
|
963
913
|
kind: "Take",
|
|
964
914
|
bounds:
|
|
965
915
|
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
|
|
966
916
|
});
|
|
967
917
|
case "Witness":
|
|
968
|
-
return
|
|
918
|
+
return withStepMethod({
|
|
969
919
|
kind: "Witness",
|
|
970
920
|
expressions: body.expressions.map((expression) => convertExpression(expression, false)),
|
|
971
921
|
});
|
|
@@ -1048,17 +998,24 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
1048
998
|
return {
|
|
1049
999
|
kind: "Axiom",
|
|
1050
1000
|
name: unit.assumption.name,
|
|
1051
|
-
expression:
|
|
1001
|
+
expression: withExpressionMethod(
|
|
1002
|
+
convertExpression(unit.assumption.expression, false),
|
|
1003
|
+
unit.assumption.location.range,
|
|
1004
|
+
),
|
|
1052
1005
|
location: getLocus(unit.assumption.location),
|
|
1053
1006
|
};
|
|
1054
1007
|
case "Theorem": {
|
|
1055
1008
|
const theorem = unit.theorem;
|
|
1056
1009
|
const location = getLocus(theorem.location);
|
|
1057
1010
|
const end = withPragma(location);
|
|
1011
|
+
const sequent = convertSequent(theorem.statement);
|
|
1058
1012
|
return {
|
|
1059
1013
|
kind: "Theorem",
|
|
1060
1014
|
name: theorem.name,
|
|
1061
|
-
sequent:
|
|
1015
|
+
sequent: {
|
|
1016
|
+
...sequent,
|
|
1017
|
+
active: withExpressionMethod(sequent.active, theorem.statement.location.range),
|
|
1018
|
+
},
|
|
1062
1019
|
axiomCount: 0,
|
|
1063
1020
|
proof: convertProof(theorem.proof, 0, {
|
|
1064
1021
|
...end,
|
|
@@ -1072,7 +1029,6 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
|
|
|
1072
1029
|
return {
|
|
1073
1030
|
kind: "Mutate",
|
|
1074
1031
|
mode: unit.use.kind,
|
|
1075
|
-
isSuppressed: false,
|
|
1076
1032
|
usable: convertUsable(unit.use),
|
|
1077
1033
|
location: getUseLocus(unit.use),
|
|
1078
1034
|
};
|