tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32
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 +32 -6
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +27 -27
- package/dist/deciders.js +34 -34
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -14
- package/dist/index.d.ts +12 -14
- 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 +516 -25
- package/dist/prove.js +518 -27
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +76 -86
- package/dist/transfer.js +73 -83
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +112 -761
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +12 -36
- package/src/evaluate.ts +81 -101
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +2 -2
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- package/src/obligations/action.ts +58 -105
- package/src/obligations/{anon.ts → anonymize.ts} +44 -52
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +42 -530
- package/src/obligations/format.ts +7 -8
- package/src/obligations/generate.ts +93 -783
- package/src/obligations/index.ts +23 -23
- package/src/obligations/levels.ts +38 -44
- package/src/obligations/module.ts +106 -729
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +35 -29
- package/src/obligations/printer.ts +98 -209
- package/src/obligations/proof.ts +0 -1
- package/src/obligations/regroup.ts +100 -0
- package/src/obligations/simplify.ts +668 -0
- package/src/obligations/source.ts +92 -192
- package/src/obligations/{deref.ts → subexpression.ts} +82 -113
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +32 -30
- package/src/obligations/tuples.ts +37 -53
- package/src/parallel-worker.ts +37 -33
- package/src/parallel.ts +30 -24
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/{prove → prover}/decide-pool.ts +14 -19
- package/src/{prove → prover}/deciders.ts +7 -1
- package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
- package/src/{prove → prover}/isabelle/decide.ts +3 -6
- package/src/{prove → prover}/isabelle/encode.ts +106 -138
- package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
- package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
- package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
- package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
- package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
- package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
- package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
- package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
- package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
- package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
- package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
- package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
- package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
- package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
- package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
- package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
- package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
- package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
- package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
- package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
- package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
- package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
- package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
- package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
- package/src/{prove → prover}/ocaml.ts +1 -1
- package/src/{prove → prover}/prep/action.ts +54 -66
- package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
- package/src/{prove → prover}/prep/fingerprint.ts +3 -3
- package/src/{prove → prover}/prep/level-comparison.ts +15 -38
- package/src/{prove → prover}/prep/md5.ts +2 -9
- package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
- package/src/prover/prep/normalize.ts +309 -0
- package/src/{prove → prover}/prove-worker.ts +4 -11
- package/src/prover/prove.ts +492 -0
- package/src/{prove → prover}/ptl/encode.ts +19 -31
- package/src/{prove → prover}/smt/axioms.ts +78 -79
- package/src/{prove → prover}/smt/data.ts +16 -45
- package/src/{prove → prover}/smt/encode.ts +134 -28
- package/src/{prove → prover}/smt/extensionality.ts +14 -12
- package/src/{prove → prover}/smt/flatten.ts +3 -18
- package/src/{prove → prover}/smt/format.ts +14 -3
- package/src/{prove → prover}/smt/instances.ts +4 -5
- package/src/{prove → prover}/smt/rewrite.ts +41 -59
- package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
- package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
- package/src/{prove → prover}/smt/solver/enode.ts +1 -1
- package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
- package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
- package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
- package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
- package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
- package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
- package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
- package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
- package/src/{prove → prover}/smt/solver/solver.ts +2 -2
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
- package/src/prover/verdict.ts +13 -0
- package/src/{prove → prover}/zenon/decide.ts +5 -11
- package/src/{prove → prover}/zenon/encode.ts +40 -106
- package/src/{prove → prover}/zenon/eqrel.ts +1 -1
- package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
- package/src/{prove → prover}/zenon/expr.ts +2 -2
- package/src/{prove → prover}/zenon/index-table.ts +1 -1
- package/src/{prove → prover}/zenon/isar.ts +1 -1
- package/src/{prove → prover}/zenon/llproof.ts +1 -1
- package/src/{prove → prover}/zenon/mltoll.ts +1 -1
- package/src/{prove → prover}/zenon/node.ts +1 -1
- package/src/{prove → prover}/zenon/search.ts +1 -1
- package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
- package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +72 -67
- package/src/worker.ts +1 -4
- package/dist/run-cli.cjs +0 -38
- package/dist/run-cli.js +0 -38
- package/src/canonical.ts +0 -40
- package/src/obligations/ctx.ts +0 -64
- package/src/prove/prep/defs.ts +0 -27
- package/src/prove/prep/elab.ts +0 -156
- package/src/prove/prep/enabled.ts +0 -43
- package/src/prove/prep/flatten.ts +0 -70
- package/src/prove/prep/trivial.ts +0 -22
- package/src/prove/prove.ts +0 -417
- package/src/prove/smt/axiomatize.ts +0 -69
- package/src/prove/smt/simplify.ts +0 -57
- package/src/prove/verdict.ts +0 -13
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{prove → prover}/isabelle/LICENSE +0 -0
- /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
- /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
- /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
- /package/src/{prove → prover}/ptl/decide.ts +0 -0
- /package/src/{prove → prover}/ptl/sat.ts +0 -0
- /package/src/{prove → prover}/ptl/tableau.ts +0 -0
- /package/src/{prove → prover}/smt/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
- /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/array.ts +0 -0
- /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
- /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
- /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
- /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
- /package/src/{prove → prover}/smt/solver/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
- /package/src/{prove → prover}/smt/solver/der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
- /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
- /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
- /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
- /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
- /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
- /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
- /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
- /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
- /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
- /package/src/{prove → prover}/smt/table.ts +0 -0
- /package/src/{prove → prover}/tlaps-module.ts +0 -0
- /package/src/{prove → prover}/zenon/LICENSE +0 -0
- /package/src/{prove → prover}/zenon/check/check.ts +0 -0
- /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
- /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
- /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
- /package/src/{prove → prover}/zenon/check/records.ts +0 -0
- /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
- /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
- /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
- /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
- /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
- /package/src/{prove → prover}/zenon/limits.ts +0 -0
- /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
- /package/src/{prove → prover}/zenon/parse.ts +0 -0
- /package/src/{prove → prover}/zenon/phrase.ts +0 -0
- /package/src/{prove → prover}/zenon/proof.ts +0 -0
- /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
- /package/src/{prove → prover}/zenon/rules.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/liveness.ts
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { isLocallyResolved, type Bound, type Definition, type Expression } from "./ast";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
createStackOverflowError,
|
|
4
|
+
TlaEvaluationError,
|
|
5
|
+
TlaStackOverflowError,
|
|
6
|
+
UNEXPECTED_EVAL_EXCEPTION,
|
|
7
|
+
} from "./errors";
|
|
3
8
|
import {
|
|
4
9
|
describeNode,
|
|
5
10
|
describeRange,
|
|
@@ -21,10 +26,10 @@ import {
|
|
|
21
26
|
type Thunk,
|
|
22
27
|
} from "./evaluate";
|
|
23
28
|
import { mapChildren } from "./instances";
|
|
24
|
-
import { ACTION_LEVEL, TEMPORAL_LEVEL } from "./levels";
|
|
29
|
+
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
25
30
|
import { isEnabled } from "./successors";
|
|
26
31
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
27
|
-
import { isEvalException } from "./tlc
|
|
32
|
+
import { isEvalException } from "./tlc/messages";
|
|
28
33
|
import {
|
|
29
34
|
createBoolean,
|
|
30
35
|
createJunction,
|
|
@@ -59,9 +64,6 @@ export const createTautologyError = () =>
|
|
|
59
64
|
EXIT_STATUS.livenessEvaluationFailure,
|
|
60
65
|
);
|
|
61
66
|
|
|
62
|
-
// TLC expands a temporal formula that refers to itself until Java's stack overflows.
|
|
63
|
-
const createStackOverflowError = () => setExitCode(new TlaStackOverflowError(), EXIT_STATUS.error);
|
|
64
|
-
|
|
65
67
|
const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
66
68
|
|
|
67
69
|
const definitionLevels = new WeakMap<Definition, number>();
|
|
@@ -90,26 +92,31 @@ export const getLevel = (
|
|
|
90
92
|
const getBindingLevel = (name: string) => {
|
|
91
93
|
const binding = lookupScope(scope, name);
|
|
92
94
|
if (!binding) return undefined;
|
|
93
|
-
if (binding.kind === "Value") return
|
|
95
|
+
if (binding.kind === "Value") return CONSTANT_LEVEL;
|
|
94
96
|
if (binding.kind === "Thunk") return getLevel(binding.expression, binding.scope, environment);
|
|
95
97
|
const operator = binding.operator;
|
|
96
|
-
return operator.kind === "Closure"
|
|
98
|
+
return operator.kind === "Closure"
|
|
99
|
+
? getLevel(operator.body, operator.scope, environment)
|
|
100
|
+
: CONSTANT_LEVEL;
|
|
97
101
|
};
|
|
98
102
|
const getGlobalLevel = (name: string) => {
|
|
99
|
-
if (environment.variableIndex.has(name)) return
|
|
100
|
-
if (environment.constants.has(name)) return
|
|
103
|
+
if (environment.variableIndex.has(name)) return VARIABLE_LEVEL;
|
|
104
|
+
if (environment.constants.has(name)) return CONSTANT_LEVEL;
|
|
101
105
|
const definition = getDefinition(name, environment);
|
|
102
106
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
103
107
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
104
|
-
|
|
108
|
+
if (!builtin) return undefined;
|
|
109
|
+
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
105
110
|
};
|
|
106
111
|
const getNameLevel = (name: string, node: Expression) => {
|
|
107
|
-
if (shadowed.has(name)) return
|
|
108
|
-
if (isLocallyResolved(node))
|
|
109
|
-
|
|
112
|
+
if (shadowed.has(name)) return CONSTANT_LEVEL;
|
|
113
|
+
if (isLocallyResolved(node)) {
|
|
114
|
+
return getBindingLevel(name) ?? getGlobalLevel(name) ?? CONSTANT_LEVEL;
|
|
115
|
+
}
|
|
116
|
+
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
110
117
|
};
|
|
111
118
|
const getChildrenLevel = (node: Expression) => {
|
|
112
|
-
const level = { value:
|
|
119
|
+
const level = { value: CONSTANT_LEVEL };
|
|
113
120
|
mapChildren(node, (child, bound) => {
|
|
114
121
|
level.value = Math.max(
|
|
115
122
|
level.value,
|
|
@@ -131,7 +138,7 @@ export const getLevel = (
|
|
|
131
138
|
case "AngleAction":
|
|
132
139
|
return ACTION_LEVEL;
|
|
133
140
|
case "Enabled":
|
|
134
|
-
return
|
|
141
|
+
return VARIABLE_LEVEL;
|
|
135
142
|
case "Always":
|
|
136
143
|
case "Eventually":
|
|
137
144
|
case "WeakFairness":
|
|
@@ -173,9 +180,7 @@ const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
|
173
180
|
if (!(error instanceof TlaEvaluationError)) throw error;
|
|
174
181
|
if (!isEvalException(error)) return undefined;
|
|
175
182
|
throw setExitCode(
|
|
176
|
-
new TlaEvaluationError(
|
|
177
|
-
`${getUnexpectedException("tlc2.tool.EvalException")}${error.message}`,
|
|
178
|
-
),
|
|
183
|
+
new TlaEvaluationError(`${UNEXPECTED_EVAL_EXCEPTION}${error.message}`),
|
|
179
184
|
EXIT_STATUS.error,
|
|
180
185
|
);
|
|
181
186
|
}
|
|
@@ -229,7 +234,7 @@ export const expandTemporal = (
|
|
|
229
234
|
!binding &&
|
|
230
235
|
definition?.kind === "Operator" &&
|
|
231
236
|
definition.params.length === 0 &&
|
|
232
|
-
getDefinitionLevel(definition, environment) >
|
|
237
|
+
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
233
238
|
) {
|
|
234
239
|
if (expanding.has(definition)) {
|
|
235
240
|
throw createStackOverflowError();
|
|
@@ -273,7 +278,7 @@ export const expandTemporal = (
|
|
|
273
278
|
const isUnrolled =
|
|
274
279
|
isProperty &&
|
|
275
280
|
expression.kind === "Forall" &&
|
|
276
|
-
expression.bounds.every((bound) => getLevel(bound.set, scope, environment) ===
|
|
281
|
+
expression.bounds.every((bound) => getLevel(bound.set, scope, environment) === CONSTANT_LEVEL);
|
|
277
282
|
const sets = isUnrolled ? getUnrolledElements(expression.bounds, context) : undefined;
|
|
278
283
|
if (isUnrolled && sets) {
|
|
279
284
|
const expanded: ExpandedExpression[] = [];
|
|
@@ -299,13 +304,6 @@ const bindLetDefinitions = (
|
|
|
299
304
|
return bound;
|
|
300
305
|
};
|
|
301
306
|
|
|
302
|
-
const createAngleAction = (action: Expression, subscript: Expression): Expression => ({
|
|
303
|
-
kind: "AngleAction",
|
|
304
|
-
action,
|
|
305
|
-
subscript,
|
|
306
|
-
location: action.location,
|
|
307
|
-
});
|
|
308
|
-
|
|
309
307
|
export const toLiveExpression = (
|
|
310
308
|
root: Expression,
|
|
311
309
|
rootScope: Scope | undefined,
|
|
@@ -318,8 +316,9 @@ export const toLiveExpression = (
|
|
|
318
316
|
level: number,
|
|
319
317
|
): LiveExpression => {
|
|
320
318
|
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
321
|
-
const atomLevel =
|
|
322
|
-
|
|
319
|
+
const atomLevel =
|
|
320
|
+
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
321
|
+
if (atomLevel === CONSTANT_LEVEL) {
|
|
323
322
|
const value = evaluate(expression, getConstantContext(environment, scope));
|
|
324
323
|
if (typeof value !== "boolean") {
|
|
325
324
|
throw new TlaEvaluationError(
|
|
@@ -328,7 +327,7 @@ export const toLiveExpression = (
|
|
|
328
327
|
}
|
|
329
328
|
return createBoolean(value);
|
|
330
329
|
}
|
|
331
|
-
if (atomLevel ===
|
|
330
|
+
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
332
331
|
return { kind: "Action", expression, unchanged: undefined, scope };
|
|
333
332
|
};
|
|
334
333
|
|
|
@@ -419,7 +418,7 @@ export const toLiveExpression = (
|
|
|
419
418
|
) => {
|
|
420
419
|
const level = getLevel(expression, scope, environment);
|
|
421
420
|
const isConstant = expression.bounds.every(
|
|
422
|
-
(bound) => getLevel(bound.set, scope, environment) ===
|
|
421
|
+
(bound) => getLevel(bound.set, scope, environment) === CONSTANT_LEVEL,
|
|
423
422
|
);
|
|
424
423
|
if (!isConstant) {
|
|
425
424
|
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
@@ -519,7 +518,7 @@ export const toLiveExpression = (
|
|
|
519
518
|
return convertQuantifier(expression, scope);
|
|
520
519
|
case "If": {
|
|
521
520
|
// TLC 1.7.4 translates both branches whatever the guard.
|
|
522
|
-
if (!is174 && getLevel(expression.condition, scope, environment) ===
|
|
521
|
+
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
523
522
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
524
523
|
if (typeof condition === "boolean") {
|
|
525
524
|
return convert(condition ? expression.consequent : expression.alternative, scope);
|
|
@@ -545,7 +544,12 @@ export const toLiveExpression = (
|
|
|
545
544
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
546
545
|
case "WeakFairness":
|
|
547
546
|
case "StrongFairness": {
|
|
548
|
-
const step =
|
|
547
|
+
const step: Expression = {
|
|
548
|
+
kind: "AngleAction",
|
|
549
|
+
action: expression.action,
|
|
550
|
+
subscript: expression.subscript,
|
|
551
|
+
location: expression.action.location,
|
|
552
|
+
};
|
|
549
553
|
const enabled: LiveEnabled = { kind: "Enabled", step: expression.enabled ?? step, scope };
|
|
550
554
|
const disabled = createUnary("Not", enabled);
|
|
551
555
|
const taken: LiveExpression = {
|
|
@@ -1,37 +1,34 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Action.
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// replace each LAMBDA with an existential quantifier.
|
|
1
|
+
// A port of tlapm's Expr.Action. Lambdifying gives each ENABLED and \cdot a LAMBDA over the
|
|
2
|
+
// variables it binds, after expanding the definitions soundness needs expanded. The ExpandENABLED
|
|
3
|
+
// and ExpandCdot frontends then replace each LAMBDA with an existential quantifier.
|
|
5
4
|
|
|
6
5
|
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
7
|
-
import type { Anonymizer } from "./
|
|
6
|
+
import type { Anonymizer } from "./anonymize";
|
|
7
|
+
import { bumpBy, normalizeApply, shift, substituteExpr, type Substitution } from "./substitution";
|
|
8
8
|
import {
|
|
9
9
|
adjoin,
|
|
10
10
|
adjoinAll,
|
|
11
11
|
applyBuiltin,
|
|
12
12
|
at,
|
|
13
|
-
bumpBy,
|
|
14
13
|
getAtPrefix,
|
|
15
14
|
getErrorNote,
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
getLocationText,
|
|
16
|
+
getParamFresh,
|
|
18
17
|
getScopeAt,
|
|
18
|
+
isBuiltinApply,
|
|
19
19
|
mapScoped,
|
|
20
|
-
normalizeApply,
|
|
21
|
-
shift,
|
|
22
20
|
stripProps,
|
|
23
|
-
substituteExpr,
|
|
24
21
|
type Expr,
|
|
25
|
-
type
|
|
22
|
+
type Warn,
|
|
26
23
|
type Param,
|
|
27
24
|
type Scope,
|
|
28
|
-
type Substitution,
|
|
29
25
|
} from "./expression";
|
|
30
26
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
27
|
+
import { rewriteUnchanged } from "./temporal";
|
|
31
28
|
|
|
32
29
|
// Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
|
|
33
30
|
// soundness needs expanded, as the AutoUSE directive allows.
|
|
34
|
-
|
|
31
|
+
interface ActionOptions {
|
|
35
32
|
isEnabled: boolean;
|
|
36
33
|
isCdot: boolean;
|
|
37
34
|
isAutoUse: boolean;
|
|
@@ -42,8 +39,6 @@ interface FreshNames {
|
|
|
42
39
|
depth: number;
|
|
43
40
|
}
|
|
44
41
|
|
|
45
|
-
type Warn = (warning: ObligationWarning) => void;
|
|
46
|
-
|
|
47
42
|
const ENABLED_WRAPPER = "EnabledWrapper";
|
|
48
43
|
const CDOT_WRAPPER = "CdotWrapper";
|
|
49
44
|
|
|
@@ -53,11 +48,17 @@ const NESTED_ENABLED =
|
|
|
53
48
|
const NESTED_CDOT =
|
|
54
49
|
"Nested occurrence of the operator `\\cdot` found in scope of `ENABLED` when expanding `ENABLED`. Using the proof directive `ExpandCdot` from the module `TLAPS` is expected to avoid this error.";
|
|
55
50
|
|
|
56
|
-
//
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
51
|
+
// Unlike auto_expansion_of_defs, tlapm puts a space before "For example" here.
|
|
52
|
+
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
53
|
+
|
|
54
|
+
// Visit.map_visible_hyp with no state.
|
|
55
|
+
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
56
|
+
mapScoped(
|
|
57
|
+
undefined,
|
|
58
|
+
expression,
|
|
59
|
+
(_state, child) => map(child),
|
|
60
|
+
() => undefined,
|
|
61
|
+
);
|
|
61
62
|
|
|
62
63
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
63
64
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
@@ -81,11 +82,6 @@ const isLambdified = (expression: Expr) =>
|
|
|
81
82
|
expression.args[0].kind === "Lambda" &&
|
|
82
83
|
(isActionOperator(expression.operator) || isWrapper(expression.operator));
|
|
83
84
|
|
|
84
|
-
const isBuiltinApply = (expression: Expr, builtin: "ENABLED" | "Cdot") =>
|
|
85
|
-
expression.kind === "Apply" &&
|
|
86
|
-
expression.operator.kind === "Internal" &&
|
|
87
|
-
expression.operator.builtin === builtin;
|
|
88
|
-
|
|
89
85
|
const getInitialLevel = (level: number | undefined) =>
|
|
90
86
|
level === undefined ? 2 : Math.min(2, level);
|
|
91
87
|
|
|
@@ -116,12 +112,13 @@ const expandDefinitions = (
|
|
|
116
112
|
const [first, second] = expression.args;
|
|
117
113
|
if (builtin === "Cdot" && expression.args.length === 2) {
|
|
118
114
|
if (level !== undefined && !options.isCdot) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
115
|
+
onWarning(
|
|
116
|
+
getErrorNote(
|
|
117
|
+
expression.location,
|
|
118
|
+
`${NESTED_CDOT}For example, writing \`BY ExpandCdot\`.`,
|
|
119
|
+
),
|
|
124
120
|
);
|
|
121
|
+
throw new TlaProverError("Expr.Action");
|
|
125
122
|
}
|
|
126
123
|
return {
|
|
127
124
|
...expression,
|
|
@@ -132,7 +129,8 @@ const expandDefinitions = (
|
|
|
132
129
|
}
|
|
133
130
|
if (builtin === "ENABLED" && expression.args.length === 1) {
|
|
134
131
|
if (level !== undefined && !options.isEnabled) {
|
|
135
|
-
|
|
132
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
133
|
+
throw new TlaProverError("Expr.Action");
|
|
136
134
|
}
|
|
137
135
|
return {
|
|
138
136
|
...expression,
|
|
@@ -159,7 +157,7 @@ const expandDefinitions = (
|
|
|
159
157
|
const expressionLevel = getLevelInfo(scope, expression).level;
|
|
160
158
|
const hyp = getHyp(scope, head.index);
|
|
161
159
|
const getDeclaration = (name: string) =>
|
|
162
|
-
`The operator \`${name}\` is declared at:\n${
|
|
160
|
+
`The operator \`${name}\` is declared at:\n${getLocationText(hyp.location)}`;
|
|
163
161
|
if (hyp.kind === "Fresh" && hyp.level === "Unknown") {
|
|
164
162
|
onWarning(
|
|
165
163
|
getErrorNote(
|
|
@@ -197,13 +195,9 @@ const expandDefinitions = (
|
|
|
197
195
|
? ["the operator `ENABLED`", "`ExpandENABLED` proof directive"]
|
|
198
196
|
: ["the operator `\\cdot`", "`ExpandCdot` proof directive"];
|
|
199
197
|
const body = definition.body.kind === "Lambda" ? definition.body.body : definition.body;
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
onWarning,
|
|
204
|
-
expression,
|
|
205
|
-
`Hidden definition of operator \`${definition.name}\` needs expansion for soundly expanding ${names[0]} (using rigid quantification).\nThe expansion of ${names[0]} has been activated with the ${names[1]} from the module \`TLAPS\`.\nThe operator \`${definition.name}\` is defined at: \n\t${getAt(body)}\nand the operator \`${definition.name}\` occurs at: \n\t${getAt(expression)}\nUsing the proof directive \`AutoUSE\` from the module \`TLAPS\`, or \`BY DEF ${definition.name}\` is expected to avoid this error.\n`,
|
|
206
|
-
);
|
|
198
|
+
const message = `Hidden definition of operator \`${definition.name}\` needs expansion for soundly expanding ${names[0]} (using rigid quantification).\nThe expansion of ${names[0]} has been activated with the ${names[1]} from the module \`TLAPS\`.\nThe operator \`${definition.name}\` is defined at: \n\t${getLocationText(body.location)}\nand the operator \`${definition.name}\` occurs at: \n\t${getLocationText(expression.location)}\nUsing the proof directive \`AutoUSE\` from the module \`TLAPS\`, or \`BY DEF ${definition.name}\` is expected to avoid this error.\n`;
|
|
199
|
+
onWarning(getErrorNote(expression.location, message));
|
|
200
|
+
throw new TlaProverError(message);
|
|
207
201
|
}
|
|
208
202
|
onWarning({
|
|
209
203
|
text: `${getAtPrefix(expression.location)}[INFO]: Auto-expanding the definition of operator: ${definition.name}\n`,
|
|
@@ -215,19 +209,6 @@ const expandDefinitions = (
|
|
|
215
209
|
);
|
|
216
210
|
};
|
|
217
211
|
|
|
218
|
-
const getEquality = (expression: Expr): Expr =>
|
|
219
|
-
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
220
|
-
|
|
221
|
-
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
222
|
-
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
223
|
-
const flatten = (inner: Expr): Expr[] =>
|
|
224
|
-
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
225
|
-
const items = flatten(expression);
|
|
226
|
-
if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
|
|
227
|
-
if (items.length === 1) return getEquality(items[0]);
|
|
228
|
-
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
229
|
-
};
|
|
230
|
-
|
|
231
212
|
// expand_propositional_action_operators: UNCHANGED v, [A]_v and <<A>>_v in terms of primes.
|
|
232
213
|
const expandPropositional = (expression: Expr): Expr => {
|
|
233
214
|
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
@@ -330,15 +311,13 @@ const bindVariables = (
|
|
|
330
311
|
) {
|
|
331
312
|
return lambdifyOperator(expression.operator, expression.args);
|
|
332
313
|
}
|
|
333
|
-
if (builtin === "ENABLED" && isInScope)
|
|
334
|
-
|
|
314
|
+
if (builtin === "ENABLED" && isInScope) {
|
|
315
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
316
|
+
throw new TlaProverError("Expr.Action");
|
|
317
|
+
}
|
|
335
318
|
if (builtin === "Cdot" && isInScope) {
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
expression,
|
|
339
|
-
`${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`,
|
|
340
|
-
"Expr.Action",
|
|
341
|
-
);
|
|
319
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
320
|
+
throw new TlaProverError("Expr.Action");
|
|
342
321
|
}
|
|
343
322
|
if (builtin === "Prime" && expression.args.length === 1) {
|
|
344
323
|
const arg = bindVariables(options, onWarning, primed, undefined, scope, expression.args[0]);
|
|
@@ -408,8 +387,7 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
|
408
387
|
return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
|
|
409
388
|
};
|
|
410
389
|
|
|
411
|
-
// normalize_lambda_param_names
|
|
412
|
-
// operator becomes EnabledWrapper or CdotWrapper.
|
|
390
|
+
// normalize_lambda_param_names.
|
|
413
391
|
const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
414
392
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
415
393
|
const [lambda] = expression.args;
|
|
@@ -432,32 +410,22 @@ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
|
432
410
|
],
|
|
433
411
|
};
|
|
434
412
|
}
|
|
435
|
-
return
|
|
436
|
-
undefined,
|
|
437
|
-
expression,
|
|
438
|
-
(_state, child) => renameParams(isKeepingNames, child),
|
|
439
|
-
() => undefined,
|
|
440
|
-
);
|
|
413
|
+
return mapVisibleChildren(expression, (child) => renameParams(isKeepingNames, child));
|
|
441
414
|
};
|
|
442
415
|
|
|
443
|
-
// check_arity
|
|
416
|
+
// check_arity.
|
|
444
417
|
const checkArity = (expression: Expr): Expr => {
|
|
445
|
-
|
|
446
|
-
expression
|
|
447
|
-
expression.operator.kind === "Internal" &&
|
|
448
|
-
expression.operator.builtin === "Cdot" &&
|
|
418
|
+
if (
|
|
419
|
+
isBuiltinApply(expression, "Cdot") &&
|
|
449
420
|
expression.args.length === 1 &&
|
|
450
|
-
expression.args[0].kind !== "Lambda"
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
(_state, child) => checkArity(child),
|
|
456
|
-
() => undefined,
|
|
457
|
-
);
|
|
421
|
+
expression.args[0].kind !== "Lambda"
|
|
422
|
+
) {
|
|
423
|
+
throw new TlapmBugError();
|
|
424
|
+
}
|
|
425
|
+
return mapVisibleChildren(expression, checkArity);
|
|
458
426
|
};
|
|
459
427
|
|
|
460
|
-
// lambdify_action_operators#expand
|
|
428
|
+
// lambdify_action_operators#expand.
|
|
461
429
|
const lambdifyOperators = (
|
|
462
430
|
anonymizer: Anonymizer,
|
|
463
431
|
onWarning: Warn,
|
|
@@ -503,10 +471,7 @@ const replaceWithQuantifiers = (
|
|
|
503
471
|
body: replaceWithQuantifiers(
|
|
504
472
|
options,
|
|
505
473
|
onWarning,
|
|
506
|
-
adjoinAll(
|
|
507
|
-
scope,
|
|
508
|
-
params.map((param) => getFresh(param.name, "Unknown", param.shape)),
|
|
509
|
-
),
|
|
474
|
+
adjoinAll(scope, params.map(getParamFresh)),
|
|
510
475
|
body,
|
|
511
476
|
true,
|
|
512
477
|
),
|
|
@@ -541,15 +506,12 @@ const replaceWithQuantifiers = (
|
|
|
541
506
|
}
|
|
542
507
|
}
|
|
543
508
|
if (isBuiltinApply(expression, "ENABLED") && isInScope) {
|
|
544
|
-
|
|
509
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
510
|
+
throw new TlaProverError("Expr.Action");
|
|
545
511
|
}
|
|
546
512
|
if (isBuiltinApply(expression, "Cdot") && isInScope) {
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
expression,
|
|
550
|
-
`${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`,
|
|
551
|
-
"Expr.Action",
|
|
552
|
-
);
|
|
513
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
514
|
+
throw new TlaProverError("Expr.Action");
|
|
553
515
|
}
|
|
554
516
|
return mapScoped(
|
|
555
517
|
scope,
|
|
@@ -569,11 +531,7 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
569
531
|
items: body.items.map((item) => ({ ...expression, body: item })),
|
|
570
532
|
});
|
|
571
533
|
}
|
|
572
|
-
if (
|
|
573
|
-
body.kind === "Apply" &&
|
|
574
|
-
body.operator.kind === "Internal" &&
|
|
575
|
-
body.operator.builtin === "Disj"
|
|
576
|
-
) {
|
|
534
|
+
if (isBuiltinApply(body, "Disj")) {
|
|
577
535
|
if (body.args.length !== 2) throw new TlapmBugError();
|
|
578
536
|
return commuteExistsDisjunction({
|
|
579
537
|
...body,
|
|
@@ -581,12 +539,7 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
581
539
|
});
|
|
582
540
|
}
|
|
583
541
|
}
|
|
584
|
-
return
|
|
585
|
-
undefined,
|
|
586
|
-
expression,
|
|
587
|
-
(_state, child) => commuteExistsDisjunction(child),
|
|
588
|
-
() => undefined,
|
|
589
|
-
);
|
|
542
|
+
return mapVisibleChildren(expression, commuteExistsDisjunction);
|
|
590
543
|
};
|
|
591
544
|
|
|
592
545
|
// expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
|