tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
package/src/lexer.ts
CHANGED
|
@@ -12,7 +12,6 @@ type TokenKind =
|
|
|
12
12
|
| "ModuleEnd"
|
|
13
13
|
| "End";
|
|
14
14
|
|
|
15
|
-
// spelling holds the text of an operator written as a synonym, such as (+) for \oplus.
|
|
16
15
|
export interface Token {
|
|
17
16
|
kind: TokenKind;
|
|
18
17
|
text: string;
|
|
@@ -234,7 +233,6 @@ const SYMBOL_OPERATORS = [
|
|
|
234
233
|
"?",
|
|
235
234
|
];
|
|
236
235
|
|
|
237
|
-
// The Unicode forms of the operators SANY's grammar, javacc/tla+.jj, reads, as their ASCII forms.
|
|
238
236
|
const UNICODE_OPERATORS = new Map([
|
|
239
237
|
["∃", "\\E"],
|
|
240
238
|
["∀", "\\A"],
|
|
@@ -320,13 +318,12 @@ const NUMBER_BASES = new Map([
|
|
|
320
318
|
["h", 16],
|
|
321
319
|
]);
|
|
322
320
|
|
|
323
|
-
// A numeral token keeps its text as typed, such as \hFF, so errors can quote it as TLC does.
|
|
324
321
|
export const getNumeralValue = (text: string) =>
|
|
325
322
|
text.startsWith("\\")
|
|
326
323
|
? parseInt(text.slice(2), NUMBER_BASES.get(text[1].toLowerCase()))
|
|
327
324
|
: Number(text);
|
|
328
325
|
|
|
329
|
-
const MODULE_HEADER = /-{4,}
|
|
326
|
+
const MODULE_HEADER = /-{4,} *MODULE\b/;
|
|
330
327
|
|
|
331
328
|
const CODE_TAB = 9;
|
|
332
329
|
const CODE_NEWLINE = 10;
|
|
@@ -352,7 +349,6 @@ const IDENTIFIER = DIGIT | LETTER | UNDERSCORE;
|
|
|
352
349
|
|
|
353
350
|
const LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
|
|
354
351
|
|
|
355
|
-
// The classes each ASCII character belongs to, as a bit each.
|
|
356
352
|
const CHARACTER_CLASSES = new Uint8Array(128);
|
|
357
353
|
new Map([
|
|
358
354
|
["0123456789", DIGIT | HEX_DIGIT],
|
|
@@ -367,7 +363,6 @@ new Map([
|
|
|
367
363
|
}
|
|
368
364
|
});
|
|
369
365
|
|
|
370
|
-
// charCodeAt past the end of a source gives NaN, which is in no class.
|
|
371
366
|
const isInClass = (code: number, characterClass: number) =>
|
|
372
367
|
code < 128 && (CHARACTER_CLASSES[code] & characterClass) !== 0;
|
|
373
368
|
|
|
@@ -382,8 +377,6 @@ interface OperatorMatch {
|
|
|
382
377
|
length: number;
|
|
383
378
|
}
|
|
384
379
|
|
|
385
|
-
// The symbol operators that start with each character, in the order of SYMBOL_OPERATORS, which
|
|
386
|
-
// lists a longer operator before the operators it starts with.
|
|
387
380
|
const SYMBOL_OPERATORS_BY_START = new Map<number, string[]>();
|
|
388
381
|
SYMBOL_OPERATORS.forEach((symbol) => {
|
|
389
382
|
const start = symbol.charCodeAt(0);
|
|
@@ -413,13 +406,10 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
413
406
|
const code = source.charCodeAt(index);
|
|
414
407
|
if (code === CODE_BACKSLASH && isInClass(source.charCodeAt(index + 1), LETTER)) {
|
|
415
408
|
const word = source.slice(index + 1, skipClass(source, index + 1, LETTER));
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
}
|
|
421
|
-
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length.value));
|
|
422
|
-
return { text: operator ?? "\\", length: operator === undefined ? 1 : length.value + 1 };
|
|
409
|
+
let length = word.length;
|
|
410
|
+
while (length > 0 && !BACKSLASH_OPERATORS.has(word.slice(0, length))) length--;
|
|
411
|
+
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length));
|
|
412
|
+
return { text: operator ?? "\\", length: operator === undefined ? 1 : length + 1 };
|
|
423
413
|
}
|
|
424
414
|
const unicodeSymbol = matchUnicodeOperator(source, index);
|
|
425
415
|
if (unicodeSymbol !== undefined) {
|
|
@@ -430,8 +420,6 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
430
420
|
return code === CODE_BACKSLASH ? { text: "\\", length: 1 } : undefined;
|
|
431
421
|
};
|
|
432
422
|
|
|
433
|
-
// TLC's configuration parser reads its tokens with SANY's lexer, so it reads a Unicode operator, or
|
|
434
|
-
// ℕ, ℤ, or ℝ, as one token, which it compares as written with the words it expects.
|
|
435
423
|
const UNICODE_NAMES = new Set(["ℕ", "ℤ", "ℝ"]);
|
|
436
424
|
export const matchUnicodeToken = (source: string, index: number): OperatorMatch | undefined => {
|
|
437
425
|
const token = [source.slice(index, index + 2), source[index]].find(
|
|
@@ -445,25 +433,24 @@ export const skipWhile = (
|
|
|
445
433
|
index: number,
|
|
446
434
|
isMatch: (character: string) => boolean,
|
|
447
435
|
) => {
|
|
448
|
-
|
|
449
|
-
while (end
|
|
450
|
-
return end
|
|
436
|
+
let end = index;
|
|
437
|
+
while (end < source.length && isMatch(source[end])) end++;
|
|
438
|
+
return end;
|
|
451
439
|
};
|
|
452
440
|
|
|
453
|
-
|
|
454
|
-
// it appears.
|
|
455
|
-
const matchStep = (source: string, index: number) => {
|
|
441
|
+
const matchStep = (source: string, index: number, isTlapm: boolean) => {
|
|
456
442
|
const isImplicit = source[index + 1] === "+" || source[index + 1] === "*";
|
|
457
443
|
const levelEnd = isImplicit ? index + 2 : skipClass(source, index + 1, DIGIT);
|
|
458
444
|
if (levelEnd === index + 1 || source[levelEnd] !== ">") return 0;
|
|
459
|
-
const
|
|
460
|
-
const
|
|
445
|
+
const isNamed = !isImplicit || !isTlapm;
|
|
446
|
+
const nameEnd = isNamed ? skipClass(source, levelEnd + 1, IDENTIFIER) : levelEnd + 1;
|
|
447
|
+
const isDash =
|
|
448
|
+
isNamed && nameEnd === levelEnd + 1 && (source[nameEnd] === "*" || source[nameEnd] === "-");
|
|
461
449
|
return (
|
|
462
450
|
skipWhile(source, isDash ? nameEnd + 1 : nameEnd, (character) => character === ".") - index
|
|
463
451
|
);
|
|
464
452
|
};
|
|
465
453
|
|
|
466
|
-
// SANY's lexer reads @ as an identifier, which stands for the value an EXCEPT changes only alone.
|
|
467
454
|
export const readAtAsIdentifier = (token: Token): Token =>
|
|
468
455
|
token.kind === "Operator" && token.text === "@" ? { ...token, kind: "Identifier" } : token;
|
|
469
456
|
|
|
@@ -480,8 +467,7 @@ const BASED_NUMBER_DIGITS = new Map([
|
|
|
480
467
|
["h", HEX_DIGIT],
|
|
481
468
|
]);
|
|
482
469
|
|
|
483
|
-
|
|
484
|
-
const matchBasedNumber = (source: string, index: number) => {
|
|
470
|
+
export const matchBasedNumber = (source: string, index: number) => {
|
|
485
471
|
if (source.charCodeAt(index) !== CODE_BACKSLASH) return 0;
|
|
486
472
|
const digits = BASED_NUMBER_DIGITS.get(source.charAt(index + 1).toLowerCase());
|
|
487
473
|
if (digits === undefined) return 0;
|
|
@@ -489,7 +475,7 @@ const matchBasedNumber = (source: string, index: number) => {
|
|
|
489
475
|
return end === index + 2 ? 0 : end - index;
|
|
490
476
|
};
|
|
491
477
|
|
|
492
|
-
export const tokenize = (source: string): Token[] => {
|
|
478
|
+
export const tokenize = (source: string, isTlapm = false): Token[] => {
|
|
493
479
|
const headerMatch = MODULE_HEADER.exec(source);
|
|
494
480
|
if (!headerMatch)
|
|
495
481
|
throw new TlaSyntaxError("Expected a module header such as ---- MODULE Name ----");
|
|
@@ -497,24 +483,24 @@ export const tokenize = (source: string): Token[] => {
|
|
|
497
483
|
// Each name is one string object, so looking a name up in a scope compares pointers.
|
|
498
484
|
const names = new Map<string, string>();
|
|
499
485
|
const prefixLines = source.slice(0, headerMatch.index).split("\n");
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
486
|
+
let index = headerMatch.index;
|
|
487
|
+
let line = prefixLines.length;
|
|
488
|
+
let lineStart = headerMatch.index - prefixLines[prefixLines.length - 1].length;
|
|
489
|
+
let moduleDepth = 0;
|
|
490
|
+
|
|
491
|
+
let scanLineStart = -1;
|
|
492
|
+
let scanPosition = 0;
|
|
493
|
+
let scanWidth = 0;
|
|
508
494
|
const getColumn = () => {
|
|
509
|
-
if (
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
495
|
+
if (scanLineStart !== lineStart || scanPosition > index) {
|
|
496
|
+
scanLineStart = lineStart;
|
|
497
|
+
scanPosition = lineStart;
|
|
498
|
+
scanWidth = 0;
|
|
513
499
|
}
|
|
514
|
-
for (;
|
|
515
|
-
|
|
500
|
+
for (; scanPosition < index; scanPosition++) {
|
|
501
|
+
scanWidth = getWidthAfter(scanWidth, source.charCodeAt(scanPosition));
|
|
516
502
|
}
|
|
517
|
-
return getWidthAfter(
|
|
503
|
+
return getWidthAfter(scanWidth, source.charCodeAt(index));
|
|
518
504
|
};
|
|
519
505
|
const pushToken = (kind: TokenKind, text: string, length: number, spelling?: string) => {
|
|
520
506
|
const column = getColumn();
|
|
@@ -522,88 +508,83 @@ export const tokenize = (source: string): Token[] => {
|
|
|
522
508
|
kind,
|
|
523
509
|
text,
|
|
524
510
|
spelling,
|
|
525
|
-
line
|
|
511
|
+
line,
|
|
526
512
|
column,
|
|
527
513
|
endColumn: column + length - 1,
|
|
528
514
|
});
|
|
529
|
-
|
|
515
|
+
index += length;
|
|
530
516
|
};
|
|
531
517
|
const advanceOver = (length: number) => {
|
|
532
518
|
for (let offset = 0; offset < length; offset++) {
|
|
533
|
-
if (source.charCodeAt(
|
|
534
|
-
|
|
535
|
-
|
|
519
|
+
if (source.charCodeAt(index) === CODE_NEWLINE) {
|
|
520
|
+
line++;
|
|
521
|
+
lineStart = index + 1;
|
|
536
522
|
}
|
|
537
|
-
|
|
523
|
+
index++;
|
|
538
524
|
}
|
|
539
525
|
};
|
|
540
526
|
const createError = (message: string) =>
|
|
541
|
-
new TlaSyntaxError(`${message} at line ${
|
|
527
|
+
new TlaSyntaxError(`${message} at line ${line}, column ${getColumn()}`, undefined, {
|
|
542
528
|
reason: message,
|
|
543
|
-
line
|
|
529
|
+
line,
|
|
544
530
|
column: getColumn(),
|
|
545
|
-
isEnd:
|
|
531
|
+
isEnd: index >= source.length,
|
|
546
532
|
});
|
|
547
533
|
|
|
548
|
-
while (
|
|
549
|
-
const code = source.charCodeAt(
|
|
534
|
+
while (index < source.length) {
|
|
535
|
+
const code = source.charCodeAt(index);
|
|
550
536
|
|
|
551
537
|
if (code === CODE_NEWLINE || code === CODE_SPACE || code === CODE_TAB || code === CODE_RETURN) {
|
|
552
538
|
advanceOver(1);
|
|
553
539
|
continue;
|
|
554
540
|
}
|
|
555
|
-
if (code === CODE_BACKSLASH && source.charCodeAt(
|
|
556
|
-
const lineEnd = source
|
|
557
|
-
advanceOver(
|
|
541
|
+
if (code === CODE_BACKSLASH && source.charCodeAt(index + 1) === CODE_STAR) {
|
|
542
|
+
const lineEnd = skipWhile(source, index, (next) => next !== "\n" && next !== "\r");
|
|
543
|
+
advanceOver(lineEnd - index);
|
|
558
544
|
continue;
|
|
559
545
|
}
|
|
560
|
-
if (code === CODE_OPEN_PAREN && source.charCodeAt(
|
|
561
|
-
|
|
546
|
+
if (code === CODE_OPEN_PAREN && source.charCodeAt(index + 1) === CODE_STAR) {
|
|
547
|
+
let depth = 0;
|
|
562
548
|
do {
|
|
563
|
-
if (
|
|
564
|
-
if (source.startsWith("(*",
|
|
565
|
-
depth
|
|
549
|
+
if (index >= source.length) throw createError("Unterminated comment");
|
|
550
|
+
if (source.startsWith("(*", index)) {
|
|
551
|
+
depth++;
|
|
566
552
|
advanceOver(2);
|
|
567
|
-
} else if (source.startsWith("*)",
|
|
568
|
-
depth
|
|
553
|
+
} else if (source.startsWith("*)", index)) {
|
|
554
|
+
depth--;
|
|
569
555
|
advanceOver(2);
|
|
570
556
|
} else {
|
|
571
557
|
advanceOver(1);
|
|
572
558
|
}
|
|
573
|
-
} while (depth
|
|
559
|
+
} while (depth > 0);
|
|
574
560
|
continue;
|
|
575
561
|
}
|
|
576
|
-
if (code === CODE_DASH && source.startsWith("----",
|
|
577
|
-
const length = skipWhile(source,
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
.slice(cursor.index + length)
|
|
581
|
-
.trimStart()
|
|
582
|
-
.startsWith("MODULE")
|
|
583
|
-
)
|
|
584
|
-
cursor.moduleDepth++;
|
|
562
|
+
if (code === CODE_DASH && source.startsWith("----", index)) {
|
|
563
|
+
const length = skipWhile(source, index, (next) => next === "-") - index;
|
|
564
|
+
const keyword = skipWhile(source, index + length, (next) => next === " ");
|
|
565
|
+
if (source.startsWith("MODULE", keyword)) moduleDepth++;
|
|
585
566
|
pushToken("Separator", "----", length);
|
|
586
567
|
continue;
|
|
587
568
|
}
|
|
588
|
-
if (code === CODE_EQUALS && source.startsWith("====",
|
|
589
|
-
const length = skipWhile(source,
|
|
569
|
+
if (code === CODE_EQUALS && source.startsWith("====", index)) {
|
|
570
|
+
const length = skipWhile(source, index, (next) => next === "=") - index;
|
|
590
571
|
pushToken("ModuleEnd", "====", length);
|
|
591
|
-
|
|
592
|
-
if (
|
|
572
|
+
moduleDepth--;
|
|
573
|
+
if (moduleDepth <= 0) break;
|
|
593
574
|
continue;
|
|
594
575
|
}
|
|
595
576
|
if (code === CODE_QUOTE) {
|
|
596
|
-
const
|
|
577
|
+
const startLine = line;
|
|
597
578
|
const column = getColumn();
|
|
598
579
|
const characters: string[] = [];
|
|
599
580
|
advanceOver(1);
|
|
600
|
-
while (source.charCodeAt(
|
|
601
|
-
const next = source.charCodeAt(
|
|
602
|
-
if (
|
|
581
|
+
while (source.charCodeAt(index) !== CODE_QUOTE) {
|
|
582
|
+
const next = source.charCodeAt(index);
|
|
583
|
+
if (index >= source.length || next === CODE_NEWLINE || next === CODE_RETURN) {
|
|
603
584
|
throw createError("Unterminated string");
|
|
604
585
|
}
|
|
605
586
|
if (next === CODE_BACKSLASH) {
|
|
606
|
-
const escaped = source[
|
|
587
|
+
const escaped = source[index + 1];
|
|
607
588
|
if (escaped === undefined || !'ntrf\\"'.includes(escaped)) {
|
|
608
589
|
throw createError("Invalid escape in string");
|
|
609
590
|
}
|
|
@@ -611,39 +592,38 @@ export const tokenize = (source: string): Token[] => {
|
|
|
611
592
|
advanceOver(2);
|
|
612
593
|
continue;
|
|
613
594
|
}
|
|
614
|
-
characters.push(source[
|
|
595
|
+
characters.push(source[index]);
|
|
615
596
|
advanceOver(1);
|
|
616
597
|
}
|
|
617
598
|
advanceOver(1);
|
|
618
599
|
tokens.push({
|
|
619
600
|
kind: "String",
|
|
620
601
|
text: characters.join(""),
|
|
621
|
-
line,
|
|
602
|
+
line: startLine,
|
|
622
603
|
column,
|
|
623
604
|
endColumn: getColumn() - 1,
|
|
624
605
|
});
|
|
625
606
|
continue;
|
|
626
607
|
}
|
|
627
|
-
const basedLength = matchBasedNumber(source,
|
|
608
|
+
const basedLength = matchBasedNumber(source, index);
|
|
628
609
|
if (basedLength > 0) {
|
|
629
|
-
pushToken("Number", source.slice(
|
|
610
|
+
pushToken("Number", source.slice(index, index + basedLength), basedLength);
|
|
630
611
|
continue;
|
|
631
612
|
}
|
|
632
613
|
if (isInClass(code, IDENTIFIER)) {
|
|
633
|
-
const wordEnd = skipClass(source,
|
|
634
|
-
const word = source.slice(
|
|
635
|
-
const digitsEnd = skipClass(source,
|
|
614
|
+
const wordEnd = skipClass(source, index, IDENTIFIER);
|
|
615
|
+
const word = source.slice(index, wordEnd);
|
|
616
|
+
const digitsEnd = skipClass(source, index, DIGIT);
|
|
636
617
|
if (digitsEnd === wordEnd) {
|
|
637
618
|
const fractionEnd =
|
|
638
619
|
source.charCodeAt(wordEnd) === CODE_DOT ? skipClass(source, wordEnd + 1, DIGIT) : wordEnd;
|
|
639
620
|
const isDecimal = fractionEnd > wordEnd + 1;
|
|
640
|
-
const number = isDecimal ? source.slice(
|
|
621
|
+
const number = isDecimal ? source.slice(index, fractionEnd) : word;
|
|
641
622
|
pushToken(isDecimal ? "Decimal" : "Number", number, number.length);
|
|
642
623
|
continue;
|
|
643
624
|
}
|
|
644
|
-
// A word needs a letter to be a name, so SANY reads one without as underscores and numbers.
|
|
645
625
|
if (!/[A-Za-z]/.test(word)) {
|
|
646
|
-
const part = code === CODE_UNDERSCORE ? "_" : source.slice(
|
|
626
|
+
const part = code === CODE_UNDERSCORE ? "_" : source.slice(index, digitsEnd);
|
|
647
627
|
pushToken(part === "_" ? "Operator" : "Number", part, part.length);
|
|
648
628
|
continue;
|
|
649
629
|
}
|
|
@@ -656,22 +636,22 @@ export const tokenize = (source: string): Token[] => {
|
|
|
656
636
|
pushToken(KEYWORDS.has(word) ? "Keyword" : "Identifier", name, word.length);
|
|
657
637
|
continue;
|
|
658
638
|
}
|
|
659
|
-
const character = source[
|
|
639
|
+
const character = source[index];
|
|
660
640
|
if (code >= 128 && UNICODE_NAMES.has(character)) {
|
|
661
641
|
pushToken("Identifier", names.get(character) ?? character, 1);
|
|
662
642
|
names.set(character, character);
|
|
663
643
|
continue;
|
|
664
644
|
}
|
|
665
645
|
if (code === CODE_LESS_THAN) {
|
|
666
|
-
const stepLength = matchStep(source,
|
|
646
|
+
const stepLength = matchStep(source, index, isTlapm);
|
|
667
647
|
if (stepLength > 0) {
|
|
668
|
-
pushToken("Step", source.slice(
|
|
648
|
+
pushToken("Step", source.slice(index, index + stepLength), stepLength);
|
|
669
649
|
continue;
|
|
670
650
|
}
|
|
671
651
|
}
|
|
672
|
-
const operator = matchOperator(source,
|
|
652
|
+
const operator = matchOperator(source, index);
|
|
673
653
|
if (operator) {
|
|
674
|
-
const spelling = source.slice(
|
|
654
|
+
const spelling = source.slice(index, index + operator.length);
|
|
675
655
|
pushToken(
|
|
676
656
|
"Operator",
|
|
677
657
|
operator.text,
|
|
@@ -684,6 +664,6 @@ export const tokenize = (source: string): Token[] => {
|
|
|
684
664
|
}
|
|
685
665
|
|
|
686
666
|
const endColumn = getColumn();
|
|
687
|
-
tokens.push({ kind: "End", text: "", line
|
|
667
|
+
tokens.push({ kind: "End", text: "", line, column: endColumn, endColumn });
|
|
688
668
|
return tokens;
|
|
689
669
|
};
|