tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +194 -8
- package/dist/index.d.ts +194 -8
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +174 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
package/src/levels.ts
CHANGED
|
@@ -1,16 +1,24 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import {
|
|
2
|
+
getChildren,
|
|
3
|
+
type AssumeProve,
|
|
4
|
+
type Definition,
|
|
5
|
+
type Expression,
|
|
6
|
+
type Module,
|
|
7
|
+
type OperatorParam,
|
|
8
|
+
type Proof,
|
|
9
|
+
type ProofStep,
|
|
10
|
+
type SourceLocation,
|
|
8
11
|
} from "./ast";
|
|
9
|
-
import {
|
|
10
|
-
|
|
12
|
+
import {
|
|
13
|
+
createSanyError,
|
|
14
|
+
createSemanticError,
|
|
15
|
+
formatRange,
|
|
16
|
+
TlaSyntaxError,
|
|
17
|
+
type SanyError,
|
|
18
|
+
} from "./errors";
|
|
11
19
|
import { mapChildren } from "./instances";
|
|
12
|
-
import { getBoundNames, getPatternNames } from "./resolve";
|
|
13
|
-
import { STANDARD_LEVELS } from "./standard-
|
|
20
|
+
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
21
|
+
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
14
22
|
|
|
15
23
|
interface LevelData {
|
|
16
24
|
level: number;
|
|
@@ -34,6 +42,7 @@ interface LevelContext {
|
|
|
34
42
|
constants: Set<string>;
|
|
35
43
|
variables: Set<string>;
|
|
36
44
|
getDefinition: (name: string) => Definition | undefined;
|
|
45
|
+
getQualifiedName?: (name: string) => string | undefined;
|
|
37
46
|
}
|
|
38
47
|
|
|
39
48
|
type ScopeEntry =
|
|
@@ -52,7 +61,11 @@ interface Operand {
|
|
|
52
61
|
declared?: OperatorParam;
|
|
53
62
|
}
|
|
54
63
|
|
|
55
|
-
|
|
64
|
+
// The levels of tla2sany.semantic.LevelConstants.
|
|
65
|
+
export const CONSTANT_LEVEL = 0;
|
|
66
|
+
export const VARIABLE_LEVEL = 1;
|
|
67
|
+
export const ACTION_LEVEL = 2;
|
|
68
|
+
export const TEMPORAL_LEVEL = 3;
|
|
56
69
|
|
|
57
70
|
const SEPARATOR = "\u0000";
|
|
58
71
|
|
|
@@ -79,7 +92,7 @@ const createData = (level = 0): LevelData => ({
|
|
|
79
92
|
});
|
|
80
93
|
|
|
81
94
|
export const putConstraint = (constraints: Map<string, number>, name: string, level: number) =>
|
|
82
|
-
constraints.set(name, Math.min(level, constraints.get(name) ??
|
|
95
|
+
constraints.set(name, Math.min(level, constraints.get(name) ?? TEMPORAL_LEVEL));
|
|
83
96
|
|
|
84
97
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
85
98
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
@@ -103,7 +116,7 @@ const createSignature = (
|
|
|
103
116
|
const getMaxLevel = (operator: OperatorLevels, index: number) =>
|
|
104
117
|
operator.formals.length === 0 && operator.maxLevels.length > 0
|
|
105
118
|
? operator.maxLevels[Math.min(index, operator.maxLevels.length - 1)]
|
|
106
|
-
: (operator.maxLevels[index] ??
|
|
119
|
+
: (operator.maxLevels[index] ?? TEMPORAL_LEVEL);
|
|
107
120
|
|
|
108
121
|
const getWeight = (operator: OperatorLevels, index: number) =>
|
|
109
122
|
operator.formals.length === 0 && operator.weights.length > 0
|
|
@@ -172,12 +185,13 @@ const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
|
172
185
|
|
|
173
186
|
const toFormals = (names: string[]) => names.map((name) => ({ name, arity: 0 }));
|
|
174
187
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
188
|
+
// SANY reports a level error at the range of the expression it rejects.
|
|
189
|
+
const createLevelError = (message: string, expression: Expression) =>
|
|
190
|
+
expression.location.range
|
|
191
|
+
? createSemanticError(`${message}.`, expression.location.range)
|
|
192
|
+
: new TlaSyntaxError(
|
|
193
|
+
`${message} at line ${expression.location.line}, column ${expression.location.column}`,
|
|
194
|
+
);
|
|
181
195
|
|
|
182
196
|
const LOGICAL_OPERATORS = new Set(["/\\", "\\/", "=>", "<=>"]);
|
|
183
197
|
|
|
@@ -201,7 +215,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
201
215
|
if (context.variables.has(name)) return { kind: "Declared", name, level: 1, arity: 0 };
|
|
202
216
|
const definition = context.getDefinition(name);
|
|
203
217
|
if (definition) {
|
|
204
|
-
|
|
218
|
+
const levels = analyzeDefinition(definition, new Map());
|
|
219
|
+
// SANY names a definition of an instance by its qualified name, as in I!Foo.
|
|
220
|
+
const qualifiedName = context.getQualifiedName?.(name);
|
|
221
|
+
return {
|
|
222
|
+
kind: "Defined",
|
|
223
|
+
levels: qualifiedName ? { ...levels, name: qualifiedName } : levels,
|
|
224
|
+
};
|
|
205
225
|
}
|
|
206
226
|
const signature = CORE_SIGNATURES.get(name) ?? STANDARD_LEVELS.get(name);
|
|
207
227
|
if (signature) return { kind: "Defined", levels: signature };
|
|
@@ -237,13 +257,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
237
257
|
if (operand.operator || operand.declared) return;
|
|
238
258
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
239
259
|
throw new TlaSyntaxError(
|
|
240
|
-
`Level error in applying operator ${operator.name}
|
|
260
|
+
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
241
261
|
);
|
|
242
262
|
}
|
|
243
263
|
});
|
|
244
264
|
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
245
265
|
throw new TlaSyntaxError(
|
|
246
|
-
`Level error in applying operator ${operator.name}
|
|
266
|
+
`Level error in applying operator ${operator.name}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
247
267
|
);
|
|
248
268
|
}
|
|
249
269
|
const getOperand = (formal: string) => {
|
|
@@ -444,10 +464,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
444
464
|
? applyDeclared(resolved.name, resolved.level, operands)
|
|
445
465
|
: applyDefined(resolved.levels, operands);
|
|
446
466
|
|
|
447
|
-
const checkJunction = (operands: Operand[],
|
|
467
|
+
const checkJunction = (operands: Operand[], expression: Expression) => {
|
|
448
468
|
const levels = operands.map((operand) => operand.data.level);
|
|
449
469
|
if (levels.includes(ACTION_LEVEL) && levels.includes(TEMPORAL_LEVEL)) {
|
|
450
|
-
throw createLevelError(
|
|
470
|
+
throw createLevelError(
|
|
471
|
+
"Formula has both temporal formula and action as arguments",
|
|
472
|
+
expression,
|
|
473
|
+
);
|
|
451
474
|
}
|
|
452
475
|
};
|
|
453
476
|
|
|
@@ -456,10 +479,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
456
479
|
if (isLeadsTo && operands.some((operand) => operand.data.level === ACTION_LEVEL)) {
|
|
457
480
|
throw createLevelError(
|
|
458
481
|
"Action used where only temporal formula or state predicate allowed",
|
|
459
|
-
expression
|
|
482
|
+
expression,
|
|
460
483
|
);
|
|
461
484
|
}
|
|
462
|
-
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression
|
|
485
|
+
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression);
|
|
463
486
|
};
|
|
464
487
|
|
|
465
488
|
const checkTemporal = (
|
|
@@ -473,7 +496,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
473
496
|
expression.kind === "Always"
|
|
474
497
|
? "[] followed by action not of form [A]_v"
|
|
475
498
|
: "<> followed by action not of form <<A>>_v",
|
|
476
|
-
expression
|
|
499
|
+
expression,
|
|
477
500
|
);
|
|
478
501
|
};
|
|
479
502
|
|
|
@@ -501,7 +524,17 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
501
524
|
return data;
|
|
502
525
|
};
|
|
503
526
|
|
|
527
|
+
// SANY reports a level error of an operator's arguments at the application.
|
|
504
528
|
const analyze = (expression: Expression, scope: Scope): LevelData => {
|
|
529
|
+
try {
|
|
530
|
+
return analyzeNode(expression, scope);
|
|
531
|
+
} catch (error) {
|
|
532
|
+
if (!(error instanceof TlaSyntaxError) || error.sany) throw error;
|
|
533
|
+
throw createLevelError(error.message, expression);
|
|
534
|
+
}
|
|
535
|
+
};
|
|
536
|
+
|
|
537
|
+
const analyzeNode = (expression: Expression, scope: Scope): LevelData => {
|
|
505
538
|
switch (expression.kind) {
|
|
506
539
|
case "Number":
|
|
507
540
|
case "Decimal":
|
|
@@ -521,7 +554,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
521
554
|
case "And":
|
|
522
555
|
case "Or": {
|
|
523
556
|
const operands = toOperands(expression.operands, scope);
|
|
524
|
-
checkJunction(operands, expression
|
|
557
|
+
checkJunction(operands, expression);
|
|
525
558
|
return applyDefined(JUNCTION_LEVELS, operands);
|
|
526
559
|
}
|
|
527
560
|
case "Prime":
|
|
@@ -561,13 +594,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
561
594
|
expression.bounds.map((bound) => bound.set),
|
|
562
595
|
getBoundNames(expression.bounds),
|
|
563
596
|
);
|
|
564
|
-
|
|
565
|
-
data.level === TEMPORAL_LEVEL
|
|
566
|
-
|
|
567
|
-
|
|
597
|
+
const actionBound =
|
|
598
|
+
data.level === TEMPORAL_LEVEL
|
|
599
|
+
? expression.bounds.find((bound) => analyze(bound.set, scope).level === ACTION_LEVEL)
|
|
600
|
+
: undefined;
|
|
601
|
+
if (actionBound) {
|
|
568
602
|
throw createLevelError(
|
|
569
603
|
"Action-level bound of quantified temporal formula",
|
|
570
|
-
|
|
604
|
+
actionBound.set,
|
|
571
605
|
);
|
|
572
606
|
}
|
|
573
607
|
return data;
|
|
@@ -656,6 +690,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
656
690
|
? toOperand(expression.args[0], scope)
|
|
657
691
|
: { data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
658
692
|
]);
|
|
693
|
+
// SANY's semantic checker rejects the expression without computing its level.
|
|
694
|
+
case "Bracket":
|
|
695
|
+
return createData();
|
|
659
696
|
case "FieldAccess":
|
|
660
697
|
return applyDefined(SELECT_LEVELS, [
|
|
661
698
|
toOperand(expression.record, scope),
|
|
@@ -749,7 +786,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
749
786
|
formals.flatMap((formal, index) => (nonLeibnizNames.has(formal.name) ? [index] : [])),
|
|
750
787
|
),
|
|
751
788
|
maxLevels: formals.map((formal) =>
|
|
752
|
-
Math.min(
|
|
789
|
+
Math.min(TEMPORAL_LEVEL, data.constraints.get(formal.name) ?? TEMPORAL_LEVEL),
|
|
753
790
|
),
|
|
754
791
|
weights: formals.map((formal) => (data.params.has(formal.name) ? 1 : 0)),
|
|
755
792
|
minMaxLevels: formals.map((formal) =>
|
|
@@ -794,7 +831,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
794
831
|
...createData(),
|
|
795
832
|
name: definition.name,
|
|
796
833
|
formals,
|
|
797
|
-
maxLevels: formals.map(() =>
|
|
834
|
+
maxLevels: formals.map(() => TEMPORAL_LEVEL),
|
|
798
835
|
weights: formals.map(() => 0),
|
|
799
836
|
minMaxLevels: formals.map(() => []),
|
|
800
837
|
conditions: new Set(),
|
|
@@ -817,34 +854,140 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
817
854
|
return { analyze, analyzeDefinition, toOperand };
|
|
818
855
|
};
|
|
819
856
|
|
|
820
|
-
const analyzeAssumeProve = (
|
|
857
|
+
export const analyzeAssumeProve = (
|
|
821
858
|
assumeProve: AssumeProve,
|
|
822
859
|
scope: Scope,
|
|
823
860
|
analyzer: ReturnType<typeof createLevelAnalyzer>,
|
|
824
|
-
) => {
|
|
861
|
+
): LevelData => {
|
|
825
862
|
const inner = new Map(scope);
|
|
826
|
-
assumeProve.assumptions.
|
|
863
|
+
const parts = assumeProve.assumptions.flatMap((assumption) => {
|
|
827
864
|
if (assumption.kind === "NewSymbol") {
|
|
828
|
-
|
|
865
|
+
const set = assumption.set && analyzer.analyze(assumption.set, inner);
|
|
829
866
|
inner.set(assumption.name, { kind: "Formal", arity: assumption.arity });
|
|
830
|
-
return;
|
|
867
|
+
return set ? [set] : [];
|
|
831
868
|
}
|
|
832
|
-
|
|
833
|
-
|
|
869
|
+
return [
|
|
870
|
+
assumption.kind === "AssumeProve"
|
|
871
|
+
? analyzeAssumeProve(assumption, inner, analyzer)
|
|
872
|
+
: analyzer.analyze(assumption, inner),
|
|
873
|
+
];
|
|
834
874
|
});
|
|
835
|
-
analyzer.analyze(assumeProve.conclusion, inner);
|
|
875
|
+
parts.push(analyzer.analyze(assumeProve.conclusion, inner));
|
|
876
|
+
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
877
|
+
parts.forEach((part) => {
|
|
878
|
+
part.params.forEach((param) => data.params.add(param));
|
|
879
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
880
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
881
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
882
|
+
});
|
|
883
|
+
return data;
|
|
836
884
|
};
|
|
837
885
|
|
|
838
|
-
|
|
839
|
-
|
|
886
|
+
export const checkModuleLevels = (
|
|
887
|
+
module: Module,
|
|
888
|
+
context: LevelContext,
|
|
889
|
+
instances: { location: SourceLocation; check: () => void }[],
|
|
890
|
+
warnings: SanyError[],
|
|
891
|
+
) => {
|
|
840
892
|
const analyzer = createLevelAnalyzer(context);
|
|
841
|
-
|
|
842
|
-
.
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
893
|
+
const getLevel = (expressions: Expression[]) =>
|
|
894
|
+
Math.max(0, ...expressions.map((expression) => analyzer.analyze(expression, new Map()).level));
|
|
895
|
+
const getStepLevel = (step: ProofStep) => {
|
|
896
|
+
const body = step.body;
|
|
897
|
+
if (body.kind === "Have" || body.kind === "Case") return getLevel([body.expression]);
|
|
898
|
+
if (body.kind === "Witness") return getLevel(body.expressions);
|
|
899
|
+
if (body.kind === "Take") return getLevel(body.bounds.map((bound) => bound.set));
|
|
900
|
+
if (body.kind === "Pick") {
|
|
901
|
+
return getLevel([body.body, ...body.bounds.map((bound) => bound.set)]);
|
|
902
|
+
}
|
|
903
|
+
if (body.kind !== "Assert") return 0;
|
|
904
|
+
return body.statement.kind === "AssumeProve"
|
|
905
|
+
? analyzeAssumeProve(body.statement, new Map(), analyzer).level
|
|
906
|
+
: getLevel([body.statement]);
|
|
907
|
+
};
|
|
908
|
+
// SANY's TheoremNode.LevelCheckTemporal: the proof of a temporal goal may only assume constants.
|
|
909
|
+
const checkTemporalGoal = (proof: Proof | undefined): SanyError[] =>
|
|
910
|
+
proof?.kind !== "Steps"
|
|
911
|
+
? []
|
|
912
|
+
: proof.steps.flatMap((step) => {
|
|
913
|
+
const location = formatRange(step.statement);
|
|
914
|
+
const isConstant = () => getStepLevel(step) === 0;
|
|
915
|
+
if (
|
|
916
|
+
step.body.kind === "Have" ||
|
|
917
|
+
step.body.kind === "Take" ||
|
|
918
|
+
step.body.kind === "Witness"
|
|
919
|
+
) {
|
|
920
|
+
return isConstant()
|
|
921
|
+
? []
|
|
922
|
+
: [{ location, message: "Non-constant TAKE, WITNESS, or HAVE for temporal goal." }];
|
|
923
|
+
}
|
|
924
|
+
if (step.body.kind === "Case") {
|
|
925
|
+
return [
|
|
926
|
+
...(isConstant()
|
|
927
|
+
? []
|
|
928
|
+
: [{ location, message: "Non-constant CASE for temporal goal." }]),
|
|
929
|
+
...checkTemporalGoal(step.proof),
|
|
930
|
+
];
|
|
931
|
+
}
|
|
932
|
+
return step.body.kind === "Qed" ? checkTemporalGoal(step.proof) : [];
|
|
933
|
+
});
|
|
934
|
+
// SANY checks each step as a theorem of its own after the steps of its proof.
|
|
935
|
+
const checkProof = (proof: Proof | undefined): SanyError[] =>
|
|
936
|
+
proof?.kind !== "Steps"
|
|
937
|
+
? []
|
|
938
|
+
: proof.steps.flatMap((step) => {
|
|
939
|
+
const body = step.body;
|
|
940
|
+
const isTemporal = () => getStepLevel(step) === TEMPORAL_LEVEL;
|
|
941
|
+
const pickErrors =
|
|
942
|
+
body.kind === "Pick" && body.bounds.length > 0 && isTemporal()
|
|
943
|
+
? body.bounds
|
|
944
|
+
.filter((bound) => getLevel([bound.set]) !== 0)
|
|
945
|
+
.flatMap((bound) =>
|
|
946
|
+
bound.set.location.range
|
|
947
|
+
? [
|
|
948
|
+
{
|
|
949
|
+
location: formatRange(bound.set.location.range),
|
|
950
|
+
message: "Non-constant bound of temporal PICK.",
|
|
951
|
+
},
|
|
952
|
+
]
|
|
953
|
+
: [],
|
|
954
|
+
)
|
|
955
|
+
: [];
|
|
956
|
+
return [
|
|
957
|
+
...checkProof(step.proof),
|
|
958
|
+
...pickErrors,
|
|
959
|
+
...(step.proof?.kind === "Steps" && isTemporal() ? checkTemporalGoal(step.proof) : []),
|
|
960
|
+
];
|
|
961
|
+
});
|
|
962
|
+
const errors = collectSemanticErrors(
|
|
963
|
+
[
|
|
964
|
+
...module.definitions
|
|
965
|
+
.filter((definition) => !definition.name.includes("!"))
|
|
966
|
+
.map((definition) => ({
|
|
967
|
+
location: definition.location,
|
|
968
|
+
check: () => analyzer.analyzeDefinition(definition, new Map()),
|
|
969
|
+
})),
|
|
970
|
+
...module.assumptions.map((assumption) => ({
|
|
971
|
+
location: assumption.location,
|
|
972
|
+
check: () => analyzer.analyze(assumption.expression, new Map()),
|
|
973
|
+
})),
|
|
974
|
+
...module.theorems.map((theorem) => ({
|
|
975
|
+
location: theorem.location,
|
|
976
|
+
check: () => {
|
|
977
|
+
const data =
|
|
978
|
+
theorem.statement.kind === "AssumeProve"
|
|
979
|
+
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
980
|
+
: analyzer.analyze(theorem.statement, new Map());
|
|
981
|
+
const errors = [
|
|
982
|
+
...checkProof(theorem.proof),
|
|
983
|
+
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
984
|
+
];
|
|
985
|
+
if (errors.length > 0) throw createSanyError(errors);
|
|
986
|
+
},
|
|
987
|
+
})),
|
|
988
|
+
...instances,
|
|
989
|
+
],
|
|
990
|
+
warnings,
|
|
849
991
|
);
|
|
992
|
+
if (errors.length > 0) throw createSanyError(errors, false, undefined, warnings);
|
|
850
993
|
};
|
package/src/lexer.ts
CHANGED
|
@@ -12,9 +12,11 @@ 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.
|
|
15
16
|
export interface Token {
|
|
16
17
|
kind: TokenKind;
|
|
17
18
|
text: string;
|
|
19
|
+
spelling?: string;
|
|
18
20
|
line: number;
|
|
19
21
|
column: number;
|
|
20
22
|
endColumn: number;
|
|
@@ -232,38 +234,84 @@ const SYMBOL_OPERATORS = [
|
|
|
232
234
|
"?",
|
|
233
235
|
];
|
|
234
236
|
|
|
237
|
+
// The Unicode forms of the operators SANY's grammar, javacc/tla+.jj, reads, as their ASCII forms.
|
|
235
238
|
const UNICODE_OPERATORS = new Map([
|
|
239
|
+
["∃", "\\E"],
|
|
240
|
+
["∀", "\\A"],
|
|
241
|
+
["∷", "::"],
|
|
242
|
+
["≜", "=="],
|
|
243
|
+
["⟨", "<<"],
|
|
244
|
+
["⟩_", ">>_"],
|
|
245
|
+
["⟩", ">>"],
|
|
246
|
+
["→", "->"],
|
|
247
|
+
["←", "<-"],
|
|
248
|
+
["↦", "|->"],
|
|
249
|
+
["⁺", "^+"],
|
|
250
|
+
["¬", "~"],
|
|
251
|
+
["□", "[]"],
|
|
252
|
+
["◇", "<>"],
|
|
236
253
|
["∧", "/\\"],
|
|
237
254
|
["∨", "\\/"],
|
|
238
|
-
["
|
|
239
|
-
["
|
|
240
|
-
["
|
|
255
|
+
["∈", "\\in"],
|
|
256
|
+
["≈", "\\approx"],
|
|
257
|
+
["≔", ":="],
|
|
258
|
+
["≍", "\\asymp"],
|
|
259
|
+
["◯", "\\bigcirc"],
|
|
260
|
+
["⩴", "::="],
|
|
261
|
+
["●", "\\bullet"],
|
|
262
|
+
["∩", "\\cap"],
|
|
263
|
+
["⋅", "\\cdot"],
|
|
264
|
+
["∘", "\\o"],
|
|
265
|
+
["≅", "\\cong"],
|
|
266
|
+
["∪", "\\cup"],
|
|
267
|
+
["÷", "\\div"],
|
|
268
|
+
["≐", "\\doteq"],
|
|
269
|
+
["‥", ".."],
|
|
270
|
+
["…", "..."],
|
|
241
271
|
["≡", "<=>"],
|
|
272
|
+
["‼", "!!"],
|
|
273
|
+
["≥", ">="],
|
|
274
|
+
["≫", "\\gg"],
|
|
242
275
|
["⇔", "<=>"],
|
|
243
|
-
["
|
|
276
|
+
["⇒", "=>"],
|
|
277
|
+
["⫤", "=|"],
|
|
278
|
+
["↝", "~>"],
|
|
279
|
+
["≤", "<="],
|
|
280
|
+
["≪", "\\ll"],
|
|
281
|
+
["⊣", "-|"],
|
|
282
|
+
["≠", "#"],
|
|
244
283
|
["∉", "\\notin"],
|
|
245
|
-
["
|
|
284
|
+
["⊙", "\\odot"],
|
|
285
|
+
["⊖", "\\ominus"],
|
|
286
|
+
["⊕", "\\oplus"],
|
|
287
|
+
["⊘", "\\oslash"],
|
|
288
|
+
["⊗", "\\otimes"],
|
|
289
|
+
["⇸", "-+->"],
|
|
290
|
+
["≺", "\\prec"],
|
|
291
|
+
["⪯", "\\preceq"],
|
|
292
|
+
["∝", "\\propto"],
|
|
293
|
+
["⁇", "??"],
|
|
294
|
+
["⊨", "|="],
|
|
295
|
+
["⊢", "|-"],
|
|
296
|
+
["∼", "\\sim"],
|
|
297
|
+
["≃", "\\simeq"],
|
|
298
|
+
["⊓", "\\sqcap"],
|
|
299
|
+
["⊔", "\\sqcup"],
|
|
300
|
+
["⊏", "\\sqsubset"],
|
|
301
|
+
["⊑", "\\sqsubseteq"],
|
|
302
|
+
["⊐", "\\sqsupset"],
|
|
303
|
+
["⊒", "\\sqsupseteq"],
|
|
304
|
+
["⋆", "\\star"],
|
|
246
305
|
["⊂", "\\subset"],
|
|
247
|
-
["
|
|
306
|
+
["⊆", "\\subseteq"],
|
|
307
|
+
["≻", "\\succ"],
|
|
308
|
+
["⪰", "\\succeq"],
|
|
248
309
|
["⊃", "\\supset"],
|
|
249
|
-
["
|
|
250
|
-
["∩", "\\cap"],
|
|
310
|
+
["⊇", "\\supseteq"],
|
|
251
311
|
["×", "\\X"],
|
|
252
|
-
["
|
|
253
|
-
["
|
|
254
|
-
["
|
|
255
|
-
["≤", "<="],
|
|
256
|
-
["≥", ">="],
|
|
257
|
-
["↦", "|->"],
|
|
258
|
-
["→", "->"],
|
|
259
|
-
["⟨", "<<"],
|
|
260
|
-
["⟩", ">>"],
|
|
261
|
-
["□", "[]"],
|
|
262
|
-
["◇", "<>"],
|
|
263
|
-
["≜", "=="],
|
|
264
|
-
["′", "'"],
|
|
265
|
-
["∘", "\\o"],
|
|
266
|
-
["⋅", "\\cdot"],
|
|
312
|
+
["⊎", "\\uplus"],
|
|
313
|
+
["‖", "||"],
|
|
314
|
+
["≀", "\\wr"],
|
|
267
315
|
]);
|
|
268
316
|
|
|
269
317
|
const BASED_NUMBER = /^\\([bB][01]+|[oO][0-7]+|[hH][0-9a-fA-F]+)/;
|
|
@@ -301,13 +349,27 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
301
349
|
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length.value));
|
|
302
350
|
return { text: operator ?? "\\", length: operator === undefined ? 1 : length.value + 1 };
|
|
303
351
|
}
|
|
304
|
-
const
|
|
305
|
-
|
|
352
|
+
const unicodeSymbol = [source.slice(index, index + 2), character].find((candidate) =>
|
|
353
|
+
UNICODE_OPERATORS.has(candidate),
|
|
354
|
+
);
|
|
355
|
+
if (unicodeSymbol !== undefined) {
|
|
356
|
+
return { text: UNICODE_OPERATORS.get(unicodeSymbol) ?? "", length: unicodeSymbol.length };
|
|
357
|
+
}
|
|
306
358
|
const symbol = SYMBOL_OPERATORS.find((candidate) => source.startsWith(candidate, index));
|
|
307
359
|
if (symbol) return { text: SYMBOL_ALIASES.get(symbol) ?? symbol, length: symbol.length };
|
|
308
360
|
return character === "\\" ? { text: "\\", length: 1 } : undefined;
|
|
309
361
|
};
|
|
310
362
|
|
|
363
|
+
// TLC's configuration parser reads its tokens with SANY's lexer, so it reads a Unicode operator, or
|
|
364
|
+
// ℕ, ℤ, or ℝ, as one token, which it compares as written with the words it expects.
|
|
365
|
+
const UNICODE_NAMES = new Set(["ℕ", "ℤ", "ℝ"]);
|
|
366
|
+
export const matchUnicodeToken = (source: string, index: number): OperatorMatch | undefined => {
|
|
367
|
+
const token = [source.slice(index, index + 2), source[index]].find(
|
|
368
|
+
(candidate) => UNICODE_OPERATORS.has(candidate) || UNICODE_NAMES.has(candidate),
|
|
369
|
+
);
|
|
370
|
+
return token === undefined ? undefined : { text: token, length: token.length };
|
|
371
|
+
};
|
|
372
|
+
|
|
311
373
|
const isDigit = (character: string | undefined) =>
|
|
312
374
|
character !== undefined && character >= "0" && character <= "9";
|
|
313
375
|
|
|
@@ -335,6 +397,10 @@ const matchStep = (source: string, index: number) => {
|
|
|
335
397
|
);
|
|
336
398
|
};
|
|
337
399
|
|
|
400
|
+
// SANY's lexer reads @ as an identifier, which stands for the value an EXCEPT changes only alone.
|
|
401
|
+
export const readAtAsIdentifier = (token: Token): Token =>
|
|
402
|
+
token.kind === "Operator" && token.text === "@" ? { ...token, kind: "Identifier" } : token;
|
|
403
|
+
|
|
338
404
|
const TAB_SIZE = 8;
|
|
339
405
|
|
|
340
406
|
const getWidthAfter = (width: number, character: string | undefined) =>
|
|
@@ -345,6 +411,8 @@ export const tokenize = (source: string): Token[] => {
|
|
|
345
411
|
if (!headerMatch)
|
|
346
412
|
throw new TlaSyntaxError("Expected a module header such as ---- MODULE Name ----");
|
|
347
413
|
const tokens: Token[] = [];
|
|
414
|
+
// Each name is one string object, so looking a name up in a scope compares pointers.
|
|
415
|
+
const names = new Map<string, string>();
|
|
348
416
|
const prefixLines = source.slice(0, headerMatch.index).split("\n");
|
|
349
417
|
const cursor = {
|
|
350
418
|
index: headerMatch.index,
|
|
@@ -365,9 +433,16 @@ export const tokenize = (source: string): Token[] => {
|
|
|
365
433
|
}
|
|
366
434
|
return getWidthAfter(scan.width, source[cursor.index]);
|
|
367
435
|
};
|
|
368
|
-
const pushToken = (kind: TokenKind, text: string, length: number) => {
|
|
436
|
+
const pushToken = (kind: TokenKind, text: string, length: number, spelling?: string) => {
|
|
369
437
|
const column = getColumn();
|
|
370
|
-
tokens.push({
|
|
438
|
+
tokens.push({
|
|
439
|
+
kind,
|
|
440
|
+
text,
|
|
441
|
+
spelling,
|
|
442
|
+
line: cursor.line,
|
|
443
|
+
column,
|
|
444
|
+
endColumn: column + length - 1,
|
|
445
|
+
});
|
|
371
446
|
cursor.index += length;
|
|
372
447
|
};
|
|
373
448
|
const advanceOver = (length: number) => {
|
|
@@ -440,11 +515,14 @@ export const tokenize = (source: string): Token[] => {
|
|
|
440
515
|
const characters: string[] = [];
|
|
441
516
|
advanceOver(1);
|
|
442
517
|
while (source[cursor.index] !== '"') {
|
|
443
|
-
if (cursor.index >= source.length || source[cursor.index]
|
|
518
|
+
if (cursor.index >= source.length || "\n\r".includes(source[cursor.index])) {
|
|
444
519
|
throw createError("Unterminated string");
|
|
445
520
|
}
|
|
446
521
|
if (source[cursor.index] === "\\") {
|
|
447
522
|
const escaped = source[cursor.index + 1];
|
|
523
|
+
if (escaped === undefined || !'ntrf\\"'.includes(escaped)) {
|
|
524
|
+
throw createError("Invalid escape in string");
|
|
525
|
+
}
|
|
448
526
|
characters.push({ n: "\n", t: "\t", r: "\r", f: "\f" }[escaped] ?? escaped);
|
|
449
527
|
advanceOver(2);
|
|
450
528
|
continue;
|
|
@@ -477,11 +555,24 @@ export const tokenize = (source: string): Token[] => {
|
|
|
477
555
|
pushToken(number.includes(".") ? "Decimal" : "Number", number, number.length);
|
|
478
556
|
continue;
|
|
479
557
|
}
|
|
558
|
+
// A word needs a letter to be a name, so SANY reads one without as underscores and numbers.
|
|
559
|
+
const part = /^(_|\d+)/.exec(word)?.[0];
|
|
560
|
+
if (part !== undefined && !/[A-Za-z]/.test(word)) {
|
|
561
|
+
pushToken(part === "_" ? "Operator" : "Number", part, part.length);
|
|
562
|
+
continue;
|
|
563
|
+
}
|
|
480
564
|
if (word.startsWith("WF_") || word.startsWith("SF_")) {
|
|
481
565
|
pushToken("Keyword", word.slice(0, 3), 3);
|
|
482
566
|
continue;
|
|
483
567
|
}
|
|
484
|
-
|
|
568
|
+
const name = names.get(word) ?? word;
|
|
569
|
+
names.set(name, name);
|
|
570
|
+
pushToken(KEYWORDS.has(word) ? "Keyword" : "Identifier", name, word.length);
|
|
571
|
+
continue;
|
|
572
|
+
}
|
|
573
|
+
if ("ℕℤℝ".includes(character)) {
|
|
574
|
+
pushToken("Identifier", names.get(character) ?? character, 1);
|
|
575
|
+
names.set(character, character);
|
|
485
576
|
continue;
|
|
486
577
|
}
|
|
487
578
|
const stepLength = matchStep(source, cursor.index);
|
|
@@ -491,7 +582,13 @@ export const tokenize = (source: string): Token[] => {
|
|
|
491
582
|
}
|
|
492
583
|
const operator = matchOperator(source, cursor.index);
|
|
493
584
|
if (operator) {
|
|
494
|
-
|
|
585
|
+
const spelling = source.slice(cursor.index, cursor.index + operator.length);
|
|
586
|
+
pushToken(
|
|
587
|
+
"Operator",
|
|
588
|
+
operator.text,
|
|
589
|
+
operator.length,
|
|
590
|
+
spelling === operator.text ? undefined : spelling,
|
|
591
|
+
);
|
|
495
592
|
continue;
|
|
496
593
|
}
|
|
497
594
|
throw createError(`Unexpected character ${JSON.stringify(character)}`);
|