tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -29
- package/dist/deciders.js +42 -42
- 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 +117 -37
- 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 +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
package/src/sany/selectors.ts
CHANGED
|
@@ -21,18 +21,12 @@ import {
|
|
|
21
21
|
type ThmOrAssumpDefNode,
|
|
22
22
|
} from "./nodes";
|
|
23
23
|
|
|
24
|
-
// A port of SANY's Generator.selectorToNode, which turns a name such as Op(a)!lab(b)!:!2 into the
|
|
25
|
-
// semantic node it names, following the Subexpression algorithm of SANY's Subexpression.tla.
|
|
26
|
-
|
|
27
|
-
// An operand selector !i is the number i, and the other selectors are named after SANY's NameSel,
|
|
28
|
-
// NullSel, GGSel, LLSel, ColonSel and AtSel.
|
|
29
24
|
type SelectorOp = number | "Name" | "Null" | ">>" | "<<" | ":" | "@";
|
|
30
25
|
|
|
31
26
|
export interface SelectorItem {
|
|
32
27
|
op: SelectorOp;
|
|
33
28
|
name: string;
|
|
34
29
|
args: Expression[] | undefined;
|
|
35
|
-
// Where SANY locates the selector and its parenthesized arguments, when known.
|
|
36
30
|
location?: SanyLocation;
|
|
37
31
|
argsLocation?: SanyLocation;
|
|
38
32
|
}
|
|
@@ -62,10 +56,7 @@ interface SelectorGenerator {
|
|
|
62
56
|
createLambda: (params: FormalParamNode[], body: ExprNode, location: SanyLocation) => OpDefNode;
|
|
63
57
|
copySubstIn: (prefix: SubstInNode, body: ExprNode) => SubstInNode;
|
|
64
58
|
getBuiltin: (name: string) => OpDefNode;
|
|
65
|
-
// Errors.addMessage for an error SANY recovers from, and the null node SANY returns after one.
|
|
66
59
|
addError: (location: SanyLocation, text: string) => OpApplNode;
|
|
67
|
-
// Generator.illegalLabelRef and illegalAPPosRef: whether the node being generated lies outside
|
|
68
|
-
// the scope of a declaration that a label or a clause of an ASSUME/PROVE lies in.
|
|
69
60
|
isOutOfLabelScope: (label: LabelNode) => boolean;
|
|
70
61
|
isOutOfClauseScope: (assumeProve: AssumeProveNode, position: number) => boolean;
|
|
71
62
|
}
|
|
@@ -80,8 +71,8 @@ const PROOF_STEP_OPERATORS = new Map([
|
|
|
80
71
|
["$Suffices", "SUFFICES"],
|
|
81
72
|
]);
|
|
82
73
|
|
|
83
|
-
|
|
84
|
-
|
|
74
|
+
const getNameParts = (name: string): string[] => {
|
|
75
|
+
if (name.length > 3 && name.endsWith("!!!")) return [...getNameParts(name.slice(0, -3)), "!!"];
|
|
85
76
|
const parts = name.split("!");
|
|
86
77
|
return parts.some((part) => part.length === 0) ? [name] : parts;
|
|
87
78
|
};
|
|
@@ -94,11 +85,11 @@ export const getSelectorItems = (expression: Expression): SelectorItem[] | undef
|
|
|
94
85
|
const parts = getNameParts(expression.operator);
|
|
95
86
|
const counts =
|
|
96
87
|
expression.argumentCounts ??
|
|
97
|
-
parts.map((
|
|
98
|
-
|
|
88
|
+
parts.map((_part, index) => (index === parts.length - 1 ? expression.args.length : 0));
|
|
89
|
+
let cursor = 0;
|
|
99
90
|
return parts.map((name, index) => {
|
|
100
|
-
const args = expression.args.slice(cursor
|
|
101
|
-
cursor
|
|
91
|
+
const args = expression.args.slice(cursor, cursor + counts[index]);
|
|
92
|
+
cursor += counts[index];
|
|
102
93
|
return { op: "Name", name, args: args.length > 0 ? args : undefined };
|
|
103
94
|
});
|
|
104
95
|
}
|
|
@@ -125,29 +116,23 @@ export const getSelectorItems = (expression: Expression): SelectorItem[] | undef
|
|
|
125
116
|
return undefined;
|
|
126
117
|
};
|
|
127
118
|
|
|
128
|
-
// A selector SANY parses as a GeneralId rather than an OpApplication: one whose last part is not a
|
|
129
|
-
// name with arguments.
|
|
130
119
|
export const isGeneralId = (items: SelectorItem[]) => {
|
|
131
120
|
const last = items[items.length - 1];
|
|
132
121
|
return last.op !== "Name" || last.args === undefined;
|
|
133
122
|
};
|
|
134
123
|
|
|
135
|
-
// SANY's selectorItemToString, which names an operand selector after the argument it selects.
|
|
136
124
|
const getSelectorItemName = (item: SelectorItem) =>
|
|
137
125
|
typeof item.op === "number" ? `argument selector ${item.name}` : item.name;
|
|
138
126
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (
|
|
143
|
-
if (op === "<<") return arity > 0 ? 1 : -1;
|
|
144
|
-
if (op === ">>") return arity === 2 ? 2 : -1;
|
|
127
|
+
const getArgNumber = (selector: SelectorOp, arity: number) => {
|
|
128
|
+
if (typeof selector === "number") return selector > 0 && selector <= arity ? selector : -1;
|
|
129
|
+
if (selector === "<<") return arity > 0 ? 1 : -1;
|
|
130
|
+
if (selector === ">>") return arity === 2 ? 2 : -1;
|
|
145
131
|
return -1;
|
|
146
132
|
};
|
|
147
133
|
|
|
148
134
|
type Mode = "FindingOpName" | "FollowingLabels" | "FindingSubExpr";
|
|
149
135
|
|
|
150
|
-
// The state of Generator.selectorToNode as it walks the items.
|
|
151
136
|
interface SelectorWalk {
|
|
152
137
|
name: string | undefined;
|
|
153
138
|
nameLocation: SanyLocation | undefined;
|
|
@@ -176,13 +161,9 @@ const isSymbol = (node: LevelNode | SymbolNode): node is SymbolNode =>
|
|
|
176
161
|
const getQuantifierSymbols = (node: OpApplNode) =>
|
|
177
162
|
(node.bounded?.length ?? 0) > 0 ? (node.bounded ?? []).flat() : (node.unbounded ?? []);
|
|
178
163
|
|
|
179
|
-
// Generator.extendedBy: a name's location grown to the end of its next part.
|
|
180
164
|
const extendLocation = (name: SanyLocation | undefined, part: SanyLocation): SanyLocation =>
|
|
181
165
|
name === undefined ? part : { ...name, endLine: part.endLine, endColumn: part.endColumn };
|
|
182
166
|
|
|
183
|
-
// selectorToNode: with expectedArity 0 the expression a selector names, with a positive one the
|
|
184
|
-
// operator argument, and with -1 the definition a DEF clause names. A fact can also be an
|
|
185
|
-
// ASSUME/PROVE, a NEW clause or a module instance.
|
|
186
167
|
export const createSelectorResolver =
|
|
187
168
|
(generator: SelectorGenerator) =>
|
|
188
169
|
(
|
|
@@ -195,7 +176,6 @@ export const createSelectorResolver =
|
|
|
195
176
|
const substInPrefix: SubstInNode[] = [];
|
|
196
177
|
const params: FormalParamNode[] = [];
|
|
197
178
|
const allArgs: ExprOrOpArgNode[] = [];
|
|
198
|
-
const getItemLocation = (itemIndex: number) => items[itemIndex].location ?? location;
|
|
199
179
|
const walk: SelectorWalk = {
|
|
200
180
|
name: undefined,
|
|
201
181
|
nameLocation: undefined,
|
|
@@ -208,6 +188,7 @@ export const createSelectorResolver =
|
|
|
208
188
|
definitionArgs: [],
|
|
209
189
|
isInSuffices: false,
|
|
210
190
|
};
|
|
191
|
+
const getItemLocation = () => items[walk.index].location ?? location;
|
|
211
192
|
const getArgs = (item: SelectorItem) => item.args ?? [];
|
|
212
193
|
|
|
213
194
|
while (walk.index < items.length) {
|
|
@@ -217,7 +198,7 @@ export const createSelectorResolver =
|
|
|
217
198
|
item.args !== undefined
|
|
218
199
|
) {
|
|
219
200
|
return generator.addError(
|
|
220
|
-
getItemLocation(
|
|
201
|
+
getItemLocation(),
|
|
221
202
|
`Selector \`${item.name}' should not have argument(s).`,
|
|
222
203
|
);
|
|
223
204
|
}
|
|
@@ -236,7 +217,7 @@ export const createSelectorResolver =
|
|
|
236
217
|
: undefined;
|
|
237
218
|
if (walk.name === undefined && current.op !== "Name") {
|
|
238
219
|
return generator.addError(
|
|
239
|
-
getItemLocation(
|
|
220
|
+
getItemLocation(),
|
|
240
221
|
`Need name or step number here, not \`${current.name}'.`,
|
|
241
222
|
);
|
|
242
223
|
}
|
|
@@ -249,19 +230,17 @@ export const createSelectorResolver =
|
|
|
249
230
|
if (symbol === undefined) {
|
|
250
231
|
if (newName !== undefined) {
|
|
251
232
|
walk.name = newName;
|
|
252
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
233
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
253
234
|
}
|
|
254
235
|
collectedArgs.push(...getArgs(current));
|
|
255
236
|
walk.index++;
|
|
256
237
|
}
|
|
257
238
|
}
|
|
258
|
-
// TLC 1.7.4's SANY names only the last item of a selector it can't resolve, as
|
|
259
|
-
// selectorItemToString does, which fails on an argument selector that isn't a number.
|
|
260
239
|
if (symbol === undefined && generator.version === "1.7.4") {
|
|
261
|
-
const
|
|
240
|
+
const lastIndex = items.length - 1;
|
|
262
241
|
return generator.addError(
|
|
263
|
-
|
|
264
|
-
`Unknown operator: \`${getSelectorItemName(items[
|
|
242
|
+
items[lastIndex].location ?? location,
|
|
243
|
+
`Unknown operator: \`${getSelectorItemName(items[lastIndex])}'.`,
|
|
265
244
|
);
|
|
266
245
|
}
|
|
267
246
|
if (symbol === undefined) {
|
|
@@ -272,16 +251,16 @@ export const createSelectorResolver =
|
|
|
272
251
|
}
|
|
273
252
|
if (symbol.kind === "Module") {
|
|
274
253
|
return generator.addError(
|
|
275
|
-
getItemLocation(
|
|
254
|
+
getItemLocation(),
|
|
276
255
|
`Module name (${items[walk.index].name}) not allowed here.`,
|
|
277
256
|
);
|
|
278
257
|
}
|
|
279
258
|
walk.node = symbol;
|
|
280
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
259
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
281
260
|
walk.name = newName;
|
|
282
261
|
if (isDeclarationLike(symbol) && items.length !== 1) {
|
|
283
262
|
return generator.addError(
|
|
284
|
-
getItemLocation(
|
|
263
|
+
getItemLocation(),
|
|
285
264
|
`Cannot take subexpression of \`${walk.name}'.`,
|
|
286
265
|
);
|
|
287
266
|
}
|
|
@@ -300,7 +279,7 @@ export const createSelectorResolver =
|
|
|
300
279
|
symbol,
|
|
301
280
|
argumentIndex + walk.definitionArityFound,
|
|
302
281
|
argument,
|
|
303
|
-
getItemLocation(
|
|
282
|
+
getItemLocation(),
|
|
304
283
|
),
|
|
305
284
|
),
|
|
306
285
|
);
|
|
@@ -309,7 +288,7 @@ export const createSelectorResolver =
|
|
|
309
288
|
if (symbol.kind === "OpDef" && symbol.defKind === "ModuleInstance") {
|
|
310
289
|
if (walk.index === items.length - 1 && !(isDef || isFact)) {
|
|
311
290
|
return generator.addError(
|
|
312
|
-
getItemLocation(
|
|
291
|
+
getItemLocation(),
|
|
313
292
|
`Operator name ${walk.name} is incomplete.`,
|
|
314
293
|
);
|
|
315
294
|
}
|
|
@@ -326,7 +305,7 @@ export const createSelectorResolver =
|
|
|
326
305
|
items.length !== 1
|
|
327
306
|
) {
|
|
328
307
|
return generator.addError(
|
|
329
|
-
getItemLocation(
|
|
308
|
+
getItemLocation(),
|
|
330
309
|
`Subexpression of \`${walk.name}' used inside the operator's definition.`,
|
|
331
310
|
);
|
|
332
311
|
}
|
|
@@ -361,21 +340,18 @@ export const createSelectorResolver =
|
|
|
361
340
|
? owner.labels.get(item.name)
|
|
362
341
|
: undefined;
|
|
363
342
|
if (label === undefined)
|
|
364
|
-
return generator.addError(
|
|
365
|
-
getItemLocation(walk.index),
|
|
366
|
-
`Cannot find label \`${item.name}'.`,
|
|
367
|
-
);
|
|
343
|
+
return generator.addError(getItemLocation(), `Cannot find label \`${item.name}'.`);
|
|
368
344
|
walk.node = label;
|
|
369
345
|
if (generator.isOutOfLabelScope(label)) {
|
|
370
346
|
return generator.addError(
|
|
371
|
-
getItemLocation(
|
|
347
|
+
getItemLocation(),
|
|
372
348
|
`Accessing subexpression labeled \`${item.name}' of ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.`,
|
|
373
349
|
);
|
|
374
350
|
}
|
|
375
351
|
if (expectedArity === 0) {
|
|
376
352
|
if (label.params.length !== getArgs(item).length) {
|
|
377
353
|
return generator.addError(
|
|
378
|
-
getItemLocation(
|
|
354
|
+
getItemLocation(),
|
|
379
355
|
`Label \`${item.name}' used with wrong number of arguments.`,
|
|
380
356
|
);
|
|
381
357
|
}
|
|
@@ -392,7 +368,7 @@ export const createSelectorResolver =
|
|
|
392
368
|
const node = walk.node;
|
|
393
369
|
const addNonexistentError = () =>
|
|
394
370
|
generator.addError(
|
|
395
|
-
getItemLocation(
|
|
371
|
+
getItemLocation(),
|
|
396
372
|
`Nonexistent operand specified by \`${getSelectorItemName(item)}'.`,
|
|
397
373
|
);
|
|
398
374
|
if (item.op === ":") {
|
|
@@ -402,19 +378,19 @@ export const createSelectorResolver =
|
|
|
402
378
|
(walk.index < items.length - 1 && items[walk.index + 1].op === "Name"));
|
|
403
379
|
if (!isAllowed) {
|
|
404
380
|
return generator.addError(
|
|
405
|
-
getItemLocation(
|
|
381
|
+
getItemLocation(),
|
|
406
382
|
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
407
383
|
);
|
|
408
384
|
}
|
|
409
385
|
} else if (node === undefined) {
|
|
410
386
|
return generator.addError(
|
|
411
|
-
getItemLocation(
|
|
387
|
+
getItemLocation(),
|
|
412
388
|
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
413
389
|
);
|
|
414
390
|
} else if (node.kind === "LetIn") {
|
|
415
391
|
if (getArgNumber(item.op, 1) !== 1)
|
|
416
392
|
return generator.addError(
|
|
417
|
-
getItemLocation(
|
|
393
|
+
getItemLocation(),
|
|
418
394
|
"A LET/IN expression has only one operand.",
|
|
419
395
|
);
|
|
420
396
|
walk.node = node.body;
|
|
@@ -427,7 +403,7 @@ export const createSelectorResolver =
|
|
|
427
403
|
(operator.kind === "OpDef" && operator.defKind === "UserDefined");
|
|
428
404
|
const addNotPairError = () =>
|
|
429
405
|
generator.addError(
|
|
430
|
-
getItemLocation(
|
|
406
|
+
getItemLocation(),
|
|
431
407
|
"Internal error: Expecting $Pair and didn't find it.",
|
|
432
408
|
);
|
|
433
409
|
const isPair = (pair: ExprOrOpArgNode | undefined): pair is OpApplNode =>
|
|
@@ -446,7 +422,7 @@ export const createSelectorResolver =
|
|
|
446
422
|
} else if (operator.name === "$Case") {
|
|
447
423
|
if (walk.index === items.length - 1) {
|
|
448
424
|
return generator.addError(
|
|
449
|
-
getItemLocation(
|
|
425
|
+
getItemLocation(),
|
|
450
426
|
"Subexpression of CASE must have form !i!j.",
|
|
451
427
|
);
|
|
452
428
|
}
|
|
@@ -457,20 +433,20 @@ export const createSelectorResolver =
|
|
|
457
433
|
const number = getArgNumber(items[walk.index].op, 2);
|
|
458
434
|
if (number === -1) {
|
|
459
435
|
return generator.addError(
|
|
460
|
-
getItemLocation(
|
|
436
|
+
getItemLocation(),
|
|
461
437
|
"Second selector for CASE subexpression must specify one of two operands.",
|
|
462
438
|
);
|
|
463
439
|
}
|
|
464
440
|
walk.node = pair.operands[number - 1];
|
|
465
441
|
if (walk.node === undefined)
|
|
466
442
|
return generator.addError(
|
|
467
|
-
getItemLocation(
|
|
443
|
+
getItemLocation(),
|
|
468
444
|
"Selecting OTHER in a CASE statement.",
|
|
469
445
|
);
|
|
470
446
|
} else if (operator.name === "$Except") {
|
|
471
447
|
if (operandNumber > 1) {
|
|
472
448
|
return generator.addError(
|
|
473
|
-
getItemLocation(
|
|
449
|
+
getItemLocation(),
|
|
474
450
|
"Selecting subexpression of an EXCEPT not yet implemented.",
|
|
475
451
|
);
|
|
476
452
|
}
|
|
@@ -485,7 +461,7 @@ export const createSelectorResolver =
|
|
|
485
461
|
if (item.op === "Null") {
|
|
486
462
|
if (getArgs(item).length !== symbols.length) {
|
|
487
463
|
return generator.addError(
|
|
488
|
-
getItemLocation(
|
|
464
|
+
getItemLocation(),
|
|
489
465
|
`Selector with ${getArgs(item).length} argument(s) used for quantifier with ${symbols.length} bound identifier(s).`,
|
|
490
466
|
);
|
|
491
467
|
}
|
|
@@ -499,7 +475,7 @@ export const createSelectorResolver =
|
|
|
499
475
|
}
|
|
500
476
|
} else {
|
|
501
477
|
return generator.addError(
|
|
502
|
-
getItemLocation(
|
|
478
|
+
getItemLocation(),
|
|
503
479
|
`Choosing operand \`${item.name}' of subexpression with no operands.`,
|
|
504
480
|
);
|
|
505
481
|
}
|
|
@@ -507,7 +483,7 @@ export const createSelectorResolver =
|
|
|
507
483
|
if (node.isSuffices && !walk.isInSuffices) {
|
|
508
484
|
if (getArgNumber(item.op, 1) !== 1) {
|
|
509
485
|
return generator.addError(
|
|
510
|
-
getItemLocation(
|
|
486
|
+
getItemLocation(),
|
|
511
487
|
"Accessing non-existent subexpression of a SUFFICES",
|
|
512
488
|
);
|
|
513
489
|
}
|
|
@@ -518,7 +494,7 @@ export const createSelectorResolver =
|
|
|
518
494
|
if (number === -1) return addNonexistentError();
|
|
519
495
|
if (generator.isOutOfClauseScope(node, number)) {
|
|
520
496
|
return generator.addError(
|
|
521
|
-
getItemLocation(
|
|
497
|
+
getItemLocation(),
|
|
522
498
|
"Accessing ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.",
|
|
523
499
|
);
|
|
524
500
|
}
|
|
@@ -526,7 +502,7 @@ export const createSelectorResolver =
|
|
|
526
502
|
walk.node = node.assumptions[number - 1];
|
|
527
503
|
if (walk.node.kind === "NewSymb" && walk.index !== items.length - 1) {
|
|
528
504
|
return generator.addError(
|
|
529
|
-
getItemLocation(
|
|
505
|
+
getItemLocation(),
|
|
530
506
|
"Selected a subexpression of a NEW clause of an ASSUME.",
|
|
531
507
|
);
|
|
532
508
|
}
|
|
@@ -536,20 +512,20 @@ export const createSelectorResolver =
|
|
|
536
512
|
const lambda = node.op;
|
|
537
513
|
if (lambda.kind !== "OpDef" || lambda.name !== "LAMBDA") {
|
|
538
514
|
return generator.addError(
|
|
539
|
-
getItemLocation(
|
|
515
|
+
getItemLocation(),
|
|
540
516
|
"Trying to select subexpression of an operator argument.",
|
|
541
517
|
);
|
|
542
518
|
}
|
|
543
519
|
if (item.op !== "Null" && item.op !== "@") {
|
|
544
520
|
return generator.addError(
|
|
545
|
-
getItemLocation(
|
|
521
|
+
getItemLocation(),
|
|
546
522
|
`Cannot use !${item.name} to select subexpression of a LAMBDA.`,
|
|
547
523
|
);
|
|
548
524
|
}
|
|
549
525
|
if (item.op === "Null") {
|
|
550
526
|
if (lambda.arity !== getArgs(item).length) {
|
|
551
527
|
return generator.addError(
|
|
552
|
-
getItemLocation(
|
|
528
|
+
getItemLocation(),
|
|
553
529
|
`Selector with ${getArgs(item).length} arguments used for LAMBDA expression taking ${lambda.arity} arguments.`,
|
|
554
530
|
);
|
|
555
531
|
}
|
|
@@ -562,13 +538,13 @@ export const createSelectorResolver =
|
|
|
562
538
|
walk.index--;
|
|
563
539
|
} else {
|
|
564
540
|
return generator.addError(
|
|
565
|
-
getItemLocation(
|
|
541
|
+
getItemLocation(),
|
|
566
542
|
"Selecting subexpression of expression that has none.",
|
|
567
543
|
);
|
|
568
544
|
}
|
|
569
545
|
if (walk.node === undefined)
|
|
570
546
|
return generator.addError(
|
|
571
|
-
getItemLocation(
|
|
547
|
+
getItemLocation(),
|
|
572
548
|
`An unexpected null node specified by '${item.name}'.\nThis is probably due to a previous error.`,
|
|
573
549
|
);
|
|
574
550
|
if (walk.index !== items.length - 1) {
|
|
@@ -577,7 +553,7 @@ export const createSelectorResolver =
|
|
|
577
553
|
while (walk.node?.kind === "Label") walk.node = walk.node.body;
|
|
578
554
|
if (walk.node?.kind !== "LetIn") {
|
|
579
555
|
return generator.addError(
|
|
580
|
-
getItemLocation(
|
|
556
|
+
getItemLocation(),
|
|
581
557
|
"A name selector here must be from a LET clause.",
|
|
582
558
|
);
|
|
583
559
|
}
|
|
@@ -585,7 +561,7 @@ export const createSelectorResolver =
|
|
|
585
561
|
walk.mode = "FindingOpName";
|
|
586
562
|
} else if (next.op === ":") {
|
|
587
563
|
return generator.addError(
|
|
588
|
-
getItemLocation(
|
|
564
|
+
getItemLocation(),
|
|
589
565
|
"!: should not follow an operand selector.",
|
|
590
566
|
);
|
|
591
567
|
}
|
|
@@ -674,7 +650,7 @@ export const createSelectorResolver =
|
|
|
674
650
|
if (params.length + substInPrefix.length > 0) {
|
|
675
651
|
const operator = current.op;
|
|
676
652
|
params.push(
|
|
677
|
-
...Array.from({ length: getSymbolArity(operator) }, (
|
|
653
|
+
...Array.from({ length: getSymbolArity(operator) }, (_element, paramIndex) =>
|
|
678
654
|
generator.createFormalParam(`NewParam${paramIndex}`, 0, undefined),
|
|
679
655
|
),
|
|
680
656
|
);
|
|
@@ -682,10 +658,7 @@ export const createSelectorResolver =
|
|
|
682
658
|
}
|
|
683
659
|
}
|
|
684
660
|
if (!isFact) {
|
|
685
|
-
|
|
686
|
-
(current.kind === "ThmOrAssumpDef" && current.body.kind === "AssumeProve") ||
|
|
687
|
-
(current.kind === "Label" && current.isAssumeProve);
|
|
688
|
-
if (isAssumeProve)
|
|
661
|
+
if (current.kind === "ThmOrAssumpDef" && current.body.kind === "AssumeProve")
|
|
689
662
|
return generator.addError(location, "ASSUME/PROVE used where an expression is required.");
|
|
690
663
|
if (current.kind === "ThmOrAssumpDef" && current.body.kind === "OpAppl") {
|
|
691
664
|
const step = PROOF_STEP_OPERATORS.get(current.body.operator.name);
|
package/src/sany/source.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { getTabStop } from "./lexer";
|
|
|
5
5
|
import { getSanyParseError } from "./parse-error";
|
|
6
6
|
import type { SanyLocation } from "./nodes";
|
|
7
7
|
|
|
8
|
-
// The tokens of one file, to find the locations SANY gives to names, brackets and parentheses that
|
|
9
|
-
// the syntax tree of tla-ts leaves out, and the comments SANY attaches to definitions.
|
|
10
8
|
export interface SourceFile {
|
|
11
9
|
name: string;
|
|
12
10
|
source: string;
|
|
@@ -48,7 +46,6 @@ export const isToken = (file: SourceFile, index: number, text: string) =>
|
|
|
48
46
|
file.tokens[index].text === text &&
|
|
49
47
|
file.tokens[index].kind !== "String";
|
|
50
48
|
|
|
51
|
-
// The number of tokens, in source order, before a position, or at or before it when isAtCounted.
|
|
52
49
|
const countTokensBefore = (file: SourceFile, position: SourceLocation, isAtCounted: boolean) => {
|
|
53
50
|
let low = 0;
|
|
54
51
|
let high = file.tokens.length;
|
|
@@ -65,12 +62,10 @@ const countTokensBefore = (file: SourceFile, position: SourceLocation, isAtCount
|
|
|
65
62
|
return low;
|
|
66
63
|
};
|
|
67
64
|
|
|
68
|
-
// The index of the first token at or after a position.
|
|
69
65
|
export const getTokenIndex = (file: SourceFile, position: SourceLocation) =>
|
|
70
66
|
file.tokenIndexes.get(getPositionKey(position.line, position.column)) ??
|
|
71
67
|
Math.min(countTokensBefore(file, position, false), file.tokens.length - 1);
|
|
72
68
|
|
|
73
|
-
// The index of the last token at or before a position.
|
|
74
69
|
const getEndTokenIndex = (file: SourceFile, position: SourceLocation) =>
|
|
75
70
|
Math.max(countTokensBefore(file, position, true) - 1, 0);
|
|
76
71
|
|
|
@@ -99,8 +94,6 @@ export const getRangeSpan = (file: SourceFile, range: SourceRange): TokenSpan =>
|
|
|
99
94
|
end: getEndTokenIndex(file, range.end),
|
|
100
95
|
});
|
|
101
96
|
|
|
102
|
-
// The tokens of an expression. Some nodes, such as a tuple in a subscript, have no range, so their
|
|
103
|
-
// span runs from their first token to the bracket that closes it.
|
|
104
97
|
export const getExpressionSpan = (file: SourceFile, expression: Expression): TokenSpan => {
|
|
105
98
|
const range = expression.location.range;
|
|
106
99
|
if (range) return getRangeSpan(file, range);
|
|
@@ -108,8 +101,6 @@ export const getExpressionSpan = (file: SourceFile, expression: Expression): Tok
|
|
|
108
101
|
return { start, end: getMatchingIndex(file, start) };
|
|
109
102
|
};
|
|
110
103
|
|
|
111
|
-
// The span with the parentheses around it, as SANY locates a parenthesized operand by its
|
|
112
|
-
// parentheses.
|
|
113
104
|
export const getParenthesizedSpan = (file: SourceFile, span: TokenSpan): TokenSpan => {
|
|
114
105
|
const start = span.start - 1;
|
|
115
106
|
const end = span.end + 1;
|
|
@@ -123,8 +114,6 @@ export const getParenthesizedSpan = (file: SourceFile, span: TokenSpan): TokenSp
|
|
|
123
114
|
return span;
|
|
124
115
|
};
|
|
125
116
|
|
|
126
|
-
// SANY's parser keeps the parentheses around an argument of an operator, which the span of the
|
|
127
|
-
// argument's expression leaves out. Those of the operator's own arguments follow its name.
|
|
128
117
|
export const getArgumentSpan = (file: SourceFile, span: TokenSpan): TokenSpan => {
|
|
129
118
|
const start = span.start - 1;
|
|
130
119
|
const end = span.end + 1;
|
|
@@ -157,14 +146,12 @@ const getOffset = (file: SourceFile, line: number, column: number) => {
|
|
|
157
146
|
return offset;
|
|
158
147
|
};
|
|
159
148
|
|
|
160
|
-
// The token as the source spells it, where the token's text is the name of the operator.
|
|
161
149
|
export const getTokenSource = (file: SourceFile, index: number) => {
|
|
162
150
|
const token = file.tokens[index];
|
|
163
151
|
const start = getOffset(file, token.line, token.column);
|
|
164
152
|
return file.source.slice(start, getOffset(file, token.line, token.endColumn) + 1);
|
|
165
153
|
};
|
|
166
154
|
|
|
167
|
-
// SANY lexes []ASSUME and []PROVE as single tokens.
|
|
168
155
|
export const isBoxToken = (file: SourceFile, index: number) => {
|
|
169
156
|
const box = file.tokens[index];
|
|
170
157
|
const next = file.tokens[index + 1];
|
|
@@ -179,8 +166,7 @@ export const isBoxToken = (file: SourceFile, index: number) => {
|
|
|
179
166
|
};
|
|
180
167
|
|
|
181
168
|
// HACK: the tla-ts parser has no []ASSUME or []PROVE, so it parses the source with each such []
|
|
182
|
-
// blanked out, which keeps every other token where it was.
|
|
183
|
-
// ASSUME/PROVE, which unboxing hides.
|
|
169
|
+
// blanked out, which keeps every other token where it was.
|
|
184
170
|
export const getUnboxedSource = (source: string) => {
|
|
185
171
|
const file = createSourceFile("", source);
|
|
186
172
|
const unboxed = file.tokens.reduce((text, token, index) => {
|
|
@@ -194,7 +180,6 @@ export const getUnboxedSource = (source: string) => {
|
|
|
194
180
|
return unboxed;
|
|
195
181
|
};
|
|
196
182
|
|
|
197
|
-
// The comments between a token and the one before it, which SANY's parser attaches to the token.
|
|
198
183
|
export const getPreComments = (file: SourceFile, index: number) => {
|
|
199
184
|
const previous = file.tokens[index - 1];
|
|
200
185
|
const token = file.tokens[index];
|
|
@@ -209,7 +194,6 @@ export const getPreComments = (file: SourceFile, index: number) => {
|
|
|
209
194
|
comments.push(gap.slice(offset, end));
|
|
210
195
|
offset = end;
|
|
211
196
|
} else if (gap.startsWith("(*", offset)) {
|
|
212
|
-
// SANY's lexer ends a comment token at each (* and *) nested in a block comment.
|
|
213
197
|
let depth = 1;
|
|
214
198
|
let segmentStart = offset;
|
|
215
199
|
let end = offset + 2;
|