tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- 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 +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +8 -13
- package/src/prover/deciders.ts +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- 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 +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- 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 +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- 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 +27 -47
- 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 +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- 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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- 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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- 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 +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- 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 +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- 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 +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- 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 +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
package/src/levels.ts
CHANGED
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
TlaSyntaxError,
|
|
17
17
|
type SanyError,
|
|
18
18
|
} from "./errors";
|
|
19
|
-
import {
|
|
19
|
+
import { forEachChild } from "./instances";
|
|
20
20
|
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
21
21
|
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
22
|
|
|
@@ -55,13 +55,11 @@ type Resolved =
|
|
|
55
55
|
| { kind: "Declared"; name: string; level: number; arity: number }
|
|
56
56
|
| { kind: "Defined"; levels: OperatorLevels };
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
data: LevelData
|
|
60
|
-
|
|
61
|
-
declared
|
|
62
|
-
}
|
|
58
|
+
type Operand =
|
|
59
|
+
| { kind: "Value"; data: LevelData }
|
|
60
|
+
| { kind: "Operator"; data: OperatorLevels }
|
|
61
|
+
| { kind: "Declared"; data: LevelData; declared: OperatorParam };
|
|
63
62
|
|
|
64
|
-
// The levels of tla2sany.semantic.LevelConstants.
|
|
65
63
|
export const CONSTANT_LEVEL = 0;
|
|
66
64
|
export const VARIABLE_LEVEL = 1;
|
|
67
65
|
export const ACTION_LEVEL = 2;
|
|
@@ -97,6 +95,12 @@ export const putConstraint = (constraints: Map<string, number>, name: string, le
|
|
|
97
95
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
98
96
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
99
97
|
|
|
98
|
+
const mergeConstraints = (data: LevelData, part: LevelData) => {
|
|
99
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
100
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
101
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
102
|
+
};
|
|
103
|
+
|
|
100
104
|
const createSignature = (
|
|
101
105
|
name: string,
|
|
102
106
|
level: number,
|
|
@@ -185,7 +189,6 @@ const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
|
185
189
|
|
|
186
190
|
const toFormals = (names: string[]) => names.map((name) => ({ name, arity: 0 }));
|
|
187
191
|
|
|
188
|
-
// SANY reports a level error at the range of the expression it rejects.
|
|
189
192
|
const createLevelError = (message: string, expression: Expression) =>
|
|
190
193
|
expression.location.range
|
|
191
194
|
? createSemanticError(`${message}.`, expression.location.range)
|
|
@@ -195,8 +198,6 @@ const createLevelError = (message: string, expression: Expression) =>
|
|
|
195
198
|
|
|
196
199
|
const LOGICAL_OPERATORS = new Set(["/\\", "\\/", "=>", "<=>"]);
|
|
197
200
|
|
|
198
|
-
// SANY's OpApplNode.levelCheck rejects raw actions inside temporal formulas, but not inside a LET
|
|
199
|
-
// or a label.
|
|
200
201
|
const isOperatorApplication = (expression: Expression) =>
|
|
201
202
|
expression.kind !== "Let" && expression.kind !== "Label";
|
|
202
203
|
|
|
@@ -216,7 +217,6 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
216
217
|
const definition = context.getDefinition(name);
|
|
217
218
|
if (definition) {
|
|
218
219
|
const levels = analyzeDefinition(definition, new Map());
|
|
219
|
-
// SANY names a definition of an instance by its qualified name, as in I!Foo.
|
|
220
220
|
const qualifiedName = context.getQualifiedName?.(name);
|
|
221
221
|
return {
|
|
222
222
|
kind: "Defined",
|
|
@@ -236,12 +236,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
236
236
|
data.params.add(param);
|
|
237
237
|
data.argParams.add(getArgumentParamKey(name, index, param));
|
|
238
238
|
});
|
|
239
|
-
operand.data.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
240
239
|
putArgConstraint(data.argConstraints, getArgumentKey(name, index), operand.data.level);
|
|
241
|
-
operand.data
|
|
242
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
243
|
-
);
|
|
244
|
-
operand.data.argParams.forEach((key) => data.argParams.add(key));
|
|
240
|
+
mergeConstraints(data, operand.data);
|
|
245
241
|
});
|
|
246
242
|
return data;
|
|
247
243
|
};
|
|
@@ -254,7 +250,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
254
250
|
) => {
|
|
255
251
|
const isBound = (name: string) => bound.includes(name);
|
|
256
252
|
operands.forEach((operand, index) => {
|
|
257
|
-
if (operand.
|
|
253
|
+
if (operand.kind !== "Value") return;
|
|
258
254
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
259
255
|
throw new TlaSyntaxError(
|
|
260
256
|
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
@@ -276,7 +272,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
276
272
|
Math.max(
|
|
277
273
|
operator.level,
|
|
278
274
|
...operands
|
|
279
|
-
.filter((
|
|
275
|
+
.filter((_operand, index) => getWeight(operator, index) === 1)
|
|
280
276
|
.map((operand) => operand.data.level),
|
|
281
277
|
...ranges.map((range) => range.level),
|
|
282
278
|
),
|
|
@@ -305,10 +301,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
305
301
|
}),
|
|
306
302
|
);
|
|
307
303
|
operands.forEach((operand, operandIndex) => {
|
|
308
|
-
|
|
309
|
-
|
|
304
|
+
if (operand.kind !== "Operator") return;
|
|
305
|
+
const argument = operand.data;
|
|
310
306
|
operands.forEach((other, otherIndex) =>
|
|
311
|
-
argument.formals.forEach((
|
|
307
|
+
argument.formals.forEach((_formal, argumentIndex) => {
|
|
312
308
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
313
309
|
other.data.params.forEach((param) =>
|
|
314
310
|
putConstraint(data.constraints, param, getMaxLevel(argument, argumentIndex)),
|
|
@@ -318,9 +314,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
318
314
|
});
|
|
319
315
|
operator.argParams.forEach((key) => {
|
|
320
316
|
const parameter = parseArgumentParamKey(key);
|
|
321
|
-
const argument = getOperand(parameter.operator)
|
|
322
|
-
if (argument) {
|
|
323
|
-
putConstraint(
|
|
317
|
+
const argument = getOperand(parameter.operator);
|
|
318
|
+
if (argument?.kind === "Operator") {
|
|
319
|
+
putConstraint(
|
|
320
|
+
data.constraints,
|
|
321
|
+
parameter.param,
|
|
322
|
+
getMaxLevel(argument.data, parameter.index),
|
|
323
|
+
);
|
|
324
324
|
}
|
|
325
325
|
});
|
|
326
326
|
|
|
@@ -333,9 +333,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
333
333
|
constraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value)),
|
|
334
334
|
);
|
|
335
335
|
operands.forEach((operand, operandIndex) => {
|
|
336
|
+
if (operand.kind !== "Declared") return;
|
|
336
337
|
const declared = operand.declared;
|
|
337
|
-
|
|
338
|
-
Array.from({ length: declared.arity }, (_, argumentIndex) =>
|
|
338
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) =>
|
|
339
339
|
putArgConstraint(
|
|
340
340
|
data.argConstraints,
|
|
341
341
|
getArgumentKey(declared.name, argumentIndex),
|
|
@@ -343,7 +343,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
343
343
|
),
|
|
344
344
|
);
|
|
345
345
|
operands.forEach((other, otherIndex) =>
|
|
346
|
-
Array.from({ length: declared.arity }, (
|
|
346
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
347
347
|
if (hasCondition(operandIndex, otherIndex, argumentIndex)) {
|
|
348
348
|
putArgConstraint(
|
|
349
349
|
data.argConstraints,
|
|
@@ -386,17 +386,17 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
386
386
|
);
|
|
387
387
|
return;
|
|
388
388
|
}
|
|
389
|
-
if (argument.
|
|
389
|
+
if (argument.kind === "Declared") {
|
|
390
390
|
data.argParams.add(
|
|
391
391
|
getArgumentParamKey(argument.declared.name, parameter.index, parameter.param),
|
|
392
392
|
);
|
|
393
393
|
}
|
|
394
394
|
});
|
|
395
395
|
operands.forEach((operand, operandIndex) => {
|
|
396
|
+
if (operand.kind !== "Declared") return;
|
|
396
397
|
const declared = operand.declared;
|
|
397
|
-
if (!declared) return;
|
|
398
398
|
operands.forEach((other, otherIndex) =>
|
|
399
|
-
Array.from({ length: declared.arity }, (
|
|
399
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
400
400
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
401
401
|
other.data.params.forEach((param) =>
|
|
402
402
|
data.argParams.add(getArgumentParamKey(declared.name, argumentIndex, param)),
|
|
@@ -415,7 +415,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
415
415
|
expression.body,
|
|
416
416
|
scope,
|
|
417
417
|
);
|
|
418
|
-
return {
|
|
418
|
+
return { kind: "Operator", data: operator };
|
|
419
419
|
}
|
|
420
420
|
const name =
|
|
421
421
|
expression.kind === "OperatorReference"
|
|
@@ -429,15 +429,16 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
429
429
|
resolved.kind === "Defined" &&
|
|
430
430
|
(resolved.levels.formals.length > 0 || expression.kind === "OperatorReference")
|
|
431
431
|
) {
|
|
432
|
-
return {
|
|
432
|
+
return { kind: "Operator", data: resolved.levels };
|
|
433
433
|
}
|
|
434
434
|
if (resolved.kind === "Declared" && resolved.arity > 0) {
|
|
435
435
|
const data = createData();
|
|
436
436
|
data.params.add(name);
|
|
437
|
-
return { data, declared: { name, arity: resolved.arity } };
|
|
437
|
+
return { kind: "Declared", data, declared: { name, arity: resolved.arity } };
|
|
438
438
|
}
|
|
439
|
+
if (expression.kind === "OperatorReference") return { kind: "Value", data: createData() };
|
|
439
440
|
}
|
|
440
|
-
return { data: analyze(expression, scope) };
|
|
441
|
+
return { kind: "Value", data: analyze(expression, scope) };
|
|
441
442
|
};
|
|
442
443
|
|
|
443
444
|
const toOperands = (expressions: Expression[], scope: Scope) =>
|
|
@@ -513,18 +514,12 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
513
514
|
argConstraints: new Map(body.argConstraints),
|
|
514
515
|
argParams: new Set(body.argParams),
|
|
515
516
|
};
|
|
516
|
-
expression.definitions.forEach((definition) =>
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
levels.argConstraints.forEach((value, key) =>
|
|
520
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
521
|
-
);
|
|
522
|
-
levels.argParams.forEach((key) => data.argParams.add(key));
|
|
523
|
-
});
|
|
517
|
+
expression.definitions.forEach((definition) =>
|
|
518
|
+
mergeConstraints(data, analyzeDefinition(definition, inner)),
|
|
519
|
+
);
|
|
524
520
|
return data;
|
|
525
521
|
};
|
|
526
522
|
|
|
527
|
-
// SANY reports a level error of an operator's arguments at the application.
|
|
528
523
|
const analyze = (expression: Expression, scope: Scope): LevelData => {
|
|
529
524
|
try {
|
|
530
525
|
return analyzeNode(expression, scope);
|
|
@@ -688,15 +683,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
688
683
|
toOperand(expression.function, scope),
|
|
689
684
|
expression.args.length === 1
|
|
690
685
|
? toOperand(expression.args[0], scope)
|
|
691
|
-
: { data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
686
|
+
: { kind: "Value", data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
692
687
|
]);
|
|
693
|
-
// SANY's semantic checker rejects the expression without computing its level.
|
|
694
688
|
case "Bracket":
|
|
695
689
|
return createData();
|
|
696
690
|
case "FieldAccess":
|
|
697
691
|
return applyDefined(SELECT_LEVELS, [
|
|
698
692
|
toOperand(expression.record, scope),
|
|
699
|
-
{ data: createData() },
|
|
693
|
+
{ kind: "Value", data: createData() },
|
|
700
694
|
]);
|
|
701
695
|
case "BoxAction":
|
|
702
696
|
case "AngleAction":
|
|
@@ -737,7 +731,6 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
737
731
|
case "Apply":
|
|
738
732
|
visitOperator(expression.operator, expression.args);
|
|
739
733
|
return names;
|
|
740
|
-
// SANY's LetInNode and OpArgNode don't carry the non-Leibniz parameters of their bodies.
|
|
741
734
|
case "Lambda":
|
|
742
735
|
case "Let":
|
|
743
736
|
return names;
|
|
@@ -760,10 +753,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
760
753
|
);
|
|
761
754
|
return names;
|
|
762
755
|
default:
|
|
763
|
-
|
|
764
|
-
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound)))
|
|
765
|
-
|
|
766
|
-
});
|
|
756
|
+
forEachChild(expression, (child, bound) =>
|
|
757
|
+
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound))),
|
|
758
|
+
);
|
|
767
759
|
return names;
|
|
768
760
|
}
|
|
769
761
|
};
|
|
@@ -792,13 +784,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
792
784
|
minMaxLevels: formals.map((formal) =>
|
|
793
785
|
Array.from(
|
|
794
786
|
{ length: formal.arity },
|
|
795
|
-
(
|
|
787
|
+
(_value, index) => data.argConstraints.get(getArgumentKey(formal.name, index)) ?? 0,
|
|
796
788
|
),
|
|
797
789
|
),
|
|
798
790
|
conditions: new Set(
|
|
799
791
|
formals.flatMap((operator, operatorIndex) =>
|
|
800
792
|
formals.flatMap((param, paramIndex) =>
|
|
801
|
-
Array.from({ length: operator.arity }, (
|
|
793
|
+
Array.from({ length: operator.arity }, (_value, argumentIndex) => argumentIndex)
|
|
802
794
|
.filter((argumentIndex) =>
|
|
803
795
|
data.argParams.has(getArgumentParamKey(operator.name, argumentIndex, param.name)),
|
|
804
796
|
)
|
|
@@ -876,9 +868,7 @@ export const analyzeAssumeProve = (
|
|
|
876
868
|
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
877
869
|
parts.forEach((part) => {
|
|
878
870
|
part.params.forEach((param) => data.params.add(param));
|
|
879
|
-
|
|
880
|
-
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
881
|
-
part.argParams.forEach((key) => data.argParams.add(key));
|
|
871
|
+
mergeConstraints(data, part);
|
|
882
872
|
});
|
|
883
873
|
return data;
|
|
884
874
|
};
|
|
@@ -905,7 +895,6 @@ export const checkModuleLevels = (
|
|
|
905
895
|
? analyzeAssumeProve(body.statement, new Map(), analyzer).level
|
|
906
896
|
: getLevel([body.statement]);
|
|
907
897
|
};
|
|
908
|
-
// SANY's TheoremNode.LevelCheckTemporal: the proof of a temporal goal may only assume constants.
|
|
909
898
|
const checkTemporalGoal = (proof: Proof | undefined): SanyError[] =>
|
|
910
899
|
proof?.kind !== "Steps"
|
|
911
900
|
? []
|
|
@@ -931,7 +920,6 @@ export const checkModuleLevels = (
|
|
|
931
920
|
}
|
|
932
921
|
return step.body.kind === "Qed" ? checkTemporalGoal(step.proof) : [];
|
|
933
922
|
});
|
|
934
|
-
// SANY checks each step as a theorem of its own after the steps of its proof.
|
|
935
923
|
const checkProof = (proof: Proof | undefined): SanyError[] =>
|
|
936
924
|
proof?.kind !== "Steps"
|
|
937
925
|
? []
|