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
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A TLA+ expression with the structure tla-ts generates for function bodies. Keeping the
|
|
2
|
-
// structure until rendering lets disabled paths simplify away and keeps bulleted lists aligned.
|
|
3
1
|
export type Formula = TextFormula | DisabledFormula | AndFormula | IfFormula | LetFormula;
|
|
4
2
|
|
|
5
3
|
interface TextFormula {
|
|
@@ -7,7 +5,6 @@ interface TextFormula {
|
|
|
7
5
|
text: string;
|
|
8
6
|
}
|
|
9
7
|
|
|
10
|
-
// A path through an action that assigns nothing, which TLA+ writes as FALSE.
|
|
11
8
|
interface DisabledFormula {
|
|
12
9
|
kind: "disabled";
|
|
13
10
|
}
|
|
@@ -32,13 +29,13 @@ interface LetFormula {
|
|
|
32
29
|
|
|
33
30
|
export const DISABLED: Formula = { kind: "disabled" };
|
|
34
31
|
|
|
35
|
-
export const
|
|
32
|
+
export const createText = (value: string): Formula => ({ kind: "text", text: value });
|
|
36
33
|
|
|
37
34
|
export const and = (items: Formula[]): Formula => {
|
|
38
35
|
const flattened = items.flatMap((item) => (item.kind === "and" ? item.items : [item]));
|
|
39
36
|
if (flattened.some((item) => item.kind === "disabled")) return DISABLED;
|
|
40
37
|
const kept = flattened.filter((item) => item.kind !== "text" || item.text !== "TRUE");
|
|
41
|
-
if (kept.length === 0) return
|
|
38
|
+
if (kept.length === 0) return createText("TRUE");
|
|
42
39
|
return kept.length === 1 ? kept[0] : { kind: "and", items: kept };
|
|
43
40
|
};
|
|
44
41
|
|
|
@@ -49,8 +46,8 @@ export const ifThenElse = (
|
|
|
49
46
|
negated = `~${wrap(condition)}`,
|
|
50
47
|
): Formula => {
|
|
51
48
|
if (whenTrue.kind === "disabled" && whenFalse.kind === "disabled") return DISABLED;
|
|
52
|
-
if (whenFalse.kind === "disabled") return and([
|
|
53
|
-
if (whenTrue.kind === "disabled") return and([
|
|
49
|
+
if (whenFalse.kind === "disabled") return and([createText(condition), whenTrue]);
|
|
50
|
+
if (whenTrue.kind === "disabled") return and([createText(negated), whenFalse]);
|
|
54
51
|
return { kind: "if", condition, whenTrue, whenFalse };
|
|
55
52
|
};
|
|
56
53
|
|
|
@@ -97,8 +94,6 @@ interface Scan {
|
|
|
97
94
|
surface: string;
|
|
98
95
|
}
|
|
99
96
|
|
|
100
|
-
// The expression without anything inside brackets, tuples, or strings, which leaves the operators
|
|
101
|
-
// that apply to the whole expression.
|
|
102
97
|
const getSurface = (expression: string) =>
|
|
103
98
|
[...expression].reduce<Scan>(
|
|
104
99
|
(scan, character, index) => {
|
|
@@ -123,7 +118,6 @@ const getSurface = (expression: string) =>
|
|
|
123
118
|
{ depth: 0, isQuoted: false, isEscaped: false, isSkipped: false, surface: "" },
|
|
124
119
|
).surface;
|
|
125
120
|
|
|
126
|
-
// Whether an expression is a single term, so that it can be an operand without parentheses.
|
|
127
121
|
const isAtomic = (expression: string) =>
|
|
128
122
|
expression !== "" &&
|
|
129
123
|
!/^[~-]/.test(expression) &&
|
|
@@ -132,7 +126,6 @@ const isAtomic = (expression: string) =>
|
|
|
132
126
|
|
|
133
127
|
export const wrap = (expression: string) => (isAtomic(expression) ? expression : `(${expression})`);
|
|
134
128
|
|
|
135
|
-
// Operators that bind no tighter than =, so that x = a = b would be ambiguous.
|
|
136
129
|
const LOOSE_OPERATORS = [
|
|
137
130
|
" = ",
|
|
138
131
|
" # ",
|
|
@@ -149,7 +142,6 @@ const LOOSE_OPERATORS = [
|
|
|
149
142
|
" ~> ",
|
|
150
143
|
];
|
|
151
144
|
|
|
152
|
-
// Parenthesizes the value on the right of = when it is itself a comparison or a logical formula.
|
|
153
145
|
export const wrapEquated = (expression: string) =>
|
|
154
146
|
expression.startsWith("~") ||
|
|
155
147
|
LOOSE_OPERATORS.some((operator) => getSurface(expression).includes(operator))
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
} from "./context";
|
|
12
12
|
import { TlaTypeScriptError } from "../errors";
|
|
13
13
|
import { translateCondition, translateExpression, translateNegatedCondition } from "./expressions";
|
|
14
|
-
import { type Formula, ifThenElse, indent, letIn, render,
|
|
14
|
+
import { createText, type Formula, ifThenElse, indent, letIn, render, wrap } from "./formula";
|
|
15
15
|
import {
|
|
16
16
|
type Bound,
|
|
17
17
|
bindNames,
|
|
@@ -22,7 +22,6 @@ import {
|
|
|
22
22
|
type Scope,
|
|
23
23
|
} from "./scope";
|
|
24
24
|
|
|
25
|
-
// Whether a step has changed a state variable, so that helpers reading state must see the change.
|
|
26
25
|
const isStateModified = (scope: Scope, context: Context) =>
|
|
27
26
|
[...context.variables].some((entry) => scope.bindings.get(entry[0]) !== entry[1]);
|
|
28
27
|
|
|
@@ -44,8 +43,6 @@ const readsState = (node: ts.Node, context: Context, visited: Set<ts.Declaration
|
|
|
44
43
|
const getInitializer = (declaration: HelperDeclaration) =>
|
|
45
44
|
ts.isVariableDeclaration(declaration) ? declaration.initializer : undefined;
|
|
46
45
|
|
|
47
|
-
// Compiles a top-level helper function or constant into a TLA+ definition, after the definitions
|
|
48
|
-
// it uses.
|
|
49
46
|
export const getDefinition = (declaration: HelperDeclaration, context: Context): Definition => {
|
|
50
47
|
const existing = context.definitions.get(declaration);
|
|
51
48
|
if (existing !== undefined) {
|
|
@@ -56,7 +53,6 @@ export const getDefinition = (declaration: HelperDeclaration, context: Context):
|
|
|
56
53
|
throw new TlaTypeScriptError("Name this function", declaration);
|
|
57
54
|
const callee = getFunction(declaration);
|
|
58
55
|
const parameters = declareParameters(callee?.parameters ?? [], context);
|
|
59
|
-
// An operator parameter declares how many arguments it takes, as in F(_, _).
|
|
60
56
|
const declared = parameters.map((parameter) => {
|
|
61
57
|
const signatures = context.checker.getTypeAtLocation(parameter.node.name).getCallSignatures();
|
|
62
58
|
return signatures.length === 0
|
|
@@ -80,7 +76,6 @@ export const getDefinition = (declaration: HelperDeclaration, context: Context):
|
|
|
80
76
|
return definition;
|
|
81
77
|
};
|
|
82
78
|
|
|
83
|
-
// Substitutes the arguments into a function's body, which then reads the state as it is now.
|
|
84
79
|
const inlineCall = (
|
|
85
80
|
callee: FunctionNode,
|
|
86
81
|
argumentNodes: readonly ts.Expression[],
|
|
@@ -95,10 +90,11 @@ const inlineCall = (
|
|
|
95
90
|
context,
|
|
96
91
|
);
|
|
97
92
|
const value = translateBody(callee.body, bound.scope, context);
|
|
98
|
-
return bound.definitions.length === 0
|
|
93
|
+
return bound.definitions.length === 0
|
|
94
|
+
? value
|
|
95
|
+
: render(letIn(bound.definitions, createText(value)));
|
|
99
96
|
};
|
|
100
97
|
|
|
101
|
-
// A function argument to an operator parameter, as a LAMBDA or an operator's name.
|
|
102
98
|
const translateOperatorArgument = (node: ts.Expression, scope: Scope, context: Context) => {
|
|
103
99
|
if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
|
|
104
100
|
const parameters = declareParameters(node.parameters, context);
|
|
@@ -113,8 +109,6 @@ const translateOperatorArgument = (node: ts.Expression, scope: Scope, context: C
|
|
|
113
109
|
return binding;
|
|
114
110
|
};
|
|
115
111
|
|
|
116
|
-
// A call to a top-level helper, or a reference to a top-level constant when node is undefined.
|
|
117
|
-
// A helper that reads state after the step has changed it is inlined, so it reads the new values.
|
|
118
112
|
export const translateHelperCall = (
|
|
119
113
|
declaration: HelperDeclaration,
|
|
120
114
|
node: ts.CallExpression | undefined,
|
|
@@ -139,7 +133,6 @@ export const translateHelperCall = (
|
|
|
139
133
|
return `${definition.name}(${values.join(", ")})`;
|
|
140
134
|
};
|
|
141
135
|
|
|
142
|
-
// A call to a function declared inside another, which is inlined.
|
|
143
136
|
export const translateLocalCall = (node: ts.CallExpression, scope: Scope, context: Context) => {
|
|
144
137
|
const callee = getCallee(node.expression, context);
|
|
145
138
|
if (callee === undefined) {
|
|
@@ -157,7 +150,6 @@ export const translateLocalCall = (node: ts.CallExpression, scope: Scope, contex
|
|
|
157
150
|
return value;
|
|
158
151
|
};
|
|
159
152
|
|
|
160
|
-
// A function body that computes a value, as a TLA+ expression.
|
|
161
153
|
export const translateBody = (body: ts.ConciseBody, scope: Scope, context: Context): string => {
|
|
162
154
|
if (!ts.isBlock(body)) return translateExpression(body, scope, context);
|
|
163
155
|
return render(
|
|
@@ -206,9 +198,9 @@ const translatePure = (
|
|
|
206
198
|
if (ts.isReturnStatement(statement)) {
|
|
207
199
|
if (statement.expression === undefined)
|
|
208
200
|
throw new TlaTypeScriptError("Return a value", statement);
|
|
209
|
-
return
|
|
201
|
+
return createText(translateExpression(statement.expression, scope, context));
|
|
210
202
|
}
|
|
211
|
-
if (ts.isThrowStatement(statement)) return
|
|
203
|
+
if (ts.isThrowStatement(statement)) return createText(translateThrow(statement, scope, context));
|
|
212
204
|
if (ts.isSwitchStatement(statement)) {
|
|
213
205
|
return translateSwitch(
|
|
214
206
|
statement,
|
|
@@ -230,7 +222,6 @@ export const translateThrow = (statement: ts.ThrowStatement, scope: Scope, conte
|
|
|
230
222
|
return `Assert(FALSE, ${message})`;
|
|
231
223
|
};
|
|
232
224
|
|
|
233
|
-
// An if statement as an IF. Without an else, the false branch is the rest of the statements.
|
|
234
225
|
export const translateIf = (
|
|
235
226
|
statement: ts.IfStatement,
|
|
236
227
|
scope: Scope,
|
|
@@ -252,7 +243,6 @@ export const translateIf = (
|
|
|
252
243
|
);
|
|
253
244
|
};
|
|
254
245
|
|
|
255
|
-
// A switch as nested IFs. Each clause but the last must end in break, return, or throw.
|
|
256
246
|
export const translateSwitch = (
|
|
257
247
|
statement: ts.SwitchStatement,
|
|
258
248
|
scope: Scope,
|
|
@@ -264,7 +254,6 @@ export const translateSwitch = (
|
|
|
264
254
|
const clauses = statement.caseBlock.clauses;
|
|
265
255
|
const translateFrom = (start: number): Formula => {
|
|
266
256
|
if (start === clauses.length) return translateRest();
|
|
267
|
-
// Empty clauses fall through to the next clause with statements.
|
|
268
257
|
const end = clauses.findIndex(
|
|
269
258
|
(clause, index) => index >= start && clause.statements.length > 0,
|
|
270
259
|
);
|
package/src/typescript/model.ts
CHANGED
|
@@ -14,7 +14,6 @@ export interface Variable {
|
|
|
14
14
|
declaration: ts.VariableDeclaration;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
// An exported function, which becomes an action, an invariant, or a property its tag names.
|
|
18
17
|
export interface Exported {
|
|
19
18
|
name: string;
|
|
20
19
|
declaration: HelperDeclaration;
|
|
@@ -31,9 +30,7 @@ interface Declared {
|
|
|
31
30
|
export interface Model {
|
|
32
31
|
variables: Variable[];
|
|
33
32
|
exported: Exported[];
|
|
34
|
-
// Top-level functions and constants by their TypeScript names, which @leadsTo refers to.
|
|
35
33
|
topLevel: Map<string, HelperDeclaration>;
|
|
36
|
-
// The model values of each @symmetric type, as a TLA+ set.
|
|
37
34
|
symmetrySets: string[];
|
|
38
35
|
isDeadlockChecked: boolean;
|
|
39
36
|
}
|
|
@@ -73,7 +70,6 @@ const isLet = (declared: Declared) =>
|
|
|
73
70
|
ts.isVariableDeclaration(declared.declaration) &&
|
|
74
71
|
(declared.declaration.parent.flags & ts.NodeFlags.Let) !== 0;
|
|
75
72
|
|
|
76
|
-
// The string literals of a @symmetric type become model values, which TLC can permute.
|
|
77
73
|
const declareModelValues = (statement: ts.TypeAliasDeclaration, context: Context) => {
|
|
78
74
|
const type = context.checker.getTypeAtLocation(statement.name);
|
|
79
75
|
const names = (type.isUnion() ? type.types : [type]).map((member) => {
|
|
@@ -90,7 +86,6 @@ const declareModelValues = (statement: ts.TypeAliasDeclaration, context: Context
|
|
|
90
86
|
return `{${names.join(", ")}}`;
|
|
91
87
|
};
|
|
92
88
|
|
|
93
|
-
// The functions and constants a statement declares. Types and imports declare none.
|
|
94
89
|
const getDeclarations = (statement: ts.Statement): Declared[] => {
|
|
95
90
|
if (
|
|
96
91
|
ts.isImportDeclaration(statement) ||
|
|
@@ -119,7 +114,6 @@ const getDeclarations = (statement: ts.Statement): Declared[] => {
|
|
|
119
114
|
});
|
|
120
115
|
};
|
|
121
116
|
|
|
122
|
-
// Reads a model's state variables, exported functions, and tags, and names them in TLA+.
|
|
123
117
|
export const readModel = (sourceFile: ts.SourceFile, context: Context): Model => {
|
|
124
118
|
const statements = sourceFile.statements;
|
|
125
119
|
const tags = new Map(statements.map((statement) => [statement, getTags(statement)]));
|
|
@@ -149,14 +143,19 @@ export const readModel = (sourceFile: ts.SourceFile, context: Context): Model =>
|
|
|
149
143
|
const statement = ts.isVariableDeclaration(declaration)
|
|
150
144
|
? declaration.parent.parent
|
|
151
145
|
: declaration;
|
|
152
|
-
return [
|
|
146
|
+
return [
|
|
147
|
+
{
|
|
148
|
+
name: context.names.getFresh(declared.name),
|
|
149
|
+
declaration,
|
|
150
|
+
node,
|
|
151
|
+
body: node.body,
|
|
152
|
+
tags: tags.get(statement) ?? new Map(),
|
|
153
|
+
},
|
|
154
|
+
];
|
|
153
155
|
});
|
|
154
156
|
return {
|
|
155
157
|
variables,
|
|
156
|
-
exported
|
|
157
|
-
...definition,
|
|
158
|
-
name: context.names.getFresh(definition.name),
|
|
159
|
-
})),
|
|
158
|
+
exported,
|
|
160
159
|
topLevel: new Map(helpers.map((declared) => [declared.name, declared.declaration])),
|
|
161
160
|
symmetrySets,
|
|
162
161
|
isDeadlockChecked: ![...tags.values()].some((statementTags) => statementTags.has("noDeadlock")),
|
package/src/typescript/names.ts
CHANGED
|
@@ -18,11 +18,8 @@ const COMPILER_OPTIONS: ts.CompilerOptions = {
|
|
|
18
18
|
|
|
19
19
|
const LIBRARY_DIRECTORY = dirname(ts.getDefaultLibFilePath(COMPILER_OPTIONS));
|
|
20
20
|
|
|
21
|
-
// TypeScript's own declaration files, parsed once and shared by every program, since parsing them
|
|
22
|
-
// takes most of a compile.
|
|
23
21
|
const libraryFiles = new Map<string, ts.SourceFile>();
|
|
24
22
|
|
|
25
|
-
// Type checks a model, with the files it imports, and throws its type errors.
|
|
26
23
|
export const createProgram = (source: string, path: string) => {
|
|
27
24
|
const sourceFile = ts.createSourceFile(path, source, ts.ScriptTarget.ESNext, true);
|
|
28
25
|
const host = ts.createCompilerHost(COMPILER_OPTIONS);
|
|
@@ -15,7 +15,6 @@ const TEMPORAL_OPERATORS = new Map([
|
|
|
15
15
|
["eventuallyAlways", "<>[]"],
|
|
16
16
|
]);
|
|
17
17
|
|
|
18
|
-
// Tags whose functions become named predicates that the config lists in a section.
|
|
19
18
|
const PREDICATE_TAGS = new Map<string, keyof Sections>([
|
|
20
19
|
["constraint", "constraints"],
|
|
21
20
|
["actionConstraint", "actionConstraints"],
|
|
@@ -24,17 +23,15 @@ const PREDICATE_TAGS = new Map<string, keyof Sections>([
|
|
|
24
23
|
["assume", "assumptions"],
|
|
25
24
|
]);
|
|
26
25
|
|
|
27
|
-
// Tags that make an exported function a property of the spec rather than an action.
|
|
28
26
|
export const VALUE_TAGS = new Set([
|
|
29
27
|
...TEMPORAL_OPERATORS.keys(),
|
|
30
28
|
...PREDICATE_TAGS.keys(),
|
|
31
29
|
"initially",
|
|
32
30
|
"always",
|
|
33
31
|
"leadsTo",
|
|
32
|
+
"terminating",
|
|
34
33
|
]);
|
|
35
34
|
|
|
36
|
-
// The scope of an action property, whose one parameter names the state before the step, and whose
|
|
37
|
-
// variables are the state after it.
|
|
38
35
|
const getPreviousScope = (definition: Exported, context: Context): Scope => {
|
|
39
36
|
const parameters = definition.node.parameters;
|
|
40
37
|
if (parameters.length === 0) return createStateScope(context);
|
|
@@ -47,14 +44,13 @@ const getPreviousScope = (definition: Exported, context: Context): Scope => {
|
|
|
47
44
|
};
|
|
48
45
|
};
|
|
49
46
|
|
|
50
|
-
// The operator that a @leadsTo tag names, applied to the parameters that it shares.
|
|
51
47
|
const getLeadsToTarget = (
|
|
52
48
|
definition: Exported,
|
|
53
49
|
parameters: string[],
|
|
54
50
|
model: Model,
|
|
55
51
|
context: Context,
|
|
56
52
|
) => {
|
|
57
|
-
const targetName = definition.tags.get("leadsTo") ?? "";
|
|
53
|
+
const targetName = (definition.tags.get("leadsTo") ?? "").split(/\s/)[0];
|
|
58
54
|
const target = model.topLevel.get(targetName);
|
|
59
55
|
if (target === undefined) {
|
|
60
56
|
throw new TlaTypeScriptError(
|
|
@@ -81,7 +77,6 @@ export const translateProperty = (
|
|
|
81
77
|
const name = definition.name;
|
|
82
78
|
const node = definition.node;
|
|
83
79
|
const hasPreviousState = tag === "always" || tag === "actionConstraint";
|
|
84
|
-
// A temporal property's parameters hold for every value, as in \A p \in P : []<>Eats(p).
|
|
85
80
|
const isQuantified = TEMPORAL_OPERATORS.has(tag) || tag === "leadsTo";
|
|
86
81
|
if (!hasPreviousState && !isQuantified && node.parameters.length > 0) {
|
|
87
82
|
throw new TlaTypeScriptError(`@${tag} functions can't take parameters`, node.parameters[0]);
|
|
@@ -118,6 +113,10 @@ export const translateProperty = (
|
|
|
118
113
|
);
|
|
119
114
|
sections.properties.push(name);
|
|
120
115
|
}
|
|
116
|
+
if (tag === "terminating") {
|
|
117
|
+
sections.actions.push(`${name} ==\n ${value}`);
|
|
118
|
+
sections.next.push(`${name} /\\ UNCHANGED vars`);
|
|
119
|
+
}
|
|
121
120
|
if (tag === "initially") sections.init.push(value);
|
|
122
121
|
if (predicate !== undefined) {
|
|
123
122
|
sections.predicates.push(`${name} ==\n ${value}`);
|
|
@@ -125,7 +124,6 @@ export const translateProperty = (
|
|
|
125
124
|
}
|
|
126
125
|
};
|
|
127
126
|
|
|
128
|
-
// An exported function that returns a boolean, which holds in every state.
|
|
129
127
|
export const translateInvariant = (definition: Exported, sections: Sections, context: Context) => {
|
|
130
128
|
const parameters = definition.node.parameters;
|
|
131
129
|
if (parameters.length > 0) {
|
package/src/typescript/scope.ts
CHANGED
|
@@ -4,9 +4,7 @@ import { TlaTypeScriptError } from "../errors";
|
|
|
4
4
|
import { indent, wrap } from "./formula";
|
|
5
5
|
|
|
6
6
|
export interface Scope {
|
|
7
|
-
// The TLA+ expression for each variable, parameter, and local in scope.
|
|
8
7
|
bindings: Map<ts.Symbol, string>;
|
|
9
|
-
// The parameter that names the state before a step, in action properties and constraints.
|
|
10
8
|
previous: ts.Symbol | undefined;
|
|
11
9
|
}
|
|
12
10
|
|
|
@@ -65,7 +63,6 @@ export const declareParameters = (
|
|
|
65
63
|
context: Context,
|
|
66
64
|
) => parameters.map((parameter) => declareParameter(parameter, context));
|
|
67
65
|
|
|
68
|
-
// Binds the names in a destructuring pattern to parts of a value, without LET definitions.
|
|
69
66
|
export const bindPatternInline = (
|
|
70
67
|
pattern: ts.BindingName,
|
|
71
68
|
value: string,
|
|
@@ -87,7 +84,6 @@ export const bindPatternInline = (
|
|
|
87
84
|
}, scope);
|
|
88
85
|
};
|
|
89
86
|
|
|
90
|
-
// Binds the names in a declaration to LET definitions.
|
|
91
87
|
export const bindPattern = (
|
|
92
88
|
pattern: ts.BindingName,
|
|
93
89
|
value: string,
|
|
@@ -101,7 +97,6 @@ export const bindPattern = (
|
|
|
101
97
|
};
|
|
102
98
|
};
|
|
103
99
|
|
|
104
|
-
// Binds parameters to argument values with LET definitions, as when inlining a call.
|
|
105
100
|
export const bindValues = (
|
|
106
101
|
patterns: ts.BindingName[],
|
|
107
102
|
values: string[],
|
package/src/typescript/steps.ts
CHANGED
|
@@ -16,7 +16,6 @@ interface Guard {
|
|
|
16
16
|
|
|
17
17
|
interface Chosen {
|
|
18
18
|
domain: string;
|
|
19
|
-
// Whether the set uses parameters that earlier guards chose.
|
|
20
19
|
isDependent: boolean;
|
|
21
20
|
}
|
|
22
21
|
|
|
@@ -32,8 +31,6 @@ const isBareReturn = (statement: ts.Statement): boolean =>
|
|
|
32
31
|
statement.statements.length === 1 &&
|
|
33
32
|
isBareReturn(statement.statements[0]);
|
|
34
33
|
|
|
35
|
-
// A leading `if (!set.has(parameter)) return;` chooses the parameter from that set, as
|
|
36
|
-
// `\E parameter \in set` does, so TLC doesn't enumerate the parameter's whole type.
|
|
37
34
|
const getGuard = (
|
|
38
35
|
statement: ts.Statement,
|
|
39
36
|
parameters: Parameter[],
|
|
@@ -71,7 +68,6 @@ const getGuard = (
|
|
|
71
68
|
(candidate) => candidate.symbol === getSymbol(argument, context.checker),
|
|
72
69
|
);
|
|
73
70
|
const set = call.expression.expression;
|
|
74
|
-
// The set may use parameters that earlier guards chose, as in \E a \in A : \E b \in B(a).
|
|
75
71
|
const used = getParameters(set);
|
|
76
72
|
if (
|
|
77
73
|
parameter === undefined ||
|
|
@@ -84,7 +80,6 @@ const getGuard = (
|
|
|
84
80
|
return { parameter, set, isDependent: used.length > 0 };
|
|
85
81
|
};
|
|
86
82
|
|
|
87
|
-
// The parameters that leading guards choose, and the statements after the guards.
|
|
88
83
|
const readGuards = (
|
|
89
84
|
statements: readonly ts.Statement[],
|
|
90
85
|
parameters: Parameter[],
|
|
@@ -104,8 +99,6 @@ const readGuards = (
|
|
|
104
99
|
);
|
|
105
100
|
};
|
|
106
101
|
|
|
107
|
-
// An exported function that changes state, as an action and its disjunct of Next. Each parameter
|
|
108
|
-
// ranges over its type, or over the set that a guard chooses it from.
|
|
109
102
|
export const translateStep = (definition: Exported, sections: Sections, context: Context) => {
|
|
110
103
|
const name = definition.name;
|
|
111
104
|
const body = definition.body;
|
|
@@ -147,15 +140,12 @@ export const translateStep = (definition: Exported, sections: Sections, context:
|
|
|
147
140
|
? []
|
|
148
141
|
: [`${parameter.name} \\in ${domains[index]}`],
|
|
149
142
|
);
|
|
150
|
-
// Guards run in order, so each dependent parameter is chosen after the ones its set uses.
|
|
151
143
|
const dependent = [...guards.chosen]
|
|
152
144
|
.filter((entry) => entry[1].isDependent)
|
|
153
145
|
.map((entry) => `\\E ${entry[0].name} \\in ${entry[1].domain} : `);
|
|
154
146
|
const step = `\\E ${independent.join(", ")} : ${dependent.join("")}${head}`;
|
|
155
147
|
sections.next.push(step);
|
|
156
148
|
if (fairness === undefined) return;
|
|
157
|
-
// Fairness holds for each parameter value when every parameter has a finite type, with the
|
|
158
|
-
// guards that chose parameters kept inside the action.
|
|
159
149
|
const typeDomains = parameters.map((parameter, index) =>
|
|
160
150
|
guards.chosen.has(parameter) ? findDomain(getType(parameter), context) : domains[index],
|
|
161
151
|
);
|
package/src/typescript/types.ts
CHANGED
|
@@ -5,12 +5,10 @@ import { wrap } from "./formula";
|
|
|
5
5
|
|
|
6
6
|
export type Kind = "sequence" | "set" | "map" | "string" | "other";
|
|
7
7
|
|
|
8
|
-
// Why a type has no finite set of values.
|
|
9
8
|
interface Infinite {
|
|
10
9
|
message: string;
|
|
11
10
|
}
|
|
12
11
|
|
|
13
|
-
// The checker only gives type arguments of type references, which the public API can't detect.
|
|
14
12
|
const isTypeReference = (type: ts.Type): type is ts.TypeReference =>
|
|
15
13
|
(type.flags & ts.TypeFlags.Object) !== 0 &&
|
|
16
14
|
((type as ts.ObjectType).objectFlags & ts.ObjectFlags.Reference) !== 0;
|
|
@@ -21,13 +19,11 @@ const isSetType = (type: ts.Type) => ["Set", "ReadonlySet"].includes(getTypeName
|
|
|
21
19
|
|
|
22
20
|
const isMapType = (type: ts.Type) => ["Map", "ReadonlyMap"].includes(getTypeName(type));
|
|
23
21
|
|
|
24
|
-
// Arrays, tuples, and unions of them, such as [] | [number] | [number, number].
|
|
25
22
|
const isSequenceType = (type: ts.Type, checker: ts.TypeChecker): boolean =>
|
|
26
23
|
type.isUnion()
|
|
27
24
|
? type.types.every((member) => isSequenceType(member, checker))
|
|
28
25
|
: checker.isArrayType(type) || checker.isTupleType(type);
|
|
29
26
|
|
|
30
|
-
// Whether every member of a type, such as each literal in a union, has the given flags.
|
|
31
27
|
const isEvery = (type: ts.Type, flags: ts.TypeFlags): boolean =>
|
|
32
28
|
type.isUnion()
|
|
33
29
|
? type.types.every((member) => isEvery(member, flags))
|
|
@@ -49,7 +45,6 @@ export const isBooleanLike = (node: ts.Expression, context: Context) =>
|
|
|
49
45
|
export const isSet = (node: ts.Expression, context: Context) =>
|
|
50
46
|
isSetType(context.checker.getTypeAtLocation(node));
|
|
51
47
|
|
|
52
|
-
// TLA+ records only have identifier fields, so an object with numeric keys becomes a function.
|
|
53
48
|
export const isNumericKey = (key: string) => /^-?\d+$/.test(key);
|
|
54
49
|
|
|
55
50
|
const getLiteral = (type: ts.Type, context: Context) => {
|
|
@@ -73,7 +68,6 @@ const getInfinite = (type: ts.Type, reason: string, context: Context): Infinite
|
|
|
73
68
|
message: `${context.checker.typeToString(type)} isn't finite: ${reason}`,
|
|
74
69
|
});
|
|
75
70
|
|
|
76
|
-
// The first type that has no end, or the domains of every type.
|
|
77
71
|
const findDomains = (types: readonly ts.Type[], context: Context) =>
|
|
78
72
|
types.reduce<string[] | Infinite>((domains, type) => {
|
|
79
73
|
if (!Array.isArray(domains)) return domains;
|
|
@@ -81,7 +75,6 @@ const findDomains = (types: readonly ts.Type[], context: Context) =>
|
|
|
81
75
|
return typeof domain === "string" ? [...domains, domain] : domain;
|
|
82
76
|
}, []);
|
|
83
77
|
|
|
84
|
-
// The set of every value that a finite type allows, which TLC enumerates.
|
|
85
78
|
export const findDomain = (type: ts.Type, context: Context): string | Infinite => {
|
|
86
79
|
const checker = context.checker;
|
|
87
80
|
if (type.flags & ts.TypeFlags.Boolean) return "BOOLEAN";
|
|
@@ -95,7 +88,7 @@ export const findDomain = (type: ts.Type, context: Context): string | Infinite =
|
|
|
95
88
|
const enumerated = literals
|
|
96
89
|
.filter((literal) => literal !== undefined)
|
|
97
90
|
.sort((left, right) =>
|
|
98
|
-
|
|
91
|
+
isNumericKey(left) && isNumericKey(right) ? Number(left) - Number(right) : 0,
|
|
99
92
|
);
|
|
100
93
|
return [...(enumerated.length > 0 ? [`{${enumerated.join(", ")}}`] : []), ...others]
|
|
101
94
|
.map((domain, _, domains) => (domains.length > 1 ? wrap(domain) : domain))
|