tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +194 -8
- package/dist/index.d.ts +194 -8
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +174 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
|
@@ -1,35 +1,65 @@
|
|
|
1
|
-
// tlapm's Expr.Action.
|
|
2
|
-
//
|
|
3
|
-
//
|
|
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.
|
|
4
4
|
|
|
5
|
-
import { TlaProofError, TlapmBugError } from "
|
|
6
|
-
import type { Anonymizer } from "./
|
|
5
|
+
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
6
|
+
import type { Anonymizer } from "./anonymize";
|
|
7
|
+
import { bumpBy, normalizeApply, shift, substituteExpr, type Substitution } from "./substitution";
|
|
7
8
|
import {
|
|
8
9
|
adjoin,
|
|
10
|
+
adjoinAll,
|
|
9
11
|
applyBuiltin,
|
|
10
12
|
at,
|
|
11
|
-
bumpBy,
|
|
12
13
|
getAtPrefix,
|
|
13
14
|
getErrorNote,
|
|
14
|
-
|
|
15
|
+
getLocationText,
|
|
16
|
+
getParamFresh,
|
|
15
17
|
getScopeAt,
|
|
18
|
+
isBuiltinApply,
|
|
16
19
|
mapScoped,
|
|
17
|
-
normalizeApply,
|
|
18
|
-
shift,
|
|
19
20
|
stripProps,
|
|
20
|
-
substituteExpr,
|
|
21
21
|
type Expr,
|
|
22
|
-
type
|
|
22
|
+
type Warn,
|
|
23
|
+
type Param,
|
|
23
24
|
type Scope,
|
|
24
|
-
|
|
25
|
-
} from "./
|
|
26
|
-
import {
|
|
25
|
+
} from "./expression";
|
|
26
|
+
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
27
|
+
import { rewriteUnchanged } from "./temporal";
|
|
28
|
+
|
|
29
|
+
// Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
|
|
30
|
+
// soundness needs expanded, as the AutoUSE directive allows.
|
|
31
|
+
interface ActionOptions {
|
|
32
|
+
isEnabled: boolean;
|
|
33
|
+
isCdot: boolean;
|
|
34
|
+
isAutoUse: boolean;
|
|
35
|
+
}
|
|
27
36
|
|
|
28
37
|
interface FreshNames {
|
|
29
38
|
names: string[];
|
|
30
39
|
depth: number;
|
|
31
40
|
}
|
|
32
41
|
|
|
42
|
+
const ENABLED_WRAPPER = "EnabledWrapper";
|
|
43
|
+
const CDOT_WRAPPER = "CdotWrapper";
|
|
44
|
+
|
|
45
|
+
const NESTED_ENABLED =
|
|
46
|
+
"Nested occurrence of the operator `ENABLED` found in scope of `\\cdot` when expanding `\\cdot`. Using the proof directive `ExpandENABLED` from the module `TLAPS` is expected to avoid this error.For example, writing `BY ExpandENABLED`.";
|
|
47
|
+
|
|
48
|
+
const NESTED_CDOT =
|
|
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.";
|
|
50
|
+
|
|
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
|
+
);
|
|
62
|
+
|
|
33
63
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
34
64
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
35
65
|
if (!hyp) throw new TlapmBugError();
|
|
@@ -42,14 +72,15 @@ const isActionOperator = (
|
|
|
42
72
|
expression.kind === "Internal" &&
|
|
43
73
|
(expression.builtin === "ENABLED" || expression.builtin === "Cdot");
|
|
44
74
|
|
|
75
|
+
const isWrapper = (expression: Expr) =>
|
|
76
|
+
expression.kind === "Opaque" &&
|
|
77
|
+
(expression.name === ENABLED_WRAPPER || expression.name === CDOT_WRAPPER);
|
|
78
|
+
|
|
45
79
|
const isLambdified = (expression: Expr) =>
|
|
46
80
|
expression.kind === "Apply" &&
|
|
47
81
|
expression.args.length === 1 &&
|
|
48
82
|
expression.args[0].kind === "Lambda" &&
|
|
49
|
-
(isActionOperator(expression.operator) ||
|
|
50
|
-
(expression.operator.kind === "Opaque" &&
|
|
51
|
-
(expression.operator.name === "EnabledWrapper" ||
|
|
52
|
-
expression.operator.name === "CdotWrapper")));
|
|
83
|
+
(isActionOperator(expression.operator) || isWrapper(expression.operator));
|
|
53
84
|
|
|
54
85
|
const getInitialLevel = (level: number | undefined) =>
|
|
55
86
|
level === undefined ? 2 : Math.min(2, level);
|
|
@@ -60,13 +91,14 @@ const getDecrementedLevel = (level: number | undefined) =>
|
|
|
60
91
|
// auto_expansion_of_defs. ENABLED and the first argument of \cdot need every definition of action
|
|
61
92
|
// level expanded, a prime lowers that bound to 1, and so does the second argument of \cdot.
|
|
62
93
|
const expandDefinitions = (
|
|
63
|
-
|
|
94
|
+
options: ActionOptions,
|
|
95
|
+
onWarning: Warn,
|
|
64
96
|
scope: Scope | undefined,
|
|
65
97
|
expression: Expr,
|
|
66
98
|
level: number | undefined,
|
|
67
99
|
): Expr => {
|
|
68
100
|
const recurse = (inner: Expr, innerLevel = level) =>
|
|
69
|
-
expandDefinitions(onWarning, scope, inner, innerLevel);
|
|
101
|
+
expandDefinitions(options, onWarning, scope, inner, innerLevel);
|
|
70
102
|
if (isLambdified(expression)) return expression;
|
|
71
103
|
if (expression.kind === "Sub") {
|
|
72
104
|
return {
|
|
@@ -79,10 +111,31 @@ const expandDefinitions = (
|
|
|
79
111
|
const builtin = expression.operator.builtin;
|
|
80
112
|
const [first, second] = expression.args;
|
|
81
113
|
if (builtin === "Cdot" && expression.args.length === 2) {
|
|
82
|
-
|
|
114
|
+
if (level !== undefined && !options.isCdot) {
|
|
115
|
+
onWarning(
|
|
116
|
+
getErrorNote(
|
|
117
|
+
expression.location,
|
|
118
|
+
`${NESTED_CDOT}For example, writing \`BY ExpandCdot\`.`,
|
|
119
|
+
),
|
|
120
|
+
);
|
|
121
|
+
throw new TlaProverError("Expr.Action");
|
|
122
|
+
}
|
|
123
|
+
return {
|
|
124
|
+
...expression,
|
|
125
|
+
args: options.isCdot
|
|
126
|
+
? [recurse(first, getInitialLevel(level)), recurse(second, 1)]
|
|
127
|
+
: [recurse(first), recurse(second)],
|
|
128
|
+
};
|
|
83
129
|
}
|
|
84
130
|
if (builtin === "ENABLED" && expression.args.length === 1) {
|
|
85
|
-
|
|
131
|
+
if (level !== undefined && !options.isEnabled) {
|
|
132
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
133
|
+
throw new TlaProverError("Expr.Action");
|
|
134
|
+
}
|
|
135
|
+
return {
|
|
136
|
+
...expression,
|
|
137
|
+
args: [options.isEnabled ? recurse(first, getInitialLevel(level)) : recurse(first)],
|
|
138
|
+
};
|
|
86
139
|
}
|
|
87
140
|
if ((builtin === "Prime" || builtin === "UNCHANGED") && expression.args.length === 1) {
|
|
88
141
|
return { ...expression, args: [recurse(first, getDecrementedLevel(level))] };
|
|
@@ -96,7 +149,7 @@ const expandDefinitions = (
|
|
|
96
149
|
return mapScoped(
|
|
97
150
|
scope,
|
|
98
151
|
expression,
|
|
99
|
-
(inner, child) => expandDefinitions(onWarning, inner, child, level),
|
|
152
|
+
(inner, child) => expandDefinitions(options, onWarning, inner, child, level),
|
|
100
153
|
adjoin,
|
|
101
154
|
);
|
|
102
155
|
}
|
|
@@ -104,7 +157,7 @@ const expandDefinitions = (
|
|
|
104
157
|
const expressionLevel = getLevelInfo(scope, expression).level;
|
|
105
158
|
const hyp = getHyp(scope, head.index);
|
|
106
159
|
const getDeclaration = (name: string) =>
|
|
107
|
-
`The operator \`${name}\` is declared at:\n${
|
|
160
|
+
`The operator \`${name}\` is declared at:\n${getLocationText(hyp.location)}`;
|
|
108
161
|
if (hyp.kind === "Fresh" && hyp.level === "Unknown") {
|
|
109
162
|
onWarning(
|
|
110
163
|
getErrorNote(
|
|
@@ -131,6 +184,21 @@ const expandDefinitions = (
|
|
|
131
184
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
132
185
|
throw new TlapmBugError();
|
|
133
186
|
}
|
|
187
|
+
if (!options.isAutoUse) {
|
|
188
|
+
const names =
|
|
189
|
+
options.isEnabled && options.isCdot
|
|
190
|
+
? [
|
|
191
|
+
"the operators `ENABLED` and `\\cdot`",
|
|
192
|
+
"the proof directives `ExpandENABLED` and `ExpandCdot`",
|
|
193
|
+
]
|
|
194
|
+
: options.isEnabled
|
|
195
|
+
? ["the operator `ENABLED`", "`ExpandENABLED` proof directive"]
|
|
196
|
+
: ["the operator `\\cdot`", "`ExpandCdot` proof directive"];
|
|
197
|
+
const body = definition.body.kind === "Lambda" ? definition.body.body : definition.body;
|
|
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);
|
|
201
|
+
}
|
|
134
202
|
onWarning({
|
|
135
203
|
text: `${getAtPrefix(expression.location)}[INFO]: Auto-expanding the definition of operator: ${definition.name}\n`,
|
|
136
204
|
channel: "stdout",
|
|
@@ -141,19 +209,6 @@ const expandDefinitions = (
|
|
|
141
209
|
);
|
|
142
210
|
};
|
|
143
211
|
|
|
144
|
-
const getEquality = (expression: Expr): Expr =>
|
|
145
|
-
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
146
|
-
|
|
147
|
-
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
148
|
-
const rewriteUnchanged = (expression: Expr): Expr => {
|
|
149
|
-
const flatten = (inner: Expr): Expr[] =>
|
|
150
|
-
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
151
|
-
const items = flatten(expression);
|
|
152
|
-
if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
|
|
153
|
-
if (items.length === 1) return getEquality(items[0]);
|
|
154
|
-
return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
|
|
155
|
-
};
|
|
156
|
-
|
|
157
212
|
// expand_propositional_action_operators: UNCHANGED v, [A]_v and <<A>>_v in terms of primes.
|
|
158
213
|
const expandPropositional = (expression: Expr): Expr => {
|
|
159
214
|
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
@@ -212,13 +267,14 @@ const getHashtblKeys = (names: string[]) => {
|
|
|
212
267
|
// into primed. ENABLED A binds the primes of A, and A \cdot B binds those of A and the unprimed
|
|
213
268
|
// variables of B, each as an opaque name such as x#enabled#prime1.
|
|
214
269
|
const bindVariables = (
|
|
215
|
-
|
|
270
|
+
options: ActionOptions,
|
|
271
|
+
onWarning: Warn,
|
|
216
272
|
current: FreshNames | undefined,
|
|
217
273
|
primed: FreshNames | undefined,
|
|
218
274
|
scope: Scope | undefined,
|
|
219
275
|
expression: Expr,
|
|
220
276
|
): Expr => {
|
|
221
|
-
const recurse = (inner: Expr) => bindVariables(onWarning, current, primed, scope, inner);
|
|
277
|
+
const recurse = (inner: Expr) => bindVariables(options, onWarning, current, primed, scope, inner);
|
|
222
278
|
const isInScope = current !== undefined || primed !== undefined;
|
|
223
279
|
const lambdifyOperator = (operator: Expr, args: Expr[]) => {
|
|
224
280
|
const fresh: FreshNames = {
|
|
@@ -227,8 +283,8 @@ const bindVariables = (
|
|
|
227
283
|
};
|
|
228
284
|
const [first, second] = args;
|
|
229
285
|
const bound = [
|
|
230
|
-
bindVariables(onWarning, current, fresh, scope, first),
|
|
231
|
-
...(second ? [bindVariables(onWarning, fresh, primed, scope, second)] : []),
|
|
286
|
+
bindVariables(options, onWarning, current, fresh, scope, first),
|
|
287
|
+
...(second ? [bindVariables(options, onWarning, fresh, primed, scope, second)] : []),
|
|
232
288
|
];
|
|
233
289
|
const params = fresh.names.length === 0 ? ["r#0"] : getHashtblKeys(fresh.names);
|
|
234
290
|
return at(
|
|
@@ -250,13 +306,21 @@ const bindVariables = (
|
|
|
250
306
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
251
307
|
const builtin = expression.operator.builtin;
|
|
252
308
|
if (
|
|
253
|
-
(builtin === "ENABLED" && expression.args.length === 1) ||
|
|
254
|
-
(builtin === "Cdot" && expression.args.length === 2)
|
|
309
|
+
(options.isEnabled && builtin === "ENABLED" && expression.args.length === 1) ||
|
|
310
|
+
(options.isCdot && builtin === "Cdot" && expression.args.length === 2)
|
|
255
311
|
) {
|
|
256
312
|
return lambdifyOperator(expression.operator, expression.args);
|
|
257
313
|
}
|
|
314
|
+
if (builtin === "ENABLED" && isInScope) {
|
|
315
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
316
|
+
throw new TlaProverError("Expr.Action");
|
|
317
|
+
}
|
|
318
|
+
if (builtin === "Cdot" && isInScope) {
|
|
319
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
320
|
+
throw new TlaProverError("Expr.Action");
|
|
321
|
+
}
|
|
258
322
|
if (builtin === "Prime" && expression.args.length === 1) {
|
|
259
|
-
const arg = bindVariables(onWarning, primed, undefined, scope, expression.args[0]);
|
|
323
|
+
const arg = bindVariables(options, onWarning, primed, undefined, scope, expression.args[0]);
|
|
260
324
|
return primed ? arg : { ...expression, args: [arg] };
|
|
261
325
|
}
|
|
262
326
|
if (builtin === "UNCHANGED" && isInScope) return recurse(expandPropositional(expression));
|
|
@@ -285,7 +349,7 @@ const bindVariables = (
|
|
|
285
349
|
return mapScoped(
|
|
286
350
|
scope,
|
|
287
351
|
expression,
|
|
288
|
-
(inner, child) => bindVariables(onWarning, current, primed, inner, child),
|
|
352
|
+
(inner, child) => bindVariables(options, onWarning, current, primed, inner, child),
|
|
289
353
|
adjoin,
|
|
290
354
|
);
|
|
291
355
|
};
|
|
@@ -323,62 +387,172 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
|
323
387
|
return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
|
|
324
388
|
};
|
|
325
389
|
|
|
326
|
-
// normalize_lambda_param_names
|
|
327
|
-
|
|
328
|
-
const renameParams = (expression: Expr): Expr => {
|
|
390
|
+
// normalize_lambda_param_names.
|
|
391
|
+
const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
329
392
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
330
393
|
const [lambda] = expression.args;
|
|
331
394
|
if (expression.args.length !== 1 || lambda.kind !== "Lambda" || lambda.params[0].name === "_") {
|
|
332
395
|
throw new TlapmBugError();
|
|
333
396
|
}
|
|
334
|
-
const name = expression.operator.builtin === "Cdot" ?
|
|
397
|
+
const name = expression.operator.builtin === "Cdot" ? CDOT_WRAPPER : ENABLED_WRAPPER;
|
|
335
398
|
return {
|
|
336
399
|
kind: "Apply",
|
|
337
400
|
operator: at({ kind: "Opaque", name }, expression.operator),
|
|
338
401
|
args: [
|
|
339
402
|
{
|
|
340
403
|
kind: "Lambda",
|
|
341
|
-
params: lambda.params.map((
|
|
342
|
-
|
|
404
|
+
params: lambda.params.map((param, index) => ({
|
|
405
|
+
name: isKeepingNames ? param.name : `r#${index}`,
|
|
406
|
+
shape: 0,
|
|
407
|
+
})),
|
|
408
|
+
body: renameParams(isKeepingNames, lambda.body),
|
|
343
409
|
},
|
|
344
410
|
],
|
|
345
411
|
};
|
|
346
412
|
}
|
|
347
|
-
return
|
|
348
|
-
undefined,
|
|
349
|
-
expression,
|
|
350
|
-
(_state, child) => renameParams(child),
|
|
351
|
-
() => undefined,
|
|
352
|
-
);
|
|
413
|
+
return mapVisibleChildren(expression, (child) => renameParams(isKeepingNames, child));
|
|
353
414
|
};
|
|
354
415
|
|
|
355
|
-
// check_arity
|
|
416
|
+
// check_arity.
|
|
356
417
|
const checkArity = (expression: Expr): Expr => {
|
|
357
|
-
|
|
358
|
-
expression
|
|
359
|
-
expression.operator.kind === "Internal" &&
|
|
360
|
-
expression.operator.builtin === "Cdot" &&
|
|
418
|
+
if (
|
|
419
|
+
isBuiltinApply(expression, "Cdot") &&
|
|
361
420
|
expression.args.length === 1 &&
|
|
362
|
-
expression.args[0].kind !== "Lambda"
|
|
363
|
-
|
|
421
|
+
expression.args[0].kind !== "Lambda"
|
|
422
|
+
) {
|
|
423
|
+
throw new TlapmBugError();
|
|
424
|
+
}
|
|
425
|
+
return mapVisibleChildren(expression, checkArity);
|
|
426
|
+
};
|
|
427
|
+
|
|
428
|
+
// lambdify_action_operators#expand.
|
|
429
|
+
const lambdifyOperators = (
|
|
430
|
+
anonymizer: Anonymizer,
|
|
431
|
+
onWarning: Warn,
|
|
432
|
+
scope: Scope | undefined,
|
|
433
|
+
expression: Expr,
|
|
434
|
+
options: ActionOptions,
|
|
435
|
+
isKeepingNames: boolean,
|
|
436
|
+
) => {
|
|
437
|
+
const bound = bindVariables(options, onWarning, undefined, undefined, scope, expression);
|
|
438
|
+
return renameParams(isKeepingNames, anonymizer.expr(scope, shiftIndices(shift(0), bound)));
|
|
439
|
+
};
|
|
440
|
+
|
|
441
|
+
const LAMBDIFY_ALL: ActionOptions = { isEnabled: true, isCdot: true, isAutoUse: true };
|
|
442
|
+
|
|
443
|
+
export const lambdify = (
|
|
444
|
+
anonymizer: Anonymizer,
|
|
445
|
+
onWarning: Warn,
|
|
446
|
+
scope: Scope | undefined,
|
|
447
|
+
expression: Expr,
|
|
448
|
+
options = LAMBDIFY_ALL,
|
|
449
|
+
) => {
|
|
450
|
+
const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
|
|
451
|
+
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
452
|
+
};
|
|
453
|
+
|
|
454
|
+
// replace_action_operators_with_quantifiers: each lambdified ENABLED or \cdot that the frontend
|
|
455
|
+
// expands becomes \E over the parameters of its LAMBDA.
|
|
456
|
+
const replaceWithQuantifiers = (
|
|
457
|
+
options: ActionOptions,
|
|
458
|
+
onWarning: Warn,
|
|
459
|
+
scope: Scope | undefined,
|
|
460
|
+
expression: Expr,
|
|
461
|
+
isInScope: boolean,
|
|
462
|
+
): Expr => {
|
|
463
|
+
const quantify = (params: Param[], body: Expr): Expr => ({
|
|
464
|
+
kind: "Quant",
|
|
465
|
+
quantifier: "Exists",
|
|
466
|
+
bounds: params.map((param) => ({
|
|
467
|
+
name: param.name,
|
|
468
|
+
level: "Constant",
|
|
469
|
+
domain: { kind: "NoDomain" },
|
|
470
|
+
})),
|
|
471
|
+
body: replaceWithQuantifiers(
|
|
472
|
+
options,
|
|
473
|
+
onWarning,
|
|
474
|
+
adjoinAll(scope, params.map(getParamFresh)),
|
|
475
|
+
body,
|
|
476
|
+
true,
|
|
477
|
+
),
|
|
478
|
+
});
|
|
479
|
+
const isExpanded = (builtin: "ENABLED" | "Cdot") =>
|
|
480
|
+
builtin === "ENABLED" ? options.isEnabled : options.isCdot;
|
|
481
|
+
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
482
|
+
const operator = expression.operator;
|
|
483
|
+
const [lambda] = expression.args;
|
|
484
|
+
if (lambda.kind === "Lambda") {
|
|
485
|
+
if (
|
|
486
|
+
operator.kind === "Opaque" &&
|
|
487
|
+
((options.isEnabled && operator.name === ENABLED_WRAPPER) ||
|
|
488
|
+
(options.isCdot && operator.name === CDOT_WRAPPER))
|
|
489
|
+
) {
|
|
490
|
+
return quantify(lambda.params, lambda.body);
|
|
491
|
+
}
|
|
492
|
+
if (operator.kind === "Ix" && (options.isEnabled || options.isCdot)) {
|
|
493
|
+
const hyp = getHyp(scope, operator.index);
|
|
494
|
+
const isWrapperDefinition =
|
|
495
|
+
hyp.kind === "Defn" &&
|
|
496
|
+
hyp.definition.kind === "Operator" &&
|
|
497
|
+
(hyp.definition.name === ENABLED_WRAPPER || hyp.definition.name === CDOT_WRAPPER);
|
|
498
|
+
if (isWrapperDefinition) return quantify(lambda.params, lambda.body);
|
|
499
|
+
}
|
|
500
|
+
if (isActionOperator(operator) && isExpanded(operator.builtin)) {
|
|
501
|
+
return quantify(lambda.params, lambda.body);
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
if (isActionOperator(operator) && isExpanded(operator.builtin)) {
|
|
505
|
+
return replaceWithQuantifiers(options, onWarning, scope, lambda, true);
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
if (isBuiltinApply(expression, "ENABLED") && isInScope) {
|
|
509
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
510
|
+
throw new TlaProverError("Expr.Action");
|
|
511
|
+
}
|
|
512
|
+
if (isBuiltinApply(expression, "Cdot") && isInScope) {
|
|
513
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
514
|
+
throw new TlaProverError("Expr.Action");
|
|
515
|
+
}
|
|
364
516
|
return mapScoped(
|
|
365
|
-
|
|
517
|
+
scope,
|
|
366
518
|
expression,
|
|
367
|
-
(
|
|
368
|
-
|
|
519
|
+
(inner, child) => replaceWithQuantifiers(options, onWarning, inner, child, isInScope),
|
|
520
|
+
adjoin,
|
|
369
521
|
);
|
|
370
522
|
};
|
|
371
523
|
|
|
372
|
-
|
|
524
|
+
// commute_exists_disjunction: \E x : A \/ B as (\E x : A) \/ (\E x : B), everywhere.
|
|
525
|
+
const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
526
|
+
if (expression.kind === "Quant" && expression.quantifier === "Exists") {
|
|
527
|
+
const body = expression.body;
|
|
528
|
+
if (body.kind === "List" && body.bullet === "Or") {
|
|
529
|
+
return commuteExistsDisjunction({
|
|
530
|
+
...body,
|
|
531
|
+
items: body.items.map((item) => ({ ...expression, body: item })),
|
|
532
|
+
});
|
|
533
|
+
}
|
|
534
|
+
if (isBuiltinApply(body, "Disj")) {
|
|
535
|
+
if (body.args.length !== 2) throw new TlapmBugError();
|
|
536
|
+
return commuteExistsDisjunction({
|
|
537
|
+
...body,
|
|
538
|
+
args: body.args.map((arg) => ({ ...expression, body: arg })),
|
|
539
|
+
});
|
|
540
|
+
}
|
|
541
|
+
}
|
|
542
|
+
return mapVisibleChildren(expression, commuteExistsDisjunction);
|
|
543
|
+
};
|
|
544
|
+
|
|
545
|
+
// expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
|
|
546
|
+
export const expandActionOperators = (
|
|
373
547
|
anonymizer: Anonymizer,
|
|
374
|
-
onWarning:
|
|
548
|
+
onWarning: Warn,
|
|
375
549
|
scope: Scope | undefined,
|
|
376
550
|
expression: Expr,
|
|
551
|
+
options: ActionOptions,
|
|
377
552
|
) => {
|
|
378
|
-
const expanded = expandDefinitions(onWarning, scope, expression, undefined);
|
|
379
|
-
const
|
|
380
|
-
|
|
381
|
-
|
|
553
|
+
const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
|
|
554
|
+
const lambdified = lambdifyOperators(anonymizer, onWarning, scope, expanded, options, true);
|
|
555
|
+
return commuteExistsDisjunction(
|
|
556
|
+
replaceWithQuantifiers(options, onWarning, scope, lambdified, false),
|
|
382
557
|
);
|
|
383
|
-
return checkArity(renameParams(anonymizer.expr(scope, bound)));
|
|
384
558
|
};
|