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/config.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { TlaConfigError } from "./errors";
|
|
2
|
-
import {
|
|
1
|
+
import { getUnexpectedException, TlaConfigError } from "./errors";
|
|
2
|
+
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
3
|
+
import { matchBasedNumber, matchOperator, matchUnicodeToken } from "./lexer";
|
|
3
4
|
import { formatLexicalError } from "./sany/lexer";
|
|
4
5
|
import type { TlcVersion } from "./tlc/version";
|
|
5
6
|
|
|
@@ -33,6 +34,7 @@ export interface ModelConfig {
|
|
|
33
34
|
actionConstraints: string[];
|
|
34
35
|
constants: ConstantAssignment[];
|
|
35
36
|
substitutions: Substitution[];
|
|
37
|
+
rawConstants: string[];
|
|
36
38
|
checkDeadlock: boolean;
|
|
37
39
|
symmetry: string | undefined;
|
|
38
40
|
view: string | undefined;
|
|
@@ -78,44 +80,53 @@ const KEYWORDS = new Set([
|
|
|
78
80
|
"_RL_REWARD",
|
|
79
81
|
]);
|
|
80
82
|
|
|
81
|
-
// TLC 1.7.4 reads a TYPE and a TYPE_CONSTRAINT, which it doesn't check, and none of the keywords
|
|
82
|
-
// that came after it.
|
|
83
83
|
const TYPE_KEYWORDS = ["TYPE", "TYPE_CONSTRAINT"];
|
|
84
84
|
const KEYWORDS_174 = new Set([...SHARED_KEYWORDS, ...TYPE_KEYWORDS]);
|
|
85
85
|
|
|
86
86
|
const SYMBOLS = ["<-", "<<", ">>", "=", "{", "}", ",", "[", "]", "(", ")", "!"];
|
|
87
87
|
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
const getCommentLength = (text: string) => {
|
|
89
|
+
let position = 0;
|
|
90
|
+
let depth = 0;
|
|
91
|
+
do {
|
|
92
|
+
if (position >= text.length) return undefined;
|
|
93
|
+
const pair = text.slice(position, position + 2);
|
|
94
|
+
const step = pair === "(*" ? 1 : pair === "*)" ? -1 : 0;
|
|
95
|
+
depth += step;
|
|
96
|
+
position += step === 0 ? 1 : 2;
|
|
97
|
+
} while (depth > 0);
|
|
98
|
+
return position;
|
|
99
|
+
};
|
|
100
|
+
|
|
90
101
|
const tokenizeConfig = (source: string) => {
|
|
91
102
|
const tokens: ConfigToken[] = [];
|
|
92
|
-
|
|
103
|
+
let position = 0;
|
|
104
|
+
let lineNumber = 1;
|
|
105
|
+
let lineStart = 0;
|
|
93
106
|
const addLexicalError = (index: number, after: string) => {
|
|
94
107
|
tokens.push({
|
|
95
108
|
kind: "Error",
|
|
96
|
-
text: formatLexicalError(
|
|
97
|
-
line:
|
|
109
|
+
text: formatLexicalError(lineNumber, index - lineStart + 1, source[index], after),
|
|
110
|
+
line: lineNumber,
|
|
98
111
|
});
|
|
99
112
|
};
|
|
100
|
-
// TLC appends a newline to the file. JavaCC reports a token that the end of the input cuts off,
|
|
101
|
-
// that newline included, at the start of the line after it.
|
|
102
113
|
const addEndOfInputError = (after: string) => {
|
|
103
114
|
tokens.push({
|
|
104
115
|
kind: "Error",
|
|
105
|
-
text: formatLexicalError(
|
|
106
|
-
line:
|
|
116
|
+
text: formatLexicalError(lineNumber + 1, 0, undefined, after),
|
|
117
|
+
line: lineNumber,
|
|
107
118
|
});
|
|
108
119
|
};
|
|
109
120
|
const skip = (text: string) => {
|
|
110
121
|
const lines = text.split("\n");
|
|
111
122
|
if (lines.length > 1) {
|
|
112
|
-
|
|
113
|
-
|
|
123
|
+
lineNumber += lines.length - 1;
|
|
124
|
+
lineStart = position + text.length - lines[lines.length - 1].length;
|
|
114
125
|
}
|
|
115
|
-
|
|
126
|
+
position += text.length;
|
|
116
127
|
};
|
|
117
|
-
while (
|
|
118
|
-
const rest = source.slice(
|
|
128
|
+
while (position < source.length) {
|
|
129
|
+
const rest = source.slice(position);
|
|
119
130
|
const whitespace = /^\s+/.exec(rest)?.[0];
|
|
120
131
|
if (whitespace) {
|
|
121
132
|
skip(whitespace);
|
|
@@ -127,17 +138,19 @@ const tokenizeConfig = (source: string) => {
|
|
|
127
138
|
continue;
|
|
128
139
|
}
|
|
129
140
|
if (rest.startsWith("(*")) {
|
|
130
|
-
const
|
|
131
|
-
if (
|
|
141
|
+
const length = getCommentLength(rest);
|
|
142
|
+
if (length === undefined) {
|
|
132
143
|
skip(rest);
|
|
133
144
|
addEndOfInputError("");
|
|
134
145
|
return tokens;
|
|
135
146
|
}
|
|
136
|
-
skip(rest.slice(0,
|
|
147
|
+
skip(rest.slice(0, length));
|
|
137
148
|
continue;
|
|
138
149
|
}
|
|
139
|
-
const line =
|
|
140
|
-
const
|
|
150
|
+
const line = lineNumber;
|
|
151
|
+
const basedLength = matchBasedNumber(source, position);
|
|
152
|
+
const number =
|
|
153
|
+
basedLength > 0 ? rest.slice(0, basedLength) : /^\d+(?![A-Za-z_])/.exec(rest)?.[0];
|
|
141
154
|
if (number) {
|
|
142
155
|
tokens.push({ kind: "Number", text: number, line });
|
|
143
156
|
skip(number);
|
|
@@ -154,33 +167,32 @@ const tokenizeConfig = (source: string) => {
|
|
|
154
167
|
const text = string?.[0] ?? '"';
|
|
155
168
|
if (string?.[2] !== '"') {
|
|
156
169
|
skip(text);
|
|
157
|
-
if (
|
|
158
|
-
else addLexicalError(
|
|
170
|
+
if (position === source.length) addEndOfInputError(`${text}\n`);
|
|
171
|
+
else addLexicalError(position, text);
|
|
159
172
|
return tokens;
|
|
160
173
|
}
|
|
161
|
-
tokens.push({ kind: "String", text
|
|
174
|
+
tokens.push({ kind: "String", text, line });
|
|
162
175
|
skip(text);
|
|
163
176
|
continue;
|
|
164
177
|
}
|
|
178
|
+
const operator = matchUnicodeToken(source, position) ?? matchOperator(source, position);
|
|
165
179
|
const symbol = SYMBOLS.find((candidate) => rest.startsWith(candidate));
|
|
166
|
-
if (symbol) {
|
|
180
|
+
if (symbol && symbol.length >= (operator?.length ?? 0)) {
|
|
167
181
|
tokens.push({ kind: "Symbol", text: symbol, line });
|
|
168
182
|
skip(symbol);
|
|
169
183
|
continue;
|
|
170
184
|
}
|
|
171
|
-
const operator = matchUnicodeToken(source, cursor.index) ?? matchOperator(source, cursor.index);
|
|
172
185
|
if (!operator) {
|
|
173
|
-
addLexicalError(
|
|
186
|
+
addLexicalError(position, "");
|
|
174
187
|
return tokens;
|
|
175
188
|
}
|
|
176
189
|
tokens.push({ kind: "Word", text: operator.text, line });
|
|
177
|
-
skip(source.slice(
|
|
190
|
+
skip(source.slice(position, position + operator.length));
|
|
178
191
|
}
|
|
179
|
-
tokens.push({ kind: "End", text: "", line:
|
|
192
|
+
tokens.push({ kind: "End", text: "", line: lineNumber });
|
|
180
193
|
return tokens;
|
|
181
194
|
};
|
|
182
195
|
|
|
183
|
-
// TLC's messages for a configuration file it can't read, from ModelConfig.parse.
|
|
184
196
|
const createSyntaxError = (line: number, problem: string) =>
|
|
185
197
|
new TlaConfigError(`TLC found an error in the configuration file at line ${line}\n${problem}`);
|
|
186
198
|
|
|
@@ -218,11 +230,10 @@ const LIST_KEYWORDS = new Map<
|
|
|
218
230
|
["_POSSIBLE", "possible"],
|
|
219
231
|
]);
|
|
220
232
|
|
|
221
|
-
// A port of TLC's ModelConfig.parse, which takes any token where it expects a name or a value.
|
|
222
233
|
export const parseConfig = (source: string, version: TlcVersion = "master"): ModelConfig => {
|
|
223
234
|
const keywords = version === "1.7.4" ? KEYWORDS_174 : KEYWORDS;
|
|
224
235
|
const tokens = tokenizeConfig(source);
|
|
225
|
-
|
|
236
|
+
let tokenIndex = 0;
|
|
226
237
|
const config: ModelConfig = {
|
|
227
238
|
init: undefined,
|
|
228
239
|
next: undefined,
|
|
@@ -233,6 +244,7 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
233
244
|
actionConstraints: [],
|
|
234
245
|
constants: [],
|
|
235
246
|
substitutions: [],
|
|
247
|
+
rawConstants: [],
|
|
236
248
|
checkDeadlock: true,
|
|
237
249
|
symmetry: undefined,
|
|
238
250
|
view: undefined,
|
|
@@ -242,10 +254,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
242
254
|
periodic: undefined,
|
|
243
255
|
rlReward: undefined,
|
|
244
256
|
};
|
|
245
|
-
|
|
257
|
+
let isDeadlockSet = false;
|
|
246
258
|
const typeKeywords = new Set<string>();
|
|
247
259
|
const advance = () => {
|
|
248
|
-
const token = tokens[Math.min(
|
|
260
|
+
const token = tokens[Math.min(tokenIndex++, tokens.length - 1)];
|
|
249
261
|
if (token.kind === "Error") {
|
|
250
262
|
throw new TlaConfigError(`TLC found an error in the configuration file:\n${token.text}`);
|
|
251
263
|
}
|
|
@@ -253,23 +265,36 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
253
265
|
};
|
|
254
266
|
|
|
255
267
|
const parseValue = (token: ConfigToken): ConfigValue => {
|
|
268
|
+
if (token.kind === "Number" && token.text.startsWith("\\")) {
|
|
269
|
+
throw setExitCode(
|
|
270
|
+
new TlaConfigError(
|
|
271
|
+
`${getUnexpectedException("java.lang.NumberFormatException")}For input string: "${token.text}"`,
|
|
272
|
+
),
|
|
273
|
+
EXIT_STATUS.error,
|
|
274
|
+
);
|
|
275
|
+
}
|
|
256
276
|
if (token.kind === "Number") return { kind: "Number", value: Number(token.text) };
|
|
257
|
-
if (token.kind === "String"
|
|
277
|
+
if (token.kind === "String" && token.text.includes("\\")) {
|
|
278
|
+
throw new TlaConfigError(
|
|
279
|
+
`TLC found an error in the configuration file:\nescape sequences are not supported in strings at line ${token.line}`,
|
|
280
|
+
);
|
|
281
|
+
}
|
|
282
|
+
if (token.kind === "String") return { kind: "String", value: token.text.slice(1, -1) };
|
|
258
283
|
if (token.text === "TRUE" || token.text === "FALSE")
|
|
259
284
|
return { kind: "Boolean", value: token.text === "TRUE" };
|
|
260
285
|
if (token.text === "{") {
|
|
261
286
|
const elements: ConfigValue[] = [];
|
|
262
|
-
|
|
263
|
-
if (
|
|
287
|
+
let element = advance();
|
|
288
|
+
if (element.text !== "}") {
|
|
264
289
|
while (true) {
|
|
265
|
-
elements.push(parseValue(
|
|
266
|
-
|
|
267
|
-
if (
|
|
268
|
-
|
|
290
|
+
elements.push(parseValue(element));
|
|
291
|
+
element = advance();
|
|
292
|
+
if (element.text !== ",") break;
|
|
293
|
+
element = advance();
|
|
269
294
|
}
|
|
270
295
|
}
|
|
271
|
-
if (
|
|
272
|
-
throw createSyntaxError(
|
|
296
|
+
if (element.text !== "}") {
|
|
297
|
+
throw createSyntaxError(element.line, "It was expecting }, but did not find it.");
|
|
273
298
|
}
|
|
274
299
|
return { kind: "Set", elements };
|
|
275
300
|
}
|
|
@@ -277,7 +302,6 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
277
302
|
throw createSyntaxError(token.line, "It was expecting a value, but did not find it.");
|
|
278
303
|
};
|
|
279
304
|
|
|
280
|
-
// A module name in brackets after = or <-, which applies the assignment in that module.
|
|
281
305
|
const parseModuleScope = (operator: string) => {
|
|
282
306
|
const name = advance();
|
|
283
307
|
if (name.kind === "End") {
|
|
@@ -290,62 +314,69 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
290
314
|
return name.text;
|
|
291
315
|
};
|
|
292
316
|
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
const module = parseModuleScope("<-");
|
|
308
|
-
const target = advance();
|
|
309
|
-
if (target.kind === "End") {
|
|
310
|
-
throw createSyntaxError(target.line, "Expected an identifier after <-[mod].");
|
|
311
|
-
}
|
|
312
|
-
config.substitutions.push({ name, target: target.text, module });
|
|
313
|
-
continue;
|
|
314
|
-
}
|
|
315
|
-
if (current.token.kind === "End") {
|
|
316
|
-
throw createSyntaxError(current.token.line, "Expected an identifier after <-.");
|
|
317
|
+
const parseConstant = (first: ConfigToken, keywordLine: number) => {
|
|
318
|
+
let name = first.text;
|
|
319
|
+
let token = advance();
|
|
320
|
+
while (token.text === "!") {
|
|
321
|
+
name = `${name}!${advance().text}`;
|
|
322
|
+
token = advance();
|
|
323
|
+
}
|
|
324
|
+
if (token.text === "<-") {
|
|
325
|
+
token = advance();
|
|
326
|
+
if (token.text === "[") {
|
|
327
|
+
const module = parseModuleScope("<-");
|
|
328
|
+
const target = advance();
|
|
329
|
+
if (target.kind === "End") {
|
|
330
|
+
throw createSyntaxError(target.line, "Expected an identifier after <-[mod].");
|
|
317
331
|
}
|
|
318
|
-
config.substitutions.push({ name, target:
|
|
319
|
-
|
|
332
|
+
config.substitutions.push({ name, target: target.text, module });
|
|
333
|
+
return;
|
|
320
334
|
}
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
335
|
+
if (token.kind === "End") {
|
|
336
|
+
throw createSyntaxError(token.line, "Expected an identifier after <-.");
|
|
337
|
+
}
|
|
338
|
+
config.substitutions.push({ name, target: token.text });
|
|
339
|
+
return;
|
|
340
|
+
}
|
|
341
|
+
const args: ConfigValue[] = [];
|
|
342
|
+
const hasArgs = token.text === "(";
|
|
343
|
+
if (hasArgs) {
|
|
344
|
+
while (true) {
|
|
345
|
+
args.push(parseValue(advance()));
|
|
346
|
+
token = advance();
|
|
347
|
+
if (token.text !== ",") break;
|
|
333
348
|
}
|
|
334
|
-
if (
|
|
335
|
-
throw createSyntaxError(
|
|
336
|
-
current.token.line,
|
|
337
|
-
"It was expecting = or <-, but did not find it.",
|
|
338
|
-
);
|
|
349
|
+
if (token.text !== ")") {
|
|
350
|
+
throw createSyntaxError(keywordLine, "");
|
|
339
351
|
}
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
352
|
+
token = advance();
|
|
353
|
+
}
|
|
354
|
+
if (token.text !== "=") {
|
|
355
|
+
throw createSyntaxError(token.line, "It was expecting = or <-, but did not find it.");
|
|
356
|
+
}
|
|
357
|
+
token = advance();
|
|
358
|
+
const module = token.text === "[" ? parseModuleScope("=") : undefined;
|
|
359
|
+
const value = parseValue(module === undefined ? token : advance());
|
|
360
|
+
config.constants.push({
|
|
361
|
+
name,
|
|
362
|
+
value,
|
|
363
|
+
...(hasArgs && { args }),
|
|
364
|
+
...(module !== undefined && { module }),
|
|
365
|
+
});
|
|
366
|
+
};
|
|
367
|
+
|
|
368
|
+
const parseConstants = (keywordLine: number) => {
|
|
369
|
+
while (true) {
|
|
370
|
+
const first = advance();
|
|
371
|
+
if (first.kind === "End" || keywords.has(first.text)) return first;
|
|
372
|
+
const start = tokenIndex - 1;
|
|
373
|
+
parseConstant(first, keywordLine);
|
|
374
|
+
config.rawConstants.push(
|
|
375
|
+
tokens
|
|
376
|
+
.slice(start, tokenIndex)
|
|
377
|
+
.map((token) => token.text)
|
|
378
|
+
.join(" "),
|
|
379
|
+
);
|
|
349
380
|
}
|
|
350
381
|
};
|
|
351
382
|
|
|
@@ -357,10 +388,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
357
388
|
}
|
|
358
389
|
};
|
|
359
390
|
|
|
360
|
-
|
|
361
|
-
while (
|
|
362
|
-
const keyword =
|
|
363
|
-
const line =
|
|
391
|
+
let keywordToken = advance();
|
|
392
|
+
while (keywordToken.kind !== "End") {
|
|
393
|
+
const keyword = keywordToken.text;
|
|
394
|
+
const line = keywordToken.line;
|
|
364
395
|
const singleKey = keywords.has(keyword) ? SINGLE_KEYWORDS.get(keyword) : undefined;
|
|
365
396
|
const listKey = keywords.has(keyword) ? LIST_KEYWORDS.get(keyword) : undefined;
|
|
366
397
|
const advanceToArgument = () => {
|
|
@@ -376,15 +407,15 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
376
407
|
throw createDuplicateKeywordError(line, keyword);
|
|
377
408
|
}
|
|
378
409
|
config[singleKey] = name.text;
|
|
379
|
-
|
|
410
|
+
keywordToken = advance();
|
|
380
411
|
continue;
|
|
381
412
|
}
|
|
382
413
|
if (listKey !== undefined) {
|
|
383
|
-
|
|
414
|
+
keywordToken = parseNames(config[listKey]);
|
|
384
415
|
continue;
|
|
385
416
|
}
|
|
386
417
|
if (keyword === "CONSTANT" || keyword === "CONSTANTS") {
|
|
387
|
-
|
|
418
|
+
keywordToken = parseConstants(line);
|
|
388
419
|
continue;
|
|
389
420
|
}
|
|
390
421
|
if (keyword === "CHECK_DEADLOCK") {
|
|
@@ -392,10 +423,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
392
423
|
if (value.text !== "TRUE" && value.text !== "FALSE") {
|
|
393
424
|
throw createSyntaxError(value.line, "It was expecting TRUE or FALSE, but did not find it.");
|
|
394
425
|
}
|
|
395
|
-
if (
|
|
396
|
-
|
|
426
|
+
if (isDeadlockSet) throw createDuplicateKeywordError(line, keyword);
|
|
427
|
+
isDeadlockSet = true;
|
|
397
428
|
config.checkDeadlock = value.text === "TRUE";
|
|
398
|
-
|
|
429
|
+
keywordToken = advance();
|
|
399
430
|
continue;
|
|
400
431
|
}
|
|
401
432
|
if (!keywords.has(keyword) || !TYPE_KEYWORDS.includes(keyword)) {
|
|
@@ -404,7 +435,7 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
404
435
|
advanceToArgument();
|
|
405
436
|
if (typeKeywords.has(keyword)) throw createDuplicateKeywordError(line, keyword);
|
|
406
437
|
typeKeywords.add(keyword);
|
|
407
|
-
|
|
438
|
+
keywordToken = advance();
|
|
408
439
|
}
|
|
409
440
|
return config;
|
|
410
441
|
};
|