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/resolve.ts
CHANGED
|
@@ -22,8 +22,6 @@ import {
|
|
|
22
22
|
} from "./ast";
|
|
23
23
|
import { formatRange, TlaSyntaxError, type SanyError } from "./errors";
|
|
24
24
|
|
|
25
|
-
// The kinds of symbol SANY tells apart when it binds a name twice. A parameter is also a bound name,
|
|
26
|
-
// and a NEW symbol has a kind for each level.
|
|
27
25
|
export type SymbolKind =
|
|
28
26
|
| "Builtin"
|
|
29
27
|
| "Constant"
|
|
@@ -34,8 +32,6 @@ export type SymbolKind =
|
|
|
34
32
|
| "Parameter"
|
|
35
33
|
| `New${NewSymbol["level"]}`;
|
|
36
34
|
|
|
37
|
-
// range is where SANY reports the symbol, and two symbols at one range are one node to SANY. params
|
|
38
|
-
// holds the arity of each parameter of a defined operator.
|
|
39
35
|
interface Binding {
|
|
40
36
|
kind: SymbolKind;
|
|
41
37
|
arity: number;
|
|
@@ -49,17 +45,12 @@ export interface ModuleSymbol extends Binding {
|
|
|
49
45
|
|
|
50
46
|
export type Symbols = Map<string, ModuleSymbol>;
|
|
51
47
|
|
|
52
|
-
// A named theorem or proof step whose parts a name such as foo!lab or <1>2!1 selects. isInProof
|
|
53
|
-
// holds while SANY analyzes the proof of the theorem or step.
|
|
54
48
|
interface Goal {
|
|
55
49
|
statement: Expression | AssumeProve;
|
|
56
50
|
isSuffices: boolean;
|
|
57
51
|
isInProof: boolean;
|
|
58
52
|
}
|
|
59
53
|
|
|
60
|
-
// isPending holds for an operator a RECURSIVE declaration names until its definition.
|
|
61
|
-
// isNonFact holds for the name of a USE, HIDE, DEFINE or INSTANCE step, which SANY takes neither as
|
|
62
|
-
// a fact nor as an expression.
|
|
63
54
|
interface LocalName extends Binding {
|
|
64
55
|
name: string;
|
|
65
56
|
parent: LocalName | undefined;
|
|
@@ -68,13 +59,11 @@ interface LocalName extends Binding {
|
|
|
68
59
|
isNonFact?: boolean;
|
|
69
60
|
}
|
|
70
61
|
|
|
71
|
-
// A name the module binds, from position on.
|
|
72
62
|
interface ModuleBinding extends Binding {
|
|
73
63
|
position: SourceLocation;
|
|
74
64
|
isPending?: boolean;
|
|
75
65
|
}
|
|
76
66
|
|
|
77
|
-
// What SANY reports while it goes on analyzing a unit of a module, and the scope it analyzes it in.
|
|
78
67
|
interface Unit {
|
|
79
68
|
imported: Symbols;
|
|
80
69
|
getInstance: (instance: Instance) => InstancedModule;
|
|
@@ -87,15 +76,11 @@ interface Unit {
|
|
|
87
76
|
bindings: Map<string, ModuleBinding>;
|
|
88
77
|
errors: SanyError[];
|
|
89
78
|
warnings: SanyError[];
|
|
90
|
-
// In a definition, a named theorem, or a numbered step.
|
|
91
79
|
hasLabelScope: boolean;
|
|
92
|
-
// In the scope of a NEW in a nested ASSUME.
|
|
93
80
|
isLabelForbidden: boolean;
|
|
94
81
|
isInExcept: boolean;
|
|
95
|
-
// The names bound since the innermost definition, label, or step, which a label must take.
|
|
96
82
|
labelParams: string[];
|
|
97
83
|
labels: Set<string>;
|
|
98
|
-
// In a definition generated for a LET INSTANCE, or a subexpression analyzed where it is defined.
|
|
99
84
|
isGenerated: boolean;
|
|
100
85
|
}
|
|
101
86
|
|
|
@@ -114,8 +99,6 @@ type Reference = Expression & { kind: "Identifier" | "Apply" | "Subexpression" }
|
|
|
114
99
|
|
|
115
100
|
export const LOCAL_RESOLUTION = { kind: "Local" } as const;
|
|
116
101
|
|
|
117
|
-
// The subexpressions that names select, and for a name that selects none, the error SANY reports and
|
|
118
|
-
// the arguments it analyzes before it.
|
|
119
102
|
export const selections = new WeakSet<Expression>();
|
|
120
103
|
export const selectionErrors = new WeakMap<Expression, SelectionError>();
|
|
121
104
|
|
|
@@ -123,7 +106,6 @@ const renamedArities = new WeakMap<Expression, number>();
|
|
|
123
106
|
|
|
124
107
|
export const KEY_SEPARATOR = "@";
|
|
125
108
|
|
|
126
|
-
// A key is a name, the separator, and an id, so the operator @@ is not one.
|
|
127
109
|
const isKey = (name: string) => {
|
|
128
110
|
const index = name.lastIndexOf(KEY_SEPARATOR);
|
|
129
111
|
return index > 0 && index < name.length - 1;
|
|
@@ -151,8 +133,6 @@ const lookupLocal = (scope: LocalName | undefined, name: string) => {
|
|
|
151
133
|
return undefined;
|
|
152
134
|
};
|
|
153
135
|
|
|
154
|
-
// A name the module binds before the unit and before the range, which a copy of a subexpression
|
|
155
|
-
// that a reference selects keeps from its definition.
|
|
156
136
|
const getModuleBinding = (name: string, unit: Unit, range: SourceRange | undefined) => {
|
|
157
137
|
const binding = unit.bindings.get(name);
|
|
158
138
|
return binding &&
|
|
@@ -165,8 +145,6 @@ const getModuleBinding = (name: string, unit: Unit, range: SourceRange | undefin
|
|
|
165
145
|
const isSameRange = (left: SourceRange | undefined, right: SourceRange | undefined) =>
|
|
166
146
|
left !== undefined && right !== undefined && formatRange(left) === formatRange(right);
|
|
167
147
|
|
|
168
|
-
// SymbolTable.addSymbol: rejects redefining a built-in, a bound name, or a symbol of another kind
|
|
169
|
-
// or arity, and warns of any other duplicate. A symbol SANY never sees, such as a generated one, binds.
|
|
170
148
|
const isBindable = (name: string, current: Binding | undefined, added: Binding, unit: Unit) => {
|
|
171
149
|
if (current === undefined) return true;
|
|
172
150
|
if (isSameRange(current.range, added.range)) return false;
|
|
@@ -214,7 +192,6 @@ const bindName = (
|
|
|
214
192
|
? { ...added, name, parent: scope }
|
|
215
193
|
: scope;
|
|
216
194
|
|
|
217
|
-
// Binds the names of a module from the unit on.
|
|
218
195
|
const bindModuleName = (name: string, added: Binding, unit: Unit) => {
|
|
219
196
|
if (isBindable(name, unit.bindings.get(name), added, unit)) {
|
|
220
197
|
unit.bindings.set(name, { ...added, position: unit.location });
|
|
@@ -276,14 +253,12 @@ const findSymbol = (name: string, unit: Unit): ModuleSymbol | undefined => {
|
|
|
276
253
|
const findBinding = (name: string, scope: LocalName | undefined, unit: Unit): Binding | undefined =>
|
|
277
254
|
lookupLocal(scope, name) ?? findSymbol(name, unit);
|
|
278
255
|
|
|
279
|
-
// SANY reports a name at the range of its text.
|
|
280
256
|
const getNameRange = (location: SourceLocation, name: string): SourceRange => ({
|
|
281
257
|
module: location.range?.module ?? "",
|
|
282
258
|
start: location,
|
|
283
259
|
end: { line: location.line, column: location.column + name.length - 1 },
|
|
284
260
|
});
|
|
285
261
|
|
|
286
|
-
// SANY reports a name at its tokens, such as M ! ⊕ for M!\oplus.
|
|
287
262
|
const getSpelledNameRange = (
|
|
288
263
|
expression: Expression & { kind: "Identifier" | "Apply" | "OperatorReference" },
|
|
289
264
|
name: string,
|
|
@@ -295,7 +270,6 @@ const getSpelledNameRange = (
|
|
|
295
270
|
: getNameRange(expression.location, expression.spelling ?? name);
|
|
296
271
|
};
|
|
297
272
|
|
|
298
|
-
// SANY reports an operator symbol applied to operands as one it cannot resolve.
|
|
299
273
|
const getFixity = (expression: Expression) => {
|
|
300
274
|
if (expression.kind !== "Apply") return undefined;
|
|
301
275
|
if (expression.args.length === 2) return "infix";
|
|
@@ -303,7 +277,6 @@ const getFixity = (expression: Expression) => {
|
|
|
303
277
|
return isBefore(expression.location, expression.args[0].location) ? "prefix" : "postfix";
|
|
304
278
|
};
|
|
305
279
|
|
|
306
|
-
// SANY names an undefined operator symbol such as + differently from an undefined identifier.
|
|
307
280
|
const isOperatorSymbol = (name: string) => !/^[\p{L}\d_]/u.test(name);
|
|
308
281
|
|
|
309
282
|
const isStepName = (name: string) =>
|
|
@@ -315,8 +288,6 @@ export const getOperandIndex = (operand: number | "<<" | ">>", count: number) =>
|
|
|
315
288
|
return count === 2 ? 1 : -1;
|
|
316
289
|
};
|
|
317
290
|
|
|
318
|
-
// The parts of a name such as F(x)!l(y), each with its own arguments. counts holds the number each
|
|
319
|
-
// part takes, when a part before the last takes some.
|
|
320
291
|
export const getNameSelectors = (
|
|
321
292
|
name: string,
|
|
322
293
|
args: Expression[],
|
|
@@ -324,7 +295,7 @@ export const getNameSelectors = (
|
|
|
324
295
|
): Selector[] => {
|
|
325
296
|
const parts = name.split("!");
|
|
326
297
|
const partCounts =
|
|
327
|
-
counts ?? parts.map((
|
|
298
|
+
counts ?? parts.map((_part, index) => (index === parts.length - 1 ? args.length : 0));
|
|
328
299
|
return parts.map((part, index) => {
|
|
329
300
|
const start = partCounts.slice(0, index).reduce((sum, count) => sum + count, 0);
|
|
330
301
|
return { kind: "Name", name: part, args: args.slice(start, start + partCounts[index]) };
|
|
@@ -343,8 +314,6 @@ const getBoundSets = (bounds: Bound[]) =>
|
|
|
343
314
|
.filter((bound, index) => index === 0 || bounds[index - 1].set !== bound.set)
|
|
344
315
|
.map((bound) => bound.set);
|
|
345
316
|
|
|
346
|
-
// The names a binder binds, its body, and the sets it binds them to, which a selector such as !1
|
|
347
|
-
// chooses from.
|
|
348
317
|
export const getBinder = (
|
|
349
318
|
expression: Expression,
|
|
350
319
|
): { names: string[]; body: Expression; sets: Expression[] } | undefined => {
|
|
@@ -387,7 +356,6 @@ export const getBinder = (
|
|
|
387
356
|
}
|
|
388
357
|
};
|
|
389
358
|
|
|
390
|
-
// The operands that a selector such as !1 chooses from, where they do not depend on bound names.
|
|
391
359
|
export const getOperands = (expression: Expression): Expression[] | undefined => {
|
|
392
360
|
switch (expression.kind) {
|
|
393
361
|
case "Apply":
|
|
@@ -456,7 +424,6 @@ const findLabel = (expression: Expression, name: string): LabelExpression | unde
|
|
|
456
424
|
);
|
|
457
425
|
};
|
|
458
426
|
|
|
459
|
-
// SANY drops a label in the scope of a NEW in a nested ASSUME, after it reports the label.
|
|
460
427
|
const findClauseLabel = (
|
|
461
428
|
clause: Expression | NewSymbol | AssumeProve,
|
|
462
429
|
name: string,
|
|
@@ -482,10 +449,6 @@ const getOperandName = (operand: number | "<<" | ">>") =>
|
|
|
482
449
|
|
|
483
450
|
const SCOPE_MESSAGE = "within the scope of a declaration\n from outside that declaration's scope.";
|
|
484
451
|
|
|
485
|
-
// Generator.selectorToNode for a name that selects part of a theorem or step. A part in the scope of
|
|
486
|
-
// a NEW in its ASSUME may be selected only within the proof of the theorem, or only after the proof
|
|
487
|
-
// of a SUFFICES step. A label takes its own arguments, and an operand must exist, unless the part
|
|
488
|
-
// selected depends on bound names. A fact may select an ASSUME/PROVE or a NEW clause.
|
|
489
452
|
const checkSelection = (
|
|
490
453
|
reference: Reference,
|
|
491
454
|
selectors: Selector[],
|
|
@@ -623,7 +586,6 @@ const checkSelection = (
|
|
|
623
586
|
}
|
|
624
587
|
};
|
|
625
588
|
|
|
626
|
-
// Generator.generateLabel reports a label where it may not appear, and skips the label's body.
|
|
627
589
|
const isLabelReported = (label: LabelExpression, unit: Unit) => {
|
|
628
590
|
const message = unit.isGenerated
|
|
629
591
|
? undefined
|
|
@@ -639,9 +601,6 @@ const isLabelReported = (label: LabelExpression, unit: Unit) => {
|
|
|
639
601
|
return true;
|
|
640
602
|
};
|
|
641
603
|
|
|
642
|
-
// Generator.generateLabel reports, after the label's body, each parameter that names no bound name,
|
|
643
|
-
// then formalParamsEqual each parameter given twice, each name bound since the label scope began
|
|
644
|
-
// that the label leaves out, and the parameters it adds, and then a label of a name already used.
|
|
645
604
|
const checkLabel = (label: LabelExpression, scope: LocalName | undefined, unit: Unit) => {
|
|
646
605
|
const range = label.location.range;
|
|
647
606
|
if (!range || unit.isGenerated) return;
|
|
@@ -689,7 +648,6 @@ const checkLabel = (label: LabelExpression, scope: LocalName | undefined, unit:
|
|
|
689
648
|
unit.labels.add(label.name);
|
|
690
649
|
};
|
|
691
650
|
|
|
692
|
-
// Checks a name that selects part of a theorem or step, and tells whether it is one.
|
|
693
651
|
const checkReference = (
|
|
694
652
|
expression: Expression,
|
|
695
653
|
scope: LocalName | undefined,
|
|
@@ -707,9 +665,6 @@ const checkReference = (
|
|
|
707
665
|
return goal !== undefined;
|
|
708
666
|
};
|
|
709
667
|
|
|
710
|
-
// Generator.selectorToNode reports an unknown operator and goes on without analyzing its arguments,
|
|
711
|
-
// so its arity is undefined. It does the same for an operator given the wrong number of arguments,
|
|
712
|
-
// and for a name that selects nothing, after the arguments of the parts before.
|
|
713
668
|
const getSymbolArity = (
|
|
714
669
|
expression: Expression & { kind: "Identifier" | "Apply" | "OperatorReference" },
|
|
715
670
|
name: string,
|
|
@@ -741,8 +696,6 @@ const getSymbolArity = (
|
|
|
741
696
|
renamedArities.set(expression, symbol.arity);
|
|
742
697
|
return symbol.arity;
|
|
743
698
|
}
|
|
744
|
-
// A name such as Inv!P1 selects the label P1 of a definition or theorem, which takes its own
|
|
745
|
-
// arguments.
|
|
746
699
|
const prefix = name.includes("!") ? name.slice(0, name.indexOf("!")) : "";
|
|
747
700
|
const isSelected =
|
|
748
701
|
prefix !== "" &&
|
|
@@ -796,10 +749,6 @@ const markRecursiveConstructions = (expression: Expression, name: string): void
|
|
|
796
749
|
getChildren(expression).forEach((child) => markRecursiveConstructions(child, name));
|
|
797
750
|
};
|
|
798
751
|
|
|
799
|
-
// Generator.processOperator binds the parameters, reports a name already bound unless a RECURSIVE
|
|
800
|
-
// declaration of this level awaits the definition, analyzes the body, and then binds the name.
|
|
801
|
-
// processFunction binds the bound names before it looks up the name, and binds the name only where
|
|
802
|
-
// nothing else does. recursive holds the declarations of this level. Tells whether to bind the name.
|
|
803
752
|
const resolveDefinition = (
|
|
804
753
|
definition: Definition,
|
|
805
754
|
scope: LocalName | undefined,
|
|
@@ -858,8 +807,6 @@ const resolveDefinition = (
|
|
|
858
807
|
);
|
|
859
808
|
};
|
|
860
809
|
|
|
861
|
-
// SANY analyzes an INSTANCE in a LET where it appears, before the definitions that follow it, which
|
|
862
|
-
// tla-ts generates at its location and analyzes without reporting.
|
|
863
810
|
const resolveDefinitions = (
|
|
864
811
|
definitions: Definition[],
|
|
865
812
|
scope: LocalName | undefined,
|
|
@@ -918,7 +865,6 @@ const resolveDefinitions = (
|
|
|
918
865
|
return resolveInstances(resolved, () => true);
|
|
919
866
|
};
|
|
920
867
|
|
|
921
|
-
// The INSTANCE that a name such as K!C starts with, whose arguments SANY requires at its name.
|
|
922
868
|
const findInstance = (name: string, scope: LocalName | undefined, unit: Unit) => {
|
|
923
869
|
const prefix = name.split("!")[0];
|
|
924
870
|
const binding =
|
|
@@ -928,8 +874,6 @@ const findInstance = (name: string, scope: LocalName | undefined, unit: Unit) =>
|
|
|
928
874
|
return binding?.kind === "Instance" ? { name: prefix, arity: binding.arity } : undefined;
|
|
929
875
|
};
|
|
930
876
|
|
|
931
|
-
// Generator.selectorToNode reports an INSTANCE given the wrong number of arguments at its name,
|
|
932
|
-
// as in K!C or K(1, 2)!C, and goes on without analyzing them. Tells whether it reports one.
|
|
933
877
|
const isInstanceArityReported = (
|
|
934
878
|
expression: Expression,
|
|
935
879
|
scope: LocalName | undefined,
|
|
@@ -955,11 +899,7 @@ const isInstanceArityReported = (
|
|
|
955
899
|
return true;
|
|
956
900
|
};
|
|
957
901
|
|
|
958
|
-
//
|
|
959
|
-
// takes an operator in its place, which a name, a built-in operator, or a LAMBDA of the parameter's
|
|
960
|
-
// arity must give. OpDefNode#match then reports each argument that gives no such operator, or one
|
|
961
|
-
// whose own parameters take operators. tla-ts lets an operator whose parameters it does not know
|
|
962
|
-
// take any argument.
|
|
902
|
+
// Deviation from SANY: an operator whose parameters tla-ts does not know takes any argument.
|
|
963
903
|
const resolveApply = (
|
|
964
904
|
expression: Expression & { kind: "Apply" },
|
|
965
905
|
scope: LocalName | undefined,
|
|
@@ -990,8 +930,7 @@ const resolveApply = (
|
|
|
990
930
|
const expected = params[index] ?? 0;
|
|
991
931
|
const range = arg.location.range;
|
|
992
932
|
if (expected === 0) {
|
|
993
|
-
//
|
|
994
|
-
// a name.
|
|
933
|
+
// Deviation from SANY: SANY fails here with an internal error; tla-ts words it as for a name.
|
|
995
934
|
if (arg.kind === "Lambda" && arg.operator !== undefined) {
|
|
996
935
|
report(range, `The operator ${arg.operator} requires 1 arguments.`);
|
|
997
936
|
} else if (arg.kind === "Lambda" && range) {
|
|
@@ -1004,7 +943,6 @@ const resolveApply = (
|
|
|
1004
943
|
} else resolveExpression(arg, scope, unit);
|
|
1005
944
|
return true;
|
|
1006
945
|
}
|
|
1007
|
-
// A name that selects a subexpression gives an operator of the names it leaves unbound.
|
|
1008
946
|
if (arg.kind === "Lambda") {
|
|
1009
947
|
resolveExpression(arg, scope, unit);
|
|
1010
948
|
const isMatched = arg.params.length === expected;
|
|
@@ -1025,13 +963,11 @@ const resolveApply = (
|
|
|
1025
963
|
resolveExpression(arg, scope, unit);
|
|
1026
964
|
return true;
|
|
1027
965
|
}
|
|
1028
|
-
// Generator.selectorToNode: a name such as K(1)!C names an operator, but none of its parts
|
|
1029
|
-
// may take arguments.
|
|
1030
966
|
if (arg.kind === "Apply" && arg.argumentCounts?.at(-1) === 0) {
|
|
1031
|
-
const
|
|
967
|
+
const selectorIndex = arg.argumentCounts.findIndex((count) => count > 0);
|
|
1032
968
|
report(
|
|
1033
|
-
arg.selectorRanges?.[
|
|
1034
|
-
`Selector \`${arg.operator.split("!")[
|
|
969
|
+
arg.selectorRanges?.[selectorIndex],
|
|
970
|
+
`Selector \`${arg.operator.split("!")[selectorIndex]}' should not have argument(s).`,
|
|
1035
971
|
);
|
|
1036
972
|
return false;
|
|
1037
973
|
}
|
|
@@ -1063,13 +999,11 @@ const resolveApply = (
|
|
|
1063
999
|
});
|
|
1064
1000
|
};
|
|
1065
1001
|
|
|
1066
|
-
// An argument may name an operator that takes arguments of its own.
|
|
1067
1002
|
const resolveArgument = (arg: Expression, scope: LocalName | undefined, unit: Unit) => {
|
|
1068
1003
|
if (arg.kind === "Identifier") getSymbolArity(arg, arg.name, scope, unit);
|
|
1069
1004
|
else resolveExpression(arg, scope, unit);
|
|
1070
1005
|
};
|
|
1071
1006
|
|
|
1072
|
-
// Reports the error of a name that selects nothing, after the arguments SANY analyzes before it.
|
|
1073
1007
|
const isSelectionReported = (expression: Expression, scope: LocalName | undefined, unit: Unit) => {
|
|
1074
1008
|
const failed = selectionErrors.get(expression);
|
|
1075
1009
|
if (!failed) return false;
|
|
@@ -1245,9 +1179,6 @@ const resolveExpression = (
|
|
|
1245
1179
|
}
|
|
1246
1180
|
};
|
|
1247
1181
|
|
|
1248
|
-
// Generator.generateUseOrHide looks up a fact that is a name as it looks up a name in an expression,
|
|
1249
|
-
// except that the name may select an ASSUME/PROVE or a NEW clause or name a theorem or assumption,
|
|
1250
|
-
// and analyzes any other fact as an expression.
|
|
1251
1182
|
const checkFacts = (facts: Fact[], scope: LocalName | undefined, unit: Unit) =>
|
|
1252
1183
|
facts.forEach((fact) => {
|
|
1253
1184
|
if (
|
|
@@ -1277,8 +1208,6 @@ const resolveNewSymbol = (symbol: NewSymbol, scope: LocalName | undefined, unit:
|
|
|
1277
1208
|
);
|
|
1278
1209
|
};
|
|
1279
1210
|
|
|
1280
|
-
// The NEW symbols of an ASSUME stay in scope for its conclusion and the proof that follows. SANY
|
|
1281
|
-
// forbids a label in the scope of a NEW in a nested ASSUME.
|
|
1282
1211
|
const resolveAssumeProve = (
|
|
1283
1212
|
assumeProve: AssumeProve,
|
|
1284
1213
|
scope: LocalName | undefined,
|
|
@@ -1314,8 +1243,6 @@ const resolveStatement = (
|
|
|
1314
1243
|
return scope;
|
|
1315
1244
|
};
|
|
1316
1245
|
|
|
1317
|
-
// SANY resolves the expressions of a proof, while its facts and DEF clauses may also name
|
|
1318
|
-
// theorems, assumptions, and modules.
|
|
1319
1246
|
const resolveProof = (proof: Proof | undefined, scope: LocalName | undefined, outer: Unit) => {
|
|
1320
1247
|
const unit = outer.hasLabelScope ? { ...outer, hasLabelScope: false } : outer;
|
|
1321
1248
|
if (proof?.kind === "By") checkFacts(proof.facts, scope, unit);
|
|
@@ -1323,7 +1250,6 @@ const resolveProof = (proof: Proof | undefined, scope: LocalName | undefined, ou
|
|
|
1323
1250
|
proof.steps.reduce((current, step) => resolveStep(step, current, unit), scope);
|
|
1324
1251
|
};
|
|
1325
1252
|
|
|
1326
|
-
// A LET or a step binds the name of the INSTANCE after the names it adds.
|
|
1327
1253
|
const resolveLocalInstance = (instance: Instance, scope: LocalName | undefined, unit: Unit) => {
|
|
1328
1254
|
const instanced = resolveInstance(instance, scope, unit);
|
|
1329
1255
|
return instance.name === undefined
|
|
@@ -1336,8 +1262,6 @@ const resolveLocalInstance = (instance: Instance, scope: LocalName | undefined,
|
|
|
1336
1262
|
);
|
|
1337
1263
|
};
|
|
1338
1264
|
|
|
1339
|
-
// Generator.generateProof binds the name of a step after its statement and before its proof, or
|
|
1340
|
-
// after the step where it takes no proof.
|
|
1341
1265
|
const resolveStep = (
|
|
1342
1266
|
step: ProofStep,
|
|
1343
1267
|
scope: LocalName | undefined,
|
|
@@ -1355,8 +1279,6 @@ const resolveStep = (
|
|
|
1355
1279
|
? parent
|
|
1356
1280
|
: { name: step.name, arity: 0, kind: "Theorem", parent, isNonFact: true };
|
|
1357
1281
|
switch (body.kind) {
|
|
1358
|
-
// The NEW symbols of a SUFFICES ASSUME are in scope after its proof, and those of any other
|
|
1359
|
-
// ASSUME in its proof.
|
|
1360
1282
|
case "Assert": {
|
|
1361
1283
|
const assumed = resolveStatement(body.statement, scope, stepUnit);
|
|
1362
1284
|
const proofScope = body.isSuffices ? scope : assumed;
|
|
@@ -1423,7 +1345,6 @@ const resolveStep = (
|
|
|
1423
1345
|
}
|
|
1424
1346
|
};
|
|
1425
1347
|
|
|
1426
|
-
// SANY binds the name of a theorem after its statement and before its proof.
|
|
1427
1348
|
const resolveTheorem = (theorem: Theorem, unit: Unit) => {
|
|
1428
1349
|
const isDefinition = theorem.name !== undefined && theorem.statement.kind !== "AssumeProve";
|
|
1429
1350
|
const scope = isDefinition ? undefined : resolveStatement(theorem.statement, undefined, unit);
|
|
@@ -1440,16 +1361,12 @@ const resolveTheorem = (theorem: Theorem, unit: Unit) => {
|
|
|
1440
1361
|
if (goal) goal.isInProof = false;
|
|
1441
1362
|
};
|
|
1442
1363
|
|
|
1443
|
-
// The declarations of the module an INSTANCE instantiates, the names the INSTANCE adds, and the
|
|
1444
|
-
// module that instantiates it.
|
|
1445
1364
|
interface InstancedModule {
|
|
1446
1365
|
declarations: Declaration[];
|
|
1447
1366
|
symbols: Symbols;
|
|
1448
1367
|
instancer: string;
|
|
1449
1368
|
}
|
|
1450
1369
|
|
|
1451
|
-
// What SANY reports at a location as it links a module, such as a conflict between the modules it
|
|
1452
|
-
// extends.
|
|
1453
1370
|
export interface ModuleReport {
|
|
1454
1371
|
location: SourceLocation;
|
|
1455
1372
|
errors: SanyError[];
|
|
@@ -1459,13 +1376,10 @@ export interface ModuleReport {
|
|
|
1459
1376
|
export interface ModuleUnit {
|
|
1460
1377
|
imported: Symbols;
|
|
1461
1378
|
getInstance: (instance: Instance) => InstancedModule;
|
|
1462
|
-
// The built-in operators and the names of the enclosing and extended modules.
|
|
1463
1379
|
bound: Symbols;
|
|
1464
1380
|
definitions: Map<string, Definition>;
|
|
1465
1381
|
getKey: (definition: Definition) => string;
|
|
1466
|
-
// The names each INSTANCE adds.
|
|
1467
1382
|
instanced: Map<Instance, Symbols>;
|
|
1468
|
-
// The theorems and assumptions the extended and instantiated modules export.
|
|
1469
1383
|
facts: Set<string>;
|
|
1470
1384
|
reports: ModuleReport[];
|
|
1471
1385
|
warnings: SanyError[];
|
|
@@ -1473,7 +1387,6 @@ export interface ModuleUnit {
|
|
|
1473
1387
|
|
|
1474
1388
|
export const MODULE_START: SourceLocation = { line: 0, column: 0 };
|
|
1475
1389
|
|
|
1476
|
-
// A named theorem or assumption is linked as a definition too.
|
|
1477
1390
|
export const isTheoremDefinition = (module: Module, definition: Definition) =>
|
|
1478
1391
|
[...module.theorems, ...module.assumptions].some(
|
|
1479
1392
|
(item) =>
|
|
@@ -1493,9 +1406,6 @@ const createSymbols = (module: Module, imported: Symbols) => {
|
|
|
1493
1406
|
return symbols;
|
|
1494
1407
|
};
|
|
1495
1408
|
|
|
1496
|
-
// Generator.processSubst analyzes the explicit substitutions in the order they appear, then the
|
|
1497
|
-
// implicit ones, and then reports each declaration left without one. The parameters of the INSTANCE
|
|
1498
|
-
// are in scope.
|
|
1499
1409
|
const checkSubstitutions = (
|
|
1500
1410
|
instance: Instance,
|
|
1501
1411
|
declarations: Declaration[],
|
|
@@ -1568,8 +1478,6 @@ const checkSubstitutions = (
|
|
|
1568
1478
|
return substitutions;
|
|
1569
1479
|
};
|
|
1570
1480
|
|
|
1571
|
-
// Generator.processSubst analyzes an INSTANCE in a LET or a proof, which then binds the names the
|
|
1572
|
-
// INSTANCE adds.
|
|
1573
1481
|
const resolveInstance = (instance: Instance, scope: LocalName | undefined, unit: Unit) => {
|
|
1574
1482
|
const instanced = unit.getInstance(instance);
|
|
1575
1483
|
checkSubstitutions(instance, instanced.declarations, instanced.instancer, scope, unit);
|
|
@@ -1579,7 +1487,6 @@ const resolveInstance = (instance: Instance, scope: LocalName | undefined, unit:
|
|
|
1579
1487
|
);
|
|
1580
1488
|
};
|
|
1581
1489
|
|
|
1582
|
-
// tla-ts reports what SANY goes on after with an INSTANCE of the module.
|
|
1583
1490
|
export const resolveSubstitutions = (
|
|
1584
1491
|
instance: Instance,
|
|
1585
1492
|
declarations: Declaration[],
|
|
@@ -1612,17 +1519,12 @@ export const resolveSubstitutions = (
|
|
|
1612
1519
|
});
|
|
1613
1520
|
};
|
|
1614
1521
|
|
|
1615
|
-
|
|
1616
|
-
|
|
1617
|
-
|
|
1618
|
-
|
|
1619
|
-
|
|
1620
|
-
|
|
1621
|
-
location: SourceLocation;
|
|
1622
|
-
check: (reported: SanyError[], warned: SanyError[]) => void;
|
|
1623
|
-
}[],
|
|
1624
|
-
warnings: SanyError[],
|
|
1625
|
-
) => {
|
|
1522
|
+
interface SemanticUnit {
|
|
1523
|
+
location: SourceLocation;
|
|
1524
|
+
check: (reported: SanyError[], warned: SanyError[]) => void;
|
|
1525
|
+
}
|
|
1526
|
+
|
|
1527
|
+
export const collectSemanticErrors = (units: SemanticUnit[], warnings: SanyError[]) => {
|
|
1626
1528
|
const errors: SanyError[] = [];
|
|
1627
1529
|
const addUnique = (list: SanyError[], item: SanyError) => {
|
|
1628
1530
|
if (
|
|
@@ -1658,8 +1560,6 @@ export const collectSemanticErrors = (
|
|
|
1658
1560
|
return errors;
|
|
1659
1561
|
};
|
|
1660
1562
|
|
|
1661
|
-
// SANY binds the names of a module in the order of its units, and reports a RECURSIVE declaration
|
|
1662
|
-
// that no definition follows at the end. Returns the errors.
|
|
1663
1563
|
export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
1664
1564
|
const symbols = createSymbols(module, unit.imported);
|
|
1665
1565
|
const facts = new Set([
|
package/src/runtime.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getTlcFingerprint } from "./tlc/fingerprint";
|
|
2
2
|
import { createJavaRandom, type JavaRandom } from "./tlc/random";
|
|
3
3
|
import { createFunction, createRecord, type Value } from "./values";
|
|
4
|
+
import type { SpecAction } from "./spec-description";
|
|
4
5
|
import type { TlcVersion } from "./tlc/version";
|
|
5
6
|
|
|
6
7
|
export interface CheckerRuntime {
|
|
@@ -8,24 +9,23 @@ export interface CheckerRuntime {
|
|
|
8
9
|
getBehavior: (state: Value[]) => Value[][];
|
|
9
10
|
getSpecification: () => Value;
|
|
10
11
|
counterExample: Value | undefined;
|
|
12
|
+
deferred: ((next: Value[]) => void) | undefined;
|
|
11
13
|
setLivenessSource: (index: number | undefined) => void;
|
|
12
14
|
getCurrentState: () => Value[] | undefined;
|
|
13
15
|
getFingerprint: (state: Value[]) => bigint;
|
|
14
16
|
getRandom: () => JavaRandom;
|
|
17
|
+
getSimulationValue:
|
|
18
|
+
| ((key: string, state: (Value | undefined)[] | undefined) => Value | undefined)
|
|
19
|
+
| undefined;
|
|
15
20
|
evaluateAtStartup: <Result>(evaluate: () => Result) => Result;
|
|
16
|
-
pause: () => void;
|
|
17
|
-
// Prints a warning TLC raises while it evaluates, with its message code. TLC prints each
|
|
18
|
-
// distinct warning once.
|
|
21
|
+
pause: (() => void) | undefined;
|
|
19
22
|
warn: (code: number, text: string) => void;
|
|
20
|
-
// TLC's -nowarning turns the warnings off, and with them the shortcut that evaluates the rest
|
|
21
|
-
// of an action once it assigns every variable, since that shortcut skips a warning.
|
|
22
23
|
isWarningEnabled: boolean;
|
|
23
|
-
// TLC's -tool, under which the message of an error that TLC raises with a code holds the
|
|
24
|
-
// code's markers, which AssertError compares with.
|
|
25
24
|
isTool: boolean;
|
|
26
25
|
version: TlcVersion;
|
|
27
26
|
seed: bigint;
|
|
28
27
|
isSeen: (state: Value[]) => boolean;
|
|
28
|
+
getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
|
|
29
29
|
generatedStates: number;
|
|
30
30
|
distinctStates: number;
|
|
31
31
|
initialStates: number;
|
|
@@ -41,42 +41,42 @@ export interface CheckerRuntime {
|
|
|
41
41
|
startedAt: number;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
// TLC's RandomEnumerableValues keeps one java.util.Random per thread, seeded with -seed. The
|
|
45
|
-
// main thread evaluates constants, assumptions, and initial states with it. A worker reseeds
|
|
46
|
-
// its Random with the fingerprint of each state it expands, XORed with the seed, so a state's
|
|
47
|
-
// successors are the same whatever order the workers expand states in.
|
|
48
44
|
export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime => {
|
|
49
45
|
const startupRandom = createJavaRandom(seed);
|
|
50
|
-
const
|
|
51
|
-
|
|
46
|
+
const workerRandom = createJavaRandom(seed);
|
|
47
|
+
let seededState: Value[] | undefined;
|
|
48
|
+
let isStartup = false;
|
|
52
49
|
const runtime: CheckerRuntime = {
|
|
53
50
|
getLevel: () => 0,
|
|
54
51
|
getBehavior: () => [],
|
|
55
52
|
getSpecification: () => createRecord([]),
|
|
56
53
|
counterExample: undefined,
|
|
54
|
+
deferred: undefined,
|
|
57
55
|
isSeen: () => false,
|
|
56
|
+
getSuccessorAction: () => undefined,
|
|
58
57
|
setLivenessSource: () => {},
|
|
59
58
|
getCurrentState: () => undefined,
|
|
60
59
|
getFingerprint: getTlcFingerprint,
|
|
60
|
+
getSimulationValue: undefined,
|
|
61
61
|
getRandom: () => {
|
|
62
|
-
const state =
|
|
62
|
+
const state = isStartup ? undefined : runtime.getCurrentState();
|
|
63
63
|
if (state === undefined) return startupRandom;
|
|
64
|
-
if (state !==
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
if (state !== seededState) {
|
|
65
|
+
workerRandom.setSeed(runtime.getFingerprint(state) ^ BigInt.asUintN(64, seed));
|
|
66
|
+
seededState = state;
|
|
67
67
|
}
|
|
68
|
-
return
|
|
68
|
+
return workerRandom;
|
|
69
69
|
},
|
|
70
70
|
evaluateAtStartup: (evaluate) => {
|
|
71
|
-
const wasStartup =
|
|
72
|
-
|
|
71
|
+
const wasStartup = isStartup;
|
|
72
|
+
isStartup = true;
|
|
73
73
|
try {
|
|
74
74
|
return evaluate();
|
|
75
75
|
} finally {
|
|
76
|
-
|
|
76
|
+
isStartup = wasStartup;
|
|
77
77
|
}
|
|
78
78
|
},
|
|
79
|
-
pause:
|
|
79
|
+
pause: undefined,
|
|
80
80
|
warn: () => {},
|
|
81
81
|
isWarningEnabled: true,
|
|
82
82
|
isTool: false,
|
package/src/sany/builtins.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import type { FormalParamNode, LevelFields, OpDefNode, SanyLocation } from "./nodes";
|
|
2
2
|
|
|
3
|
-
// tla2sany.semantic.BuiltInOperators: name, arity, level, maximum argument levels and argument
|
|
4
|
-
// weights. SANY leaves the levels of "." and \neg unset.
|
|
5
3
|
const BUILTIN_OPERATORS: [string, number, number, number[] | undefined, number[] | undefined][] = [
|
|
6
4
|
["STRING", 0, 0, [], []],
|
|
7
5
|
["FALSE", 0, 0, [], []],
|
|
@@ -98,15 +96,14 @@ export const createLevelFields = (id: number): LevelFields => ({
|
|
|
98
96
|
argLevelConstraints: new Map(),
|
|
99
97
|
});
|
|
100
98
|
|
|
101
|
-
//
|
|
102
|
-
// for a builtin numbers the operator, then its phony parameters.
|
|
99
|
+
// SANY's order: OpDefNode's constructor numbers each builtin, then its phony parameters.
|
|
103
100
|
export const createBuiltins = (getId: () => number) =>
|
|
104
101
|
BUILTIN_OPERATORS.map(([name, arity, level, maxLevels, weights]): OpDefNode => {
|
|
105
102
|
const id = getId();
|
|
106
103
|
const params =
|
|
107
104
|
arity < 0
|
|
108
105
|
? undefined
|
|
109
|
-
: Array.from({ length: arity }, (
|
|
106
|
+
: Array.from({ length: arity }, (_value, index): FormalParamNode => ({
|
|
110
107
|
...createLevelFields(getId()),
|
|
111
108
|
kind: "FormalParam",
|
|
112
109
|
name: `Formal_${index}`,
|