tla-ts 0.0.9-dev.8298a52 → 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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -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 +1 -1
- 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 +1 -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 +564 -366
- package/src/cli/options.ts +10 -5
- 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 +525 -216
- package/src/cli/typescript.ts +0 -3
- 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 +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- 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 +77 -117
- package/src/liveness.ts +106 -62
- 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 +24 -33
- package/src/parallel.ts +48 -40
- 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 +1 -16
- 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 +260 -91
- 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 +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- package/src/worker.ts +7 -8
package/src/sany/levels.ts
CHANGED
|
@@ -27,9 +27,7 @@ import {
|
|
|
27
27
|
type ThmOrAssumpDefNode,
|
|
28
28
|
} from "./nodes";
|
|
29
29
|
|
|
30
|
-
// A port of the levelCheck methods of SANY's semantic nodes
|
|
31
|
-
// its XMLExporter writes, and the level errors it reports. Each check returns what SANY's returns,
|
|
32
|
-
// which is whether the node is free of level errors, or true for the nodes that ignore that.
|
|
30
|
+
// A port of the levelCheck methods of SANY's semantic nodes.
|
|
33
31
|
|
|
34
32
|
type AnyDefNode = OpDefNode | ThmOrAssumpDefNode;
|
|
35
33
|
|
|
@@ -72,7 +70,6 @@ const addArgLevelParams = (
|
|
|
72
70
|
});
|
|
73
71
|
};
|
|
74
72
|
|
|
75
|
-
// SetOfLevelConstraints.put keeps the lowest bound.
|
|
76
73
|
const putLevelConstraint = (target: Map<SymbolNode, number>, param: SymbolNode, level: number) => {
|
|
77
74
|
target.set(param, Math.min(level, target.get(param) ?? TEMPORAL_LEVEL));
|
|
78
75
|
};
|
|
@@ -89,7 +86,6 @@ const putLevelConstraints = (
|
|
|
89
86
|
|
|
90
87
|
const getArgLevelConstraintKey = (param: SymbolNode, position: number) => `${param.id}:${position}`;
|
|
91
88
|
|
|
92
|
-
// SetOfArgLevelConstraints.put keeps the highest bound.
|
|
93
89
|
const putArgLevelConstraint = (
|
|
94
90
|
target: Map<string, ArgLevelConstraint>,
|
|
95
91
|
param: SymbolNode,
|
|
@@ -129,7 +125,6 @@ const mergeLevels = (node: LevelFields, part: LevelFields) => {
|
|
|
129
125
|
addArgLevelParams(node.argLevelParams, part.argLevelParams);
|
|
130
126
|
};
|
|
131
127
|
|
|
132
|
-
// ArgLevelParam.occur.
|
|
133
128
|
const isOccurring = (argLevelParam: ArgLevelParam, symbols: SymbolNode[]) =>
|
|
134
129
|
symbols.includes(argLevelParam.op) || symbols.includes(argLevelParam.param);
|
|
135
130
|
|
|
@@ -170,14 +165,12 @@ const getBoundSymbols = (node: OpApplNode) => [
|
|
|
170
165
|
const getSubstitute = (symbol: SymbolNode, substs: Subst[]) =>
|
|
171
166
|
substs.find((subst) => subst.op === symbol)?.expr;
|
|
172
167
|
|
|
173
|
-
// Subst.paramSet and Subst.allParamSet.
|
|
174
168
|
const getSubstitutedParams = (param: SymbolNode, substs: Subst[], isAll: boolean) => {
|
|
175
169
|
const substitute = getSubstitute(param, substs);
|
|
176
170
|
if (substitute === undefined) return new Set([param]);
|
|
177
171
|
return isAll ? substitute.allParams : substitute.levelParams;
|
|
178
172
|
};
|
|
179
173
|
|
|
180
|
-
// Subst.getSubALPSet.
|
|
181
174
|
const getSubstitutedArgLevelParams = (source: Map<string, ArgLevelParam>, substs: Subst[]) => {
|
|
182
175
|
const result = new Map<string, ArgLevelParam>();
|
|
183
176
|
source.forEach((argLevelParam, key) => {
|
|
@@ -201,7 +194,6 @@ interface ConstraintSource {
|
|
|
201
194
|
argLevelParams: Map<string, ArgLevelParam>;
|
|
202
195
|
}
|
|
203
196
|
|
|
204
|
-
// Subst.getSubLCSet.
|
|
205
197
|
const getSubstitutedLevelConstraints = (
|
|
206
198
|
body: ConstraintSource,
|
|
207
199
|
substs: Subst[],
|
|
@@ -235,7 +227,6 @@ const getSubstitutedLevelConstraints = (
|
|
|
235
227
|
return result;
|
|
236
228
|
};
|
|
237
229
|
|
|
238
|
-
// Subst.getSubALCSet.
|
|
239
230
|
const getSubstitutedArgLevelConstraints = (
|
|
240
231
|
body: ConstraintSource,
|
|
241
232
|
substs: Subst[],
|
|
@@ -268,7 +259,6 @@ const getSubstitutedArgLevelConstraints = (
|
|
|
268
259
|
return result;
|
|
269
260
|
};
|
|
270
261
|
|
|
271
|
-
// ModuleNode.isConstant.
|
|
272
262
|
const isConstantModule = (module: ModuleNode, check: LevelCheck) => {
|
|
273
263
|
if (getDeclarations(module, VARIABLE_DECL_KIND).length > 0) return false;
|
|
274
264
|
checkModuleLevels(module, check);
|
|
@@ -278,19 +268,18 @@ const isConstantModule = (module: ModuleNode, check: LevelCheck) => {
|
|
|
278
268
|
return module.topLevel.every((node) => node.kind !== "Theorem" || node.level === CONSTANT_LEVEL);
|
|
279
269
|
};
|
|
280
270
|
|
|
281
|
-
// The parts of OpDefNode.levelCheck and ThmOrAssumpDefNode.levelCheck that follow the body's.
|
|
282
271
|
const checkDefinitionBody = (node: AnyDefNode, params: FormalParamNode[], body: LevelFields) => {
|
|
283
272
|
node.minMaxLevel = params.map((param) =>
|
|
284
273
|
Array.from(
|
|
285
274
|
{ length: param.arity },
|
|
286
|
-
(
|
|
275
|
+
(_value, position) =>
|
|
287
276
|
body.argLevelConstraints.get(getArgLevelConstraintKey(param, position))?.level ??
|
|
288
277
|
CONSTANT_LEVEL,
|
|
289
278
|
),
|
|
290
279
|
);
|
|
291
280
|
node.opLevelCond = params.map((param) =>
|
|
292
281
|
params.map((other) =>
|
|
293
|
-
Array.from({ length: param.arity }, (
|
|
282
|
+
Array.from({ length: param.arity }, (_value, index) =>
|
|
294
283
|
body.argLevelParams.has(getArgLevelKey(param, index, other)),
|
|
295
284
|
),
|
|
296
285
|
),
|
|
@@ -323,8 +312,6 @@ const checkDefinitionBody = (node: AnyDefNode, params: FormalParamNode[], body:
|
|
|
323
312
|
);
|
|
324
313
|
};
|
|
325
314
|
|
|
326
|
-
// The checks of OpApplNode.levelCheck that compare the levels of the arguments of a defined
|
|
327
|
-
// operator with the levels it allows.
|
|
328
315
|
const checkArguments = (
|
|
329
316
|
node: OpApplNode,
|
|
330
317
|
operator: AnyDefNode,
|
|
@@ -395,7 +382,6 @@ const checkArguments = (
|
|
|
395
382
|
});
|
|
396
383
|
};
|
|
397
384
|
|
|
398
|
-
// The level constraints OpApplNode.levelCheck derives for an application of a defined operator.
|
|
399
385
|
const constrainArguments = (
|
|
400
386
|
node: OpApplNode,
|
|
401
387
|
operator: AnyDefNode,
|
|
@@ -405,7 +391,7 @@ const constrainArguments = (
|
|
|
405
391
|
) => {
|
|
406
392
|
const params = operator.params ?? [];
|
|
407
393
|
const getArgument = (symbol: SymbolNode) =>
|
|
408
|
-
node.operands.find((
|
|
394
|
+
node.operands.find((_operand, index) => params[index] === symbol);
|
|
409
395
|
putLevelConstraints(node.levelConstraints, operator.levelConstraints);
|
|
410
396
|
node.operands.forEach((operand) => {
|
|
411
397
|
if (operand === undefined) return;
|
|
@@ -532,8 +518,6 @@ const constrainArguments = (
|
|
|
532
518
|
});
|
|
533
519
|
};
|
|
534
520
|
|
|
535
|
-
// The operators OpApplNode.levelCheck rejects with both temporal and action arguments, and how its
|
|
536
|
-
// message names them.
|
|
537
521
|
const LOGICAL_OPERATOR_NAMES = new Map([
|
|
538
522
|
["\\land", "\\land"],
|
|
539
523
|
["\\lor", "\\lor"],
|
|
@@ -543,9 +527,6 @@ const LOGICAL_OPERATOR_NAMES = new Map([
|
|
|
543
527
|
["$DisjList", "Disjunction list"],
|
|
544
528
|
]);
|
|
545
529
|
|
|
546
|
-
// The checks at the end of OpApplNode.levelCheck of the temporal operators and quantifiers. TLC
|
|
547
|
-
// 1.7.4's SANY reports these errors but leaves the node level-correct, so an operator applied to it
|
|
548
|
-
// still checks its level.
|
|
549
530
|
const checkTemporalApplication = (node: OpApplNode, check: LevelCheck) => {
|
|
550
531
|
const addTemporalError = (location: SanyLocation, text: string) => {
|
|
551
532
|
addError(check, location, text);
|
|
@@ -698,7 +679,7 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
698
679
|
node.levelChecked = iteration;
|
|
699
680
|
node.maxLevels = node.params.map(() => TEMPORAL_LEVEL);
|
|
700
681
|
// SANY allocates isLeibnizArg anew for each parameter, so only the last one starts out Leibniz.
|
|
701
|
-
node.isLeibnizArg = node.params.map((
|
|
682
|
+
node.isLeibnizArg = node.params.map((_param, index) => index === node.params.length - 1);
|
|
702
683
|
if (node.params.length > 0) node.isLeibniz = true;
|
|
703
684
|
node.levelCorrect = checkLevel(node.body, iteration, check);
|
|
704
685
|
node.level = node.body.level;
|
|
@@ -710,8 +691,6 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
710
691
|
return node.levelCorrect;
|
|
711
692
|
};
|
|
712
693
|
|
|
713
|
-
// ModuleNode.levelCheck: the definitions of each recursive section are checked twice, the second
|
|
714
|
-
// time with the highest level and the parameters of the section's recursive operators.
|
|
715
694
|
export const checkModuleLevels = (module: ModuleNode, check: LevelCheck) => {
|
|
716
695
|
if (module.isLevelChecked) return module.levelCorrect;
|
|
717
696
|
module.isLevelChecked = true;
|
|
@@ -796,7 +775,6 @@ export const checkModuleLevels = (module: ModuleNode, check: LevelCheck) => {
|
|
|
796
775
|
return module.levelCorrect;
|
|
797
776
|
};
|
|
798
777
|
|
|
799
|
-
// LevelNode.levelCheckSubnodes, which skips modules.
|
|
800
778
|
const checkSubnodes = (
|
|
801
779
|
node: LevelFields,
|
|
802
780
|
subnodes: SemanticNode[],
|
|
@@ -816,8 +794,6 @@ const checkSubnodes = (
|
|
|
816
794
|
return node.levelCorrect;
|
|
817
795
|
};
|
|
818
796
|
|
|
819
|
-
// TheoremNode.LevelCheckTemporal: the steps of the proof of a temporal theorem that must be
|
|
820
|
-
// constant.
|
|
821
797
|
const checkTemporalProof = (proof: ProofNode | undefined, check: LevelCheck) => {
|
|
822
798
|
if (proof?.kind !== "NonLeafProof") return;
|
|
823
799
|
proof.steps.forEach((step) => {
|
|
@@ -840,7 +816,6 @@ const checkTemporalProof = (proof: ProofNode | undefined, check: LevelCheck) =>
|
|
|
840
816
|
});
|
|
841
817
|
};
|
|
842
818
|
|
|
843
|
-
// InstanceNode.levelCheck.
|
|
844
819
|
const checkInstance = (node: InstanceNode, iteration: number, check: LevelCheck) => {
|
|
845
820
|
if (node.levelChecked >= iteration) return node.levelCorrect;
|
|
846
821
|
node.levelChecked = iteration;
|
|
@@ -1121,7 +1096,6 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1121
1096
|
node.levelChecked = iteration;
|
|
1122
1097
|
const isBodyCorrect = checkLevel(node.body, iteration, check);
|
|
1123
1098
|
const isDefinitionCorrect = !node.definition || checkLevel(node.definition, iteration, check);
|
|
1124
|
-
// AssumeNode's getters return its expression's levels.
|
|
1125
1099
|
node.level = node.body.level;
|
|
1126
1100
|
shareLevels(node, node.body);
|
|
1127
1101
|
if (node.level !== CONSTANT_LEVEL) {
|
|
@@ -1134,8 +1108,7 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1134
1108
|
return isBodyCorrect && isDefinitionCorrect;
|
|
1135
1109
|
}
|
|
1136
1110
|
case "Theorem": {
|
|
1137
|
-
// TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on
|
|
1138
|
-
// theorem's definition, or its statement when it has none, and its proof.
|
|
1111
|
+
// SANY's TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on it.
|
|
1139
1112
|
if (node.levelChecked >= iteration) return true;
|
|
1140
1113
|
const isCorrect = checkSubnodes(
|
|
1141
1114
|
node,
|
|
@@ -1191,7 +1164,6 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1191
1164
|
node.goal.level,
|
|
1192
1165
|
);
|
|
1193
1166
|
[node.goal, ...node.assumptions].forEach((part) => mergeLevels(node, part));
|
|
1194
|
-
// LevelNode.addTemporalLevelConstraintToConstants.
|
|
1195
1167
|
if (node.levelCorrect) {
|
|
1196
1168
|
node.levelParams.forEach((param) => {
|
|
1197
1169
|
if (param.kind === "OpDecl" && param.declKind === CONSTANT_DECL_KIND) {
|
package/src/sany/lexer.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { TlaError } from "../errors";
|
|
2
2
|
|
|
3
|
-
// An emulation of the token manager that JavaCC generates for SANY's grammar, javacc/tla+.jj
|
|
4
|
-
// tokens it produces, their kinds in TLAplusParserConstants order, and their positions.
|
|
3
|
+
// An emulation of the token manager that JavaCC generates for SANY's grammar, javacc/tla+.jj.
|
|
5
4
|
|
|
6
5
|
export interface SanyToken {
|
|
7
6
|
kind: number;
|
|
@@ -11,8 +10,6 @@ export interface SanyToken {
|
|
|
11
10
|
next: SanyToken | undefined;
|
|
12
11
|
}
|
|
13
12
|
|
|
14
|
-
// The token kinds, in the order of TLAplusParserConstants, each with the literal images that
|
|
15
|
-
// produce it. JavaCC breaks a tie between matches of the same length by this order.
|
|
16
13
|
const KINDS: [string, ...string[]][] = [
|
|
17
14
|
["EOF"],
|
|
18
15
|
["BEGIN_PRAGMA", "--->"],
|
|
@@ -228,7 +225,6 @@ const KIND_INDEXES = new Map(
|
|
|
228
225
|
KIND_NAMES.map((name, kind): [string, number] => [name, kind]).reverse(),
|
|
229
226
|
);
|
|
230
227
|
|
|
231
|
-
// The anonymous infix operators share the name "infix", which no caller looks up.
|
|
232
228
|
export const getKind = (name: string) => {
|
|
233
229
|
const kind = KIND_INDEXES.get(name);
|
|
234
230
|
if (kind === undefined) throw new TlaError(`Unknown SANY token kind ${name}`);
|
|
@@ -241,7 +237,7 @@ const LITERALS = new Map(
|
|
|
241
237
|
const LONGEST_LITERAL = Math.max(...[...LITERALS.keys()].map((image) => image.length));
|
|
242
238
|
const LITERAL_LENGTHS = Array.from(
|
|
243
239
|
{ length: LONGEST_LITERAL },
|
|
244
|
-
(
|
|
240
|
+
(_value, index) => LONGEST_LITERAL - index,
|
|
245
241
|
);
|
|
246
242
|
|
|
247
243
|
const BEGIN_MODULE = /----+ *MODULE/y;
|
|
@@ -261,7 +257,6 @@ const BAND_PATTERNS = getJunctionPatterns(String.raw`\.\/\\`);
|
|
|
261
257
|
const BOR_PATTERNS = getJunctionPatterns(String.raw`\.\\\/`);
|
|
262
258
|
const STEP = String.raw`<(?:[0-9]+|\+|\*)>`;
|
|
263
259
|
|
|
264
|
-
// The tokens of the SPEC lexical state that are not literals, with their kinds.
|
|
265
260
|
const SPEC_PATTERNS: [string, RegExp[]][] = [
|
|
266
261
|
["_BM0", [BEGIN_MODULE]],
|
|
267
262
|
["SEPARATOR", [/----+/y]],
|
|
@@ -278,7 +273,6 @@ const SPEC_PATTERNS: [string, RegExp[]][] = [
|
|
|
278
273
|
["UnnumberedStepLexeme", [new RegExp(String.raw`${STEP}(?:\*\.*|-\.*|\.+)`, "y")]],
|
|
279
274
|
];
|
|
280
275
|
|
|
281
|
-
// The tokens of the DEFAULT and PRAGMA lexical states, which skip every other character.
|
|
282
276
|
const DEFAULT_PATTERNS: [string, RegExp[]][] = [
|
|
283
277
|
["BEGIN_PRAGMA", [/--->/y]],
|
|
284
278
|
["_BM1", [BEGIN_MODULE]],
|
|
@@ -296,7 +290,6 @@ const getMatchLength = (pattern: RegExp, source: string, offset: number) => {
|
|
|
296
290
|
return pattern.exec(source)?.[0].length ?? 0;
|
|
297
291
|
};
|
|
298
292
|
|
|
299
|
-
// The longest match at offset, the earliest kind among matches of that length.
|
|
300
293
|
const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
|
|
301
294
|
patterns
|
|
302
295
|
.map(([name, regexes]) => ({
|
|
@@ -329,46 +322,45 @@ const matchSpecToken = (source: string, offset: number) => {
|
|
|
329
322
|
|
|
330
323
|
export const getTabStop = (column: number) => column + 8 - (column % 8);
|
|
331
324
|
|
|
332
|
-
// SimpleCharStream.UpdateLineColumn: the line and column of each character, with tabs stopping
|
|
333
|
-
// at multiples of 8.
|
|
334
325
|
const getPositions = (source: string) => {
|
|
335
326
|
const lines: number[] = [];
|
|
336
327
|
const columns: number[] = [];
|
|
337
|
-
|
|
328
|
+
let line = 1;
|
|
329
|
+
let column = 0;
|
|
330
|
+
let isAfterCr = false;
|
|
331
|
+
let isAfterLf = false;
|
|
338
332
|
for (const character of source) {
|
|
339
333
|
for (let unit = 0; unit < character.length; unit++) {
|
|
340
|
-
|
|
341
|
-
if (
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
} else if (
|
|
346
|
-
|
|
347
|
-
if (character === "\n")
|
|
334
|
+
column++;
|
|
335
|
+
if (isAfterLf) {
|
|
336
|
+
isAfterLf = false;
|
|
337
|
+
line++;
|
|
338
|
+
column = 1;
|
|
339
|
+
} else if (isAfterCr) {
|
|
340
|
+
isAfterCr = false;
|
|
341
|
+
if (character === "\n") isAfterLf = true;
|
|
348
342
|
else {
|
|
349
|
-
|
|
350
|
-
|
|
343
|
+
line++;
|
|
344
|
+
column = 1;
|
|
351
345
|
}
|
|
352
346
|
}
|
|
353
|
-
if (character === "\r")
|
|
354
|
-
else if (character === "\n")
|
|
355
|
-
else if (character === "\t")
|
|
356
|
-
lines.push(
|
|
357
|
-
columns.push(
|
|
347
|
+
if (character === "\r") isAfterCr = true;
|
|
348
|
+
else if (character === "\n") isAfterLf = true;
|
|
349
|
+
else if (character === "\t") column = getTabStop(column - 1);
|
|
350
|
+
lines.push(line);
|
|
351
|
+
columns.push(column);
|
|
358
352
|
}
|
|
359
353
|
}
|
|
360
354
|
return { lines, columns };
|
|
361
355
|
};
|
|
362
356
|
|
|
363
|
-
// The characters of a string literal that a string literal could still continue.
|
|
364
357
|
const STRING_PREFIX = /"(?:[^"\n\r\\]|\\[ntrf\\"])*\\?/y;
|
|
365
358
|
const LITERAL_PREFIXES = new Set(
|
|
366
359
|
[...LITERALS.keys()].flatMap((image) =>
|
|
367
|
-
Array.from({ length: image.length - 1 }, (
|
|
360
|
+
Array.from({ length: image.length - 1 }, (_value, index) => image.slice(0, index + 1)),
|
|
368
361
|
),
|
|
369
362
|
);
|
|
370
363
|
|
|
371
|
-
// The characters JavaCC's token manager reads at offset while some token could still continue.
|
|
372
364
|
const getTokenPrefix = (source: string, offset: number) => {
|
|
373
365
|
let length = 0;
|
|
374
366
|
while (LITERAL_PREFIXES.has(source.slice(offset, offset + length + 1))) length++;
|
|
@@ -378,12 +370,10 @@ const getTokenPrefix = (source: string, offset: number) => {
|
|
|
378
370
|
);
|
|
379
371
|
};
|
|
380
372
|
|
|
381
|
-
// A lazy token stream over source, which returns SANY's message for the TokenMgrError JavaCC's
|
|
382
|
-
// token manager throws at a character no token continues with, or at the end of the file in a
|
|
383
|
-
// comment.
|
|
384
373
|
export const createSanyLexer = (source: string) => {
|
|
385
374
|
const positions = getPositions(source);
|
|
386
|
-
|
|
375
|
+
let nextOffset = 0;
|
|
376
|
+
let mode = "DEFAULT";
|
|
387
377
|
const createToken = (kind: number, start: number, length: number): SanyToken => ({
|
|
388
378
|
kind,
|
|
389
379
|
image: source.slice(start, start + length),
|
|
@@ -393,8 +383,6 @@ export const createSanyLexer = (source: string) => {
|
|
|
393
383
|
});
|
|
394
384
|
// JavaCC places the end of the file at the file's last character.
|
|
395
385
|
const getEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
396
|
-
// The lexer read the characters from start to end, and TLAplusParser.parse reports the end of
|
|
397
|
-
// the file in a token that starts on an earlier line as an open comment.
|
|
398
386
|
const getLexicalError = (start: number, end: number, after: string) => {
|
|
399
387
|
const index = end - 1;
|
|
400
388
|
const line = positions.lines[index];
|
|
@@ -407,14 +395,12 @@ export const createSanyLexer = (source: string) => {
|
|
|
407
395
|
? formatLexicalError(line + 1, 0, undefined, after)
|
|
408
396
|
: formatLexicalError(line, column + 1, undefined, after);
|
|
409
397
|
};
|
|
410
|
-
// A comment is a chain of MORE matches, which restarts after each nested comment bracket, and the
|
|
411
|
-
// end of the file right after a bracket ends the token stream.
|
|
412
398
|
const skipComment = () => {
|
|
413
|
-
const start =
|
|
399
|
+
const start = nextOffset;
|
|
414
400
|
if (source.startsWith("\\*", start)) {
|
|
415
401
|
const end = source.slice(start).search(/[\n\r]/);
|
|
416
402
|
if (end === -1) return getLexicalError(start, source.length, "");
|
|
417
|
-
|
|
403
|
+
nextOffset += end + 1;
|
|
418
404
|
return undefined;
|
|
419
405
|
}
|
|
420
406
|
let depth = 0;
|
|
@@ -430,41 +416,40 @@ export const createSanyLexer = (source: string) => {
|
|
|
430
416
|
offset += 2;
|
|
431
417
|
chainStart = offset;
|
|
432
418
|
if (depth === 0) {
|
|
433
|
-
|
|
419
|
+
nextOffset = offset;
|
|
434
420
|
return undefined;
|
|
435
421
|
}
|
|
436
422
|
} else offset++;
|
|
437
423
|
}
|
|
438
|
-
|
|
424
|
+
nextOffset = offset;
|
|
439
425
|
return chainStart === source.length ? undefined : getLexicalError(chainStart, offset, "");
|
|
440
426
|
};
|
|
441
427
|
const getSkippingToken = (patterns: [string, RegExp[]][]): SanyToken => {
|
|
442
|
-
while (
|
|
443
|
-
const match = matchPatterns(patterns, source,
|
|
428
|
+
while (nextOffset < source.length) {
|
|
429
|
+
const match = matchPatterns(patterns, source, nextOffset);
|
|
444
430
|
if (match.length > 0) {
|
|
445
|
-
const token = createToken(match.kind,
|
|
446
|
-
|
|
447
|
-
if (KIND_NAMES[match.kind].startsWith("_BM"))
|
|
448
|
-
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA")
|
|
431
|
+
const token = createToken(match.kind, nextOffset, match.length);
|
|
432
|
+
nextOffset += match.length;
|
|
433
|
+
if (KIND_NAMES[match.kind].startsWith("_BM")) mode = "SPEC";
|
|
434
|
+
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA") mode = "PRAGMA";
|
|
449
435
|
return token;
|
|
450
436
|
}
|
|
451
|
-
|
|
437
|
+
nextOffset++;
|
|
452
438
|
}
|
|
453
439
|
return getEndOfFile();
|
|
454
440
|
};
|
|
455
441
|
const getNextToken = (): SanyToken | string => {
|
|
456
|
-
if (
|
|
457
|
-
if (
|
|
458
|
-
while (
|
|
459
|
-
const offset =
|
|
460
|
-
if (" \t\n\r".includes(source[offset]))
|
|
442
|
+
if (mode === "DEFAULT") return getSkippingToken(DEFAULT_PATTERNS);
|
|
443
|
+
if (mode === "PRAGMA") return getSkippingToken(PRAGMA_PATTERNS);
|
|
444
|
+
while (nextOffset < source.length) {
|
|
445
|
+
const offset = nextOffset;
|
|
446
|
+
if (" \t\n\r".includes(source[offset])) nextOffset++;
|
|
461
447
|
else if (source.startsWith("(*", offset) || source.startsWith("\\*", offset)) {
|
|
462
448
|
const error = skipComment();
|
|
463
449
|
if (error !== undefined) return error;
|
|
464
450
|
} else {
|
|
465
451
|
const match = matchSpecToken(source, offset);
|
|
466
452
|
if (match.length === 0) {
|
|
467
|
-
// JavaCC reads on while a token could continue, and one more character.
|
|
468
453
|
const prefix = getTokenPrefix(source, offset);
|
|
469
454
|
const end = Math.min(offset + prefix.length + 1, source.length);
|
|
470
455
|
const read = source.slice(offset, end);
|
|
@@ -472,7 +457,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
472
457
|
return getLexicalError(offset, end, after);
|
|
473
458
|
}
|
|
474
459
|
const token = createToken(match.kind, offset, match.length);
|
|
475
|
-
|
|
460
|
+
nextOffset += match.length;
|
|
476
461
|
return token;
|
|
477
462
|
}
|
|
478
463
|
}
|
|
@@ -481,7 +466,6 @@ export const createSanyLexer = (source: string) => {
|
|
|
481
466
|
return getNextToken;
|
|
482
467
|
};
|
|
483
468
|
|
|
484
|
-
// JavaCC's TokenMgrError.addEscapes, which escapes the characters of a lexical error's message.
|
|
485
469
|
const LEXEME_ESCAPES = new Map([
|
|
486
470
|
["\b", "\\b"],
|
|
487
471
|
["\t", "\\t"],
|
|
@@ -502,8 +486,6 @@ export const escapeLexeme = (text: string) =>
|
|
|
502
486
|
(character === "\0" ? "" : `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`),
|
|
503
487
|
);
|
|
504
488
|
|
|
505
|
-
// TokenMgrError.LexicalError: the character the lexer stopped at, or the end of the file, and the
|
|
506
|
-
// characters of the token it had read.
|
|
507
489
|
export const formatLexicalError = (
|
|
508
490
|
line: number,
|
|
509
491
|
column: number,
|
|
@@ -512,8 +494,6 @@ export const formatLexicalError = (
|
|
|
512
494
|
) =>
|
|
513
495
|
`Lexical error at line ${line}, column ${column}. Encountered: ${character === undefined ? "<EOF> " : `"${escapeLexeme(character)}" (${character.charCodeAt(0)}), `}after : "${escapeLexeme(after)}"`;
|
|
514
496
|
|
|
515
|
-
// TLC 1.7.4's lexer, which JavaCC generated without UNICODE_INPUT, reads a character past U+00FF
|
|
516
|
-
// outside a comment by its low byte, and stops at one whose low byte is below 0x80.
|
|
517
497
|
export const getSany174LexicalError = (source: string) => {
|
|
518
498
|
const readToken = createSanyLexer(source);
|
|
519
499
|
for (
|
package/src/sany/linter.ts
CHANGED
|
@@ -7,10 +7,8 @@ import {
|
|
|
7
7
|
type SemanticNode,
|
|
8
8
|
} from "./nodes";
|
|
9
9
|
|
|
10
|
-
// A port of SANY's tla2sany.linter.Linter
|
|
11
|
-
// definition or declaration of the module.
|
|
10
|
+
// A port of SANY's tla2sany.linter.Linter.
|
|
12
11
|
|
|
13
|
-
// SemanticNode.getChildren.
|
|
14
12
|
const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
|
|
15
13
|
switch (node.kind) {
|
|
16
14
|
case "OpAppl":
|
|
@@ -35,7 +33,6 @@ const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
|
|
|
35
33
|
}
|
|
36
34
|
};
|
|
37
35
|
|
|
38
|
-
// Operators whose values are sets of values that a record field may range over.
|
|
39
36
|
const SET_OPERATORS = new Map([
|
|
40
37
|
["Integers", "Int"],
|
|
41
38
|
["Naturals", "Nat"],
|
|
@@ -43,8 +40,6 @@ const SET_OPERATORS = new Map([
|
|
|
43
40
|
["Reals", "Reals"],
|
|
44
41
|
]);
|
|
45
42
|
|
|
46
|
-
// Linter.isBuiltFromDeclarations: whether an expression applies a declared or bound symbol, BOOLEAN
|
|
47
|
-
// or a standard set of numbers, directly or through the definitions it applies.
|
|
48
43
|
const isBuiltFromDeclarations = (node: SemanticNode | undefined) => {
|
|
49
44
|
const visited = new Set<SemanticNode>();
|
|
50
45
|
const visit = (current: SemanticNode | undefined): boolean => {
|
|
@@ -74,7 +69,6 @@ const getFieldName = (pair: OpApplNode) => {
|
|
|
74
69
|
return name?.kind === "String" ? name : undefined;
|
|
75
70
|
};
|
|
76
71
|
|
|
77
|
-
// Records.sameDomain, given that SANY rejects a record with two fields of the same name.
|
|
78
72
|
const getDomain = (record: OpApplNode) =>
|
|
79
73
|
JSON.stringify([
|
|
80
74
|
record.operands.length,
|
|
@@ -83,7 +77,6 @@ const getDomain = (record: OpApplNode) =>
|
|
|
83
77
|
.sort(),
|
|
84
78
|
]);
|
|
85
79
|
|
|
86
|
-
// ModuleNode.getExtendedModuleSet(true).
|
|
87
80
|
const getExtendedModules = (module: ModuleNode, found = new Set<ModuleNode>()) => {
|
|
88
81
|
module.extendees.forEach((extendee) => {
|
|
89
82
|
if (found.has(extendee)) return;
|
|
@@ -93,7 +86,6 @@ const getExtendedModules = (module: ModuleNode, found = new Set<ModuleNode>()) =
|
|
|
93
86
|
return found;
|
|
94
87
|
};
|
|
95
88
|
|
|
96
|
-
// Linter.lintRecords: the warnings for the records of a module.
|
|
97
89
|
export const lintSanyModule = (module: ModuleNode): SanyMessage[] => {
|
|
98
90
|
const linted = module.records.map((record) => ({
|
|
99
91
|
domain: getDomain(record),
|
package/src/sany/modules.ts
CHANGED
|
@@ -156,8 +156,7 @@ CopiesIn(e, B) ==
|
|
|
156
156
|
5 Dec 98 : Initial version.
|
|
157
157
|
`;
|
|
158
158
|
|
|
159
|
-
//
|
|
160
|
-
// since the XML that SANY exports locates every node of them and keeps their comments.
|
|
159
|
+
// Verbatim from tla2tools.jar 2026.10.28, since SANY's XML locates every node and keeps comments.
|
|
161
160
|
export const SANY_STANDARD_MODULES = new Map([
|
|
162
161
|
["Bags", BAGS],
|
|
163
162
|
[
|
|
@@ -1289,8 +1288,6 @@ _TLCTrace ==
|
|
|
1289
1288
|
],
|
|
1290
1289
|
]);
|
|
1291
1290
|
|
|
1292
|
-
// The standard modules of TLC 1.7.4's tla2tools.jar, which has none of the later ones and older
|
|
1293
|
-
// Bags, Randomization and Toolbox modules.
|
|
1294
1291
|
export const SANY_174_STANDARD_MODULES = new Map([
|
|
1295
1292
|
...[...SANY_STANDARD_MODULES].filter(([name]) =>
|
|
1296
1293
|
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(name),
|
|
@@ -1393,6 +1390,5 @@ _TEPosition ==
|
|
|
1393
1390
|
],
|
|
1394
1391
|
]);
|
|
1395
1392
|
|
|
1396
|
-
// The standard modules of the SANY of a TLC.
|
|
1397
1393
|
export const getSanyStandardModules = (version: TlcVersion = "master") =>
|
|
1398
1394
|
version === "1.7.4" ? SANY_174_STANDARD_MODULES : SANY_STANDARD_MODULES;
|