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