tla-ts 0.0.4-dev.7c70fed → 0.0.4-dev.8fefa42

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.
Files changed (308) hide show
  1. package/README.md +62 -70
  2. package/dist/deciders.cjs +366 -0
  3. package/dist/deciders.js +366 -0
  4. package/dist/index.cjs +1 -1
  5. package/dist/index.d.cts +35 -1
  6. package/dist/index.d.ts +35 -1
  7. package/dist/index.js +1 -1
  8. package/dist/parallel-worker.cjs +1 -4
  9. package/dist/parallel-worker.js +1 -4
  10. package/dist/prove-worker.cjs +9 -0
  11. package/dist/prove-worker.d.cts +9 -0
  12. package/dist/prove-worker.d.ts +9 -0
  13. package/dist/prove-worker.js +9 -0
  14. package/dist/prove.cjs +515 -0
  15. package/dist/prove.js +515 -0
  16. package/dist/run-cli.cjs +30 -47
  17. package/dist/run-cli.js +30 -47
  18. package/dist/tlapm.cjs +10 -0
  19. package/dist/tlapm.js +10 -0
  20. package/dist/transfer.cjs +38 -44
  21. package/dist/transfer.js +38 -44
  22. package/dist/worker.cjs +21 -0
  23. package/dist/worker.js +21 -0
  24. package/package.json +21 -12
  25. package/src/check.ts +1 -0
  26. package/src/errors.ts +86 -0
  27. package/src/evaluate.ts +54 -19
  28. package/src/index.ts +10 -0
  29. package/src/{obligation-action.ts → obligations/action.ts} +258 -37
  30. package/src/{obligation-anon.ts → obligations/anon.ts} +13 -7
  31. package/src/obligations/ctx.ts +64 -0
  32. package/src/{obligation-deref.ts → obligations/deref.ts} +2 -2
  33. package/src/{obligation-expression.ts → obligations/expression.ts} +54 -8
  34. package/src/{obligation-generate.ts → obligations/generate.ts} +134 -61
  35. package/src/{obligations.ts → obligations/index.ts} +26 -12
  36. package/src/{obligation-levels.ts → obligations/levels.ts} +12 -2
  37. package/src/{obligation-module.ts → obligations/module.ts} +46 -20
  38. package/src/obligations/pickle.ts +100 -0
  39. package/src/obligations/pragma.ts +189 -0
  40. package/src/{obligation-printer.ts → obligations/printer.ts} +5 -59
  41. package/src/{obligation-proof.ts → obligations/proof.ts} +7 -1
  42. package/src/{obligation-source.ts → obligations/source.ts} +91 -35
  43. package/src/obligations/temporal.ts +319 -0
  44. package/src/{obligation-tuples.ts → obligations/tuples.ts} +1 -1
  45. package/src/parallel-worker.ts +2 -18
  46. package/src/parallel.ts +10 -43
  47. package/src/prove/decide-pool.ts +100 -0
  48. package/src/prove/deciders.ts +27 -0
  49. package/src/prove/isabelle/LICENSE +36 -0
  50. package/src/prove/isabelle/LICENSE-tlapm +26 -0
  51. package/src/prove/isabelle/decide.ts +47 -0
  52. package/src/prove/isabelle/encode.ts +477 -0
  53. package/src/prove/isabelle/isar/inner-syntax.ts +579 -0
  54. package/src/prove/isabelle/isar/method.ts +367 -0
  55. package/src/prove/isabelle/isar/proof.ts +28 -0
  56. package/src/prove/isabelle/isar/statement.ts +57 -0
  57. package/src/prove/isabelle/isar/theory.ts +192 -0
  58. package/src/prove/isabelle/isar/type-check.ts +278 -0
  59. package/src/prove/isabelle/provers/blast/blast.ts +258 -0
  60. package/src/prove/isabelle/provers/blast/branch.ts +322 -0
  61. package/src/prove/isabelle/provers/blast/prove.ts +347 -0
  62. package/src/prove/isabelle/provers/blast/rules.ts +330 -0
  63. package/src/prove/isabelle/provers/blast/state.ts +180 -0
  64. package/src/prove/isabelle/provers/blast/term.ts +547 -0
  65. package/src/prove/isabelle/provers/clasimp.ts +150 -0
  66. package/src/prove/isabelle/provers/classical.ts +389 -0
  67. package/src/prove/isabelle/provers/hypsubst.ts +441 -0
  68. package/src/prove/isabelle/pure/bicompose.ts +174 -0
  69. package/src/prove/isabelle/pure/consts.ts +32 -0
  70. package/src/prove/isabelle/pure/conv.ts +79 -0
  71. package/src/prove/isabelle/pure/drule.ts +264 -0
  72. package/src/prove/isabelle/pure/envir.ts +363 -0
  73. package/src/prove/isabelle/pure/goal.ts +53 -0
  74. package/src/prove/isabelle/pure/interrupt.ts +16 -0
  75. package/src/prove/isabelle/pure/list.ts +12 -0
  76. package/src/prove/isabelle/pure/logic.ts +402 -0
  77. package/src/prove/isabelle/pure/name.ts +110 -0
  78. package/src/prove/isabelle/pure/net.ts +262 -0
  79. package/src/prove/isabelle/pure/object-logic.ts +41 -0
  80. package/src/prove/isabelle/pure/pattern.ts +650 -0
  81. package/src/prove/isabelle/pure/raw-simplifier.ts +353 -0
  82. package/src/prove/isabelle/pure/rewriter.ts +602 -0
  83. package/src/prove/isabelle/pure/search.ts +68 -0
  84. package/src/prove/isabelle/pure/seq.ts +156 -0
  85. package/src/prove/isabelle/pure/simplifier.ts +112 -0
  86. package/src/prove/isabelle/pure/table.ts +208 -0
  87. package/src/prove/isabelle/pure/tactic.ts +276 -0
  88. package/src/prove/isabelle/pure/tactical.ts +347 -0
  89. package/src/prove/isabelle/pure/term-ord.ts +159 -0
  90. package/src/prove/isabelle/pure/term.ts +808 -0
  91. package/src/prove/isabelle/pure/thm.ts +806 -0
  92. package/src/prove/isabelle/pure/type.ts +133 -0
  93. package/src/prove/isabelle/pure/unify.ts +753 -0
  94. package/src/prove/isabelle/pure/variable.ts +25 -0
  95. package/src/prove/isabelle/tla/classical-setup.ts +101 -0
  96. package/src/prove/isabelle/tla/context.ts +74 -0
  97. package/src/prove/isabelle/tla/logic-data.ts +5 -0
  98. package/src/prove/isabelle/tla/logic.ts +215 -0
  99. package/src/prove/isabelle/tla/simpdata.ts +241 -0
  100. package/src/prove/isabelle/tools/intuitionistic.ts +132 -0
  101. package/src/prove/ocaml.ts +22 -0
  102. package/src/prove/prep/action.ts +520 -0
  103. package/src/prove/prep/defs.ts +27 -0
  104. package/src/prove/prep/elab.ts +156 -0
  105. package/src/prove/prep/enabled-axioms.ts +189 -0
  106. package/src/prove/prep/enabled.ts +43 -0
  107. package/src/prove/prep/fingerprint.ts +388 -0
  108. package/src/prove/prep/flatten.ts +70 -0
  109. package/src/prove/prep/level-comparison.ts +552 -0
  110. package/src/prove/prep/md5.ts +67 -0
  111. package/src/prove/prep/pragma.ts +221 -0
  112. package/src/prove/prep/trivial.ts +22 -0
  113. package/src/prove/prove-worker.ts +29 -0
  114. package/src/prove/prove.ts +417 -0
  115. package/src/prove/ptl/decide.ts +68 -0
  116. package/src/prove/ptl/encode.ts +256 -0
  117. package/src/prove/ptl/sat.ts +151 -0
  118. package/src/prove/ptl/tableau.ts +276 -0
  119. package/src/prove/smt/axiomatize.ts +69 -0
  120. package/src/prove/smt/axioms.ts +210 -0
  121. package/src/prove/smt/context.ts +108 -0
  122. package/src/prove/smt/data.ts +665 -0
  123. package/src/prove/smt/encode.ts +169 -0
  124. package/src/prove/smt/extensionality.ts +63 -0
  125. package/src/prove/smt/flatten.ts +127 -0
  126. package/src/prove/smt/format.ts +143 -0
  127. package/src/prove/smt/instances.ts +182 -0
  128. package/src/prove/smt/rewrite.ts +784 -0
  129. package/src/prove/smt/simplify.ts +57 -0
  130. package/src/prove/smt/solver/act-cache.ts +265 -0
  131. package/src/prove/smt/solver/arith-rewriter.ts +962 -0
  132. package/src/prove/smt/solver/array.ts +22 -0
  133. package/src/prove/smt/solver/asserted-formulas.ts +469 -0
  134. package/src/prove/smt/solver/ast-lt.ts +157 -0
  135. package/src/prove/smt/solver/ast-util.ts +147 -0
  136. package/src/prove/smt/solver/ast.ts +1315 -0
  137. package/src/prove/smt/solver/auf-solver.ts +572 -0
  138. package/src/prove/smt/solver/case-split-queue.ts +178 -0
  139. package/src/prove/smt/solver/cg-table.ts +175 -0
  140. package/src/prove/smt/solver/clause.ts +276 -0
  141. package/src/prove/smt/solver/conflict-resolution.ts +343 -0
  142. package/src/prove/smt/solver/context.ts +1292 -0
  143. package/src/prove/smt/solver/ctx-simplify.ts +334 -0
  144. package/src/prove/smt/solver/der.ts +224 -0
  145. package/src/prove/smt/solver/dyn-ack.ts +141 -0
  146. package/src/prove/smt/solver/e-matching.ts +659 -0
  147. package/src/prove/smt/solver/enode.ts +259 -0
  148. package/src/prove/smt/solver/expr-ref.ts +21 -0
  149. package/src/prove/smt/solver/expr-safe-replace.ts +172 -0
  150. package/src/prove/smt/solver/fingerprints.ts +92 -0
  151. package/src/prove/smt/solver/flat-literals.ts +51 -0
  152. package/src/prove/smt/solver/goal.ts +138 -0
  153. package/src/prove/smt/solver/hash.ts +173 -0
  154. package/src/prove/smt/solver/hashtable.ts +166 -0
  155. package/src/prove/smt/solver/internalizer.ts +1381 -0
  156. package/src/prove/smt/solver/lbool.ts +5 -0
  157. package/src/prove/smt/solver/literal.ts +24 -0
  158. package/src/prove/smt/solver/lp/bound-propagator.ts +391 -0
  159. package/src/prove/smt/solver/lp/constraints.ts +78 -0
  160. package/src/prove/smt/solver/lp/containers.ts +296 -0
  161. package/src/prove/smt/solver/lp/core-solver.ts +504 -0
  162. package/src/prove/smt/solver/lp/cross-nested.ts +224 -0
  163. package/src/prove/smt/solver/lp/dep-intervals.ts +656 -0
  164. package/src/prove/smt/solver/lp/dependency.ts +51 -0
  165. package/src/prove/smt/solver/lp/dioph-eq.ts +1181 -0
  166. package/src/prove/smt/solver/lp/explanation.ts +46 -0
  167. package/src/prove/smt/solver/lp/gomory.ts +255 -0
  168. package/src/prove/smt/solver/lp/hnf-cutter.ts +125 -0
  169. package/src/prove/smt/solver/lp/hnf.ts +281 -0
  170. package/src/prove/smt/solver/lp/int-cube.ts +295 -0
  171. package/src/prove/smt/solver/lp/int-solver.ts +514 -0
  172. package/src/prove/smt/solver/lp/lar-solver.ts +816 -0
  173. package/src/prove/smt/solver/lp/lar-term.ts +62 -0
  174. package/src/prove/smt/solver/lp/lp-settings.ts +91 -0
  175. package/src/prove/smt/solver/lp/maximize-term.ts +347 -0
  176. package/src/prove/smt/solver/lp/nex-creator.ts +381 -0
  177. package/src/prove/smt/solver/lp/nex.ts +120 -0
  178. package/src/prove/smt/solver/lp/nla-backoff.ts +43 -0
  179. package/src/prove/smt/solver/lp/nla-basics.ts +398 -0
  180. package/src/prove/smt/solver/lp/nla-core.ts +968 -0
  181. package/src/prove/smt/solver/lp/nla-divisions.ts +332 -0
  182. package/src/prove/smt/solver/lp/nla-emonics.ts +373 -0
  183. package/src/prove/smt/solver/lp/nla-factorization.ts +30 -0
  184. package/src/prove/smt/solver/lp/nla-grobner.ts +904 -0
  185. package/src/prove/smt/solver/lp/nla-horner.ts +126 -0
  186. package/src/prove/smt/solver/lp/nla-intervals.ts +265 -0
  187. package/src/prove/smt/solver/lp/nla-monomial-bounds.ts +715 -0
  188. package/src/prove/smt/solver/lp/nla-monotone.ts +59 -0
  189. package/src/prove/smt/solver/lp/nla-order.ts +307 -0
  190. package/src/prove/smt/solver/lp/nla-patcher.ts +112 -0
  191. package/src/prove/smt/solver/lp/nla-tangents.ts +251 -0
  192. package/src/prove/smt/solver/lp/nla-throttle.ts +85 -0
  193. package/src/prove/smt/solver/lp/nla-types.ts +124 -0
  194. package/src/prove/smt/solver/lp/nla-var-eqs.ts +141 -0
  195. package/src/prove/smt/solver/lp/nra-solver.ts +440 -0
  196. package/src/prove/smt/solver/lp/numeric-pair.ts +65 -0
  197. package/src/prove/smt/solver/lp/pdd-interval.ts +31 -0
  198. package/src/prove/smt/solver/lp/pdd-simplifier.ts +184 -0
  199. package/src/prove/smt/solver/lp/pdd-solver.ts +408 -0
  200. package/src/prove/smt/solver/lp/pdd.ts +971 -0
  201. package/src/prove/smt/solver/lp/random-updater.ts +138 -0
  202. package/src/prove/smt/solver/lp/static-matrix.ts +246 -0
  203. package/src/prove/smt/solver/lp/union-find.ts +96 -0
  204. package/src/prove/smt/solver/mam-compiler.ts +847 -0
  205. package/src/prove/smt/solver/mam-interpreter.ts +400 -0
  206. package/src/prove/smt/solver/maximize-ac-sharing.ts +118 -0
  207. package/src/prove/smt/solver/model-checker.ts +347 -0
  208. package/src/prove/smt/solver/model-evaluator.ts +262 -0
  209. package/src/prove/smt/solver/model-finder.ts +155 -0
  210. package/src/prove/smt/solver/model-generator.ts +97 -0
  211. package/src/prove/smt/solver/model-macro-solver.ts +728 -0
  212. package/src/prove/smt/solver/nlsat/algebraic.ts +1161 -0
  213. package/src/prove/smt/solver/nlsat/atoms.ts +238 -0
  214. package/src/prove/smt/solver/nlsat/evaluator.ts +303 -0
  215. package/src/prove/smt/solver/nlsat/explain.ts +607 -0
  216. package/src/prove/smt/solver/nlsat/interval-set.ts +351 -0
  217. package/src/prove/smt/solver/nlsat/levelwise.ts +740 -0
  218. package/src/prove/smt/solver/nlsat/mpbq.ts +161 -0
  219. package/src/prove/smt/solver/nlsat/polynomial.ts +1722 -0
  220. package/src/prove/smt/solver/nlsat/solver.ts +911 -0
  221. package/src/prove/smt/solver/nlsat/types.ts +43 -0
  222. package/src/prove/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
  223. package/src/prove/smt/solver/nlsat/upolynomial.ts +996 -0
  224. package/src/prove/smt/solver/nnf.ts +469 -0
  225. package/src/prove/smt/solver/pattern-inference.ts +351 -0
  226. package/src/prove/smt/solver/poly-rewriter.ts +477 -0
  227. package/src/prove/smt/solver/propagate-values.ts +83 -0
  228. package/src/prove/smt/solver/proto-model.ts +551 -0
  229. package/src/prove/smt/solver/pull-quant.ts +139 -0
  230. package/src/prove/smt/solver/qe-lite-der.ts +526 -0
  231. package/src/prove/smt/solver/qe-lite-fm.ts +576 -0
  232. package/src/prove/smt/solver/qe-lite.ts +381 -0
  233. package/src/prove/smt/solver/qi-queue.ts +362 -0
  234. package/src/prove/smt/solver/quant-tactics.ts +117 -0
  235. package/src/prove/smt/solver/quantifier-analyzer.ts +562 -0
  236. package/src/prove/smt/solver/quantifier-manager.ts +186 -0
  237. package/src/prove/smt/solver/random-gen.ts +10 -0
  238. package/src/prove/smt/solver/rational.ts +165 -0
  239. package/src/prove/smt/solver/ref-vector.ts +62 -0
  240. package/src/prove/smt/solver/relevancy.ts +247 -0
  241. package/src/prove/smt/solver/rewriter-tpl.ts +1159 -0
  242. package/src/prove/smt/solver/rewriter.ts +843 -0
  243. package/src/prove/smt/solver/rlimit.ts +79 -0
  244. package/src/prove/smt/solver/smtlib-parser.ts +526 -0
  245. package/src/prove/smt/solver/solver.ts +71 -0
  246. package/src/prove/smt/solver/sort.ts +35 -0
  247. package/src/prove/smt/solver/sticky-generations.ts +69 -0
  248. package/src/prove/smt/solver/theory-lra-axioms.ts +340 -0
  249. package/src/prove/smt/solver/theory-lra-bounds.ts +226 -0
  250. package/src/prove/smt/solver/theory-lra-final-check.ts +252 -0
  251. package/src/prove/smt/solver/theory-lra-internalize.ts +476 -0
  252. package/src/prove/smt/solver/theory-lra-model.ts +243 -0
  253. package/src/prove/smt/solver/theory-lra-propagate.ts +405 -0
  254. package/src/prove/smt/solver/theory-lra-state.ts +43 -0
  255. package/src/prove/smt/solver/theory-lra.ts +56 -0
  256. package/src/prove/smt/solver/var-subst.ts +258 -0
  257. package/src/prove/smt/solver/z3-license.txt +10 -0
  258. package/src/prove/smt/table.ts +170 -0
  259. package/src/prove/tlapm/tlapm.ts +96 -0
  260. package/src/prove/tlaps-module.ts +510 -0
  261. package/src/prove/verdict.ts +13 -0
  262. package/src/prove/zenon/LICENSE +32 -0
  263. package/src/prove/zenon/check/check.ts +105 -0
  264. package/src/prove/zenon/check/definitions.ts +144 -0
  265. package/src/prove/zenon/check/equality.ts +182 -0
  266. package/src/prove/zenon/check/functions.ts +62 -0
  267. package/src/prove/zenon/check/keys.ts +125 -0
  268. package/src/prove/zenon/check/propositional.ts +104 -0
  269. package/src/prove/zenon/check/records.ts +188 -0
  270. package/src/prove/zenon/check/relations.ts +121 -0
  271. package/src/prove/zenon/check/rewrites.ts +224 -0
  272. package/src/prove/zenon/check/sets.ts +302 -0
  273. package/src/prove/zenon/check/terms.ts +127 -0
  274. package/src/prove/zenon/check/tla.ts +126 -0
  275. package/src/prove/zenon/decide.ts +113 -0
  276. package/src/prove/zenon/encode.ts +444 -0
  277. package/src/prove/zenon/eqrel.ts +300 -0
  278. package/src/prove/zenon/equality-rules.ts +435 -0
  279. package/src/prove/zenon/expr.ts +551 -0
  280. package/src/prove/zenon/index-table.ts +350 -0
  281. package/src/prove/zenon/isar-case.ts +513 -0
  282. package/src/prove/zenon/isar.ts +1249 -0
  283. package/src/prove/zenon/limits.ts +15 -0
  284. package/src/prove/zenon/llproof.ts +173 -0
  285. package/src/prove/zenon/mltoll.ts +1566 -0
  286. package/src/prove/zenon/node.ts +297 -0
  287. package/src/prove/zenon/ocaml.ts +169 -0
  288. package/src/prove/zenon/parse.ts +247 -0
  289. package/src/prove/zenon/phrase.ts +191 -0
  290. package/src/prove/zenon/proof.ts +198 -0
  291. package/src/prove/zenon/propositional-rules.ts +387 -0
  292. package/src/prove/zenon/rules.ts +94 -0
  293. package/src/prove/zenon/search.ts +288 -0
  294. package/src/prove/zenon/tla/functions.ts +151 -0
  295. package/src/prove/zenon/tla/llproof.ts +480 -0
  296. package/src/prove/zenon/tla/records.ts +225 -0
  297. package/src/prove/zenon/tla/rewrites.ts +447 -0
  298. package/src/prove/zenon/tla/sets.ts +304 -0
  299. package/src/prove/zenon/tla/terms.ts +181 -0
  300. package/src/prove/zenon/tla/tla.ts +506 -0
  301. package/src/run-cli.ts +73 -20
  302. package/src/successors.ts +24 -5
  303. package/src/tlc-version.ts +8 -7
  304. package/src/values.ts +47 -4
  305. package/src/worker.ts +65 -0
  306. package/dist/parallel.cjs +0 -12
  307. package/dist/parallel.js +0 -12
  308. /package/src/{obligation-format.ts → obligations/format.ts} +0 -0
@@ -1,16 +1,19 @@
1
- // tlapm's Expr.Action.lambdify, which instantiation applies to each definition and theorem. Each
1
+ // A port of tlapm's Expr.Action. Instantiation lambdifies each definition and theorem: each
2
2
  // ENABLED and \cdot takes a LAMBDA over the variables it binds, after expanding the definitions
3
- // in its scope that soundness needs expanded.
3
+ // in its scope that soundness needs expanded. The ExpandENABLED and ExpandCdot frontends then
4
+ // replace each LAMBDA with an existential quantifier.
4
5
 
5
- import { TlaProofError, TlapmBugError } from "./errors";
6
- import type { Anonymizer } from "./obligation-anon";
6
+ import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
7
+ import type { Anonymizer } from "./anon";
7
8
  import {
8
9
  adjoin,
10
+ adjoinAll,
9
11
  applyBuiltin,
10
12
  at,
11
13
  bumpBy,
12
14
  getAtPrefix,
13
15
  getErrorNote,
16
+ getFresh,
14
17
  getLocusText,
15
18
  getScopeAt,
16
19
  mapScoped,
@@ -20,16 +23,42 @@ import {
20
23
  substituteExpr,
21
24
  type Expr,
22
25
  type ObligationWarning,
26
+ type Param,
23
27
  type Scope,
24
28
  type Substitution,
25
- } from "./obligation-expression";
26
- import { getLevelInfo, LEVEL_NUMBERS } from "./obligation-levels";
29
+ } from "./expression";
30
+ import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
31
+
32
+ // Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
33
+ // soundness needs expanded, as the AutoUSE directive allows.
34
+ export interface ActionOptions {
35
+ isEnabled: boolean;
36
+ isCdot: boolean;
37
+ isAutoUse: boolean;
38
+ }
27
39
 
28
40
  interface FreshNames {
29
41
  names: string[];
30
42
  depth: number;
31
43
  }
32
44
 
45
+ type Warn = (warning: ObligationWarning) => void;
46
+
47
+ const ENABLED_WRAPPER = "EnabledWrapper";
48
+ const CDOT_WRAPPER = "CdotWrapper";
49
+
50
+ const NESTED_ENABLED =
51
+ "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`.";
52
+
53
+ const NESTED_CDOT =
54
+ "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
+
56
+ // Util.eprintf ~at:from "%s" printed, then failwith failure, which keeps a backend from running.
57
+ const fail = (onWarning: Warn, from: Expr, printed: string, failure = printed): never => {
58
+ onWarning(getErrorNote(from.location, printed));
59
+ throw new TlaProverError(failure);
60
+ };
61
+
33
62
  const getHyp = (scope: Scope | undefined, index: number) => {
34
63
  const hyp = getScopeAt(scope, index - 1)?.hyp;
35
64
  if (!hyp) throw new TlapmBugError();
@@ -42,14 +71,20 @@ const isActionOperator = (
42
71
  expression.kind === "Internal" &&
43
72
  (expression.builtin === "ENABLED" || expression.builtin === "Cdot");
44
73
 
74
+ const isWrapper = (expression: Expr) =>
75
+ expression.kind === "Opaque" &&
76
+ (expression.name === ENABLED_WRAPPER || expression.name === CDOT_WRAPPER);
77
+
45
78
  const isLambdified = (expression: Expr) =>
46
79
  expression.kind === "Apply" &&
47
80
  expression.args.length === 1 &&
48
81
  expression.args[0].kind === "Lambda" &&
49
- (isActionOperator(expression.operator) ||
50
- (expression.operator.kind === "Opaque" &&
51
- (expression.operator.name === "EnabledWrapper" ||
52
- expression.operator.name === "CdotWrapper")));
82
+ (isActionOperator(expression.operator) || isWrapper(expression.operator));
83
+
84
+ const isBuiltinApply = (expression: Expr, builtin: "ENABLED" | "Cdot") =>
85
+ expression.kind === "Apply" &&
86
+ expression.operator.kind === "Internal" &&
87
+ expression.operator.builtin === builtin;
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
- onWarning: (warning: ObligationWarning) => void,
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,29 @@ 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
- return { ...expression, args: [recurse(first, getInitialLevel(level)), recurse(second, 1)] };
118
+ if (level !== undefined && !options.isCdot) {
119
+ fail(
120
+ onWarning,
121
+ expression,
122
+ `${NESTED_CDOT}For example, writing \`BY ExpandCdot\`.`,
123
+ "Expr.Action",
124
+ );
125
+ }
126
+ return {
127
+ ...expression,
128
+ args: options.isCdot
129
+ ? [recurse(first, getInitialLevel(level)), recurse(second, 1)]
130
+ : [recurse(first), recurse(second)],
131
+ };
83
132
  }
84
133
  if (builtin === "ENABLED" && expression.args.length === 1) {
85
- return { ...expression, args: [recurse(first, getInitialLevel(level))] };
134
+ if (level !== undefined && !options.isEnabled) {
135
+ fail(onWarning, expression, NESTED_ENABLED, "Expr.Action");
136
+ }
137
+ return {
138
+ ...expression,
139
+ args: [options.isEnabled ? recurse(first, getInitialLevel(level)) : recurse(first)],
140
+ };
86
141
  }
87
142
  if ((builtin === "Prime" || builtin === "UNCHANGED") && expression.args.length === 1) {
88
143
  return { ...expression, args: [recurse(first, getDecrementedLevel(level))] };
@@ -96,7 +151,7 @@ const expandDefinitions = (
96
151
  return mapScoped(
97
152
  scope,
98
153
  expression,
99
- (inner, child) => expandDefinitions(onWarning, inner, child, level),
154
+ (inner, child) => expandDefinitions(options, onWarning, inner, child, level),
100
155
  adjoin,
101
156
  );
102
157
  }
@@ -131,6 +186,25 @@ const expandDefinitions = (
131
186
  if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
132
187
  throw new TlapmBugError();
133
188
  }
189
+ if (!options.isAutoUse) {
190
+ const names =
191
+ options.isEnabled && options.isCdot
192
+ ? [
193
+ "the operators `ENABLED` and `\\cdot`",
194
+ "the proof directives `ExpandENABLED` and `ExpandCdot`",
195
+ ]
196
+ : options.isEnabled
197
+ ? ["the operator `ENABLED`", "`ExpandENABLED` proof directive"]
198
+ : ["the operator `\\cdot`", "`ExpandCdot` proof directive"];
199
+ const body = definition.body.kind === "Lambda" ? definition.body.body : definition.body;
200
+ const getAt = (from: Expr) =>
201
+ from.location ? getLocusText(from.location) : "<unknown location>";
202
+ fail(
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
+ );
207
+ }
134
208
  onWarning({
135
209
  text: `${getAtPrefix(expression.location)}[INFO]: Auto-expanding the definition of operator: ${definition.name}\n`,
136
210
  channel: "stdout",
@@ -145,7 +219,7 @@ const getEquality = (expression: Expr): Expr =>
145
219
  applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
146
220
 
147
221
  // E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
148
- const rewriteUnchanged = (expression: Expr): Expr => {
222
+ export const rewriteUnchanged = (expression: Expr): Expr => {
149
223
  const flatten = (inner: Expr): Expr[] =>
150
224
  inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
151
225
  const items = flatten(expression);
@@ -212,13 +286,14 @@ const getHashtblKeys = (names: string[]) => {
212
286
  // into primed. ENABLED A binds the primes of A, and A \cdot B binds those of A and the unprimed
213
287
  // variables of B, each as an opaque name such as x#enabled#prime1.
214
288
  const bindVariables = (
215
- onWarning: (warning: ObligationWarning) => void,
289
+ options: ActionOptions,
290
+ onWarning: Warn,
216
291
  current: FreshNames | undefined,
217
292
  primed: FreshNames | undefined,
218
293
  scope: Scope | undefined,
219
294
  expression: Expr,
220
295
  ): Expr => {
221
- const recurse = (inner: Expr) => bindVariables(onWarning, current, primed, scope, inner);
296
+ const recurse = (inner: Expr) => bindVariables(options, onWarning, current, primed, scope, inner);
222
297
  const isInScope = current !== undefined || primed !== undefined;
223
298
  const lambdifyOperator = (operator: Expr, args: Expr[]) => {
224
299
  const fresh: FreshNames = {
@@ -227,8 +302,8 @@ const bindVariables = (
227
302
  };
228
303
  const [first, second] = args;
229
304
  const bound = [
230
- bindVariables(onWarning, current, fresh, scope, first),
231
- ...(second ? [bindVariables(onWarning, fresh, primed, scope, second)] : []),
305
+ bindVariables(options, onWarning, current, fresh, scope, first),
306
+ ...(second ? [bindVariables(options, onWarning, fresh, primed, scope, second)] : []),
232
307
  ];
233
308
  const params = fresh.names.length === 0 ? ["r#0"] : getHashtblKeys(fresh.names);
234
309
  return at(
@@ -250,13 +325,23 @@ const bindVariables = (
250
325
  if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
251
326
  const builtin = expression.operator.builtin;
252
327
  if (
253
- (builtin === "ENABLED" && expression.args.length === 1) ||
254
- (builtin === "Cdot" && expression.args.length === 2)
328
+ (options.isEnabled && builtin === "ENABLED" && expression.args.length === 1) ||
329
+ (options.isCdot && builtin === "Cdot" && expression.args.length === 2)
255
330
  ) {
256
331
  return lambdifyOperator(expression.operator, expression.args);
257
332
  }
333
+ if (builtin === "ENABLED" && isInScope)
334
+ fail(onWarning, expression, NESTED_ENABLED, "Expr.Action");
335
+ if (builtin === "Cdot" && isInScope) {
336
+ fail(
337
+ onWarning,
338
+ expression,
339
+ `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`,
340
+ "Expr.Action",
341
+ );
342
+ }
258
343
  if (builtin === "Prime" && expression.args.length === 1) {
259
- const arg = bindVariables(onWarning, primed, undefined, scope, expression.args[0]);
344
+ const arg = bindVariables(options, onWarning, primed, undefined, scope, expression.args[0]);
260
345
  return primed ? arg : { ...expression, args: [arg] };
261
346
  }
262
347
  if (builtin === "UNCHANGED" && isInScope) return recurse(expandPropositional(expression));
@@ -285,7 +370,7 @@ const bindVariables = (
285
370
  return mapScoped(
286
371
  scope,
287
372
  expression,
288
- (inner, child) => bindVariables(onWarning, current, primed, inner, child),
373
+ (inner, child) => bindVariables(options, onWarning, current, primed, inner, child),
289
374
  adjoin,
290
375
  );
291
376
  };
@@ -323,23 +408,26 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
323
408
  return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
324
409
  };
325
410
 
326
- // normalize_lambda_param_names: the parameters become r#0, r#1, ... and the operator
327
- // EnabledWrapper or CdotWrapper.
328
- const renameParams = (expression: Expr): Expr => {
411
+ // normalize_lambda_param_names: the parameters keep their names or become r#0, r#1, ..., and the
412
+ // operator becomes EnabledWrapper or CdotWrapper.
413
+ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
329
414
  if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
330
415
  const [lambda] = expression.args;
331
416
  if (expression.args.length !== 1 || lambda.kind !== "Lambda" || lambda.params[0].name === "_") {
332
417
  throw new TlapmBugError();
333
418
  }
334
- const name = expression.operator.builtin === "Cdot" ? "CdotWrapper" : "EnabledWrapper";
419
+ const name = expression.operator.builtin === "Cdot" ? CDOT_WRAPPER : ENABLED_WRAPPER;
335
420
  return {
336
421
  kind: "Apply",
337
422
  operator: at({ kind: "Opaque", name }, expression.operator),
338
423
  args: [
339
424
  {
340
425
  kind: "Lambda",
341
- params: lambda.params.map((_param, index) => ({ name: `r#${index}`, shape: 0 })),
342
- body: renameParams(lambda.body),
426
+ params: lambda.params.map((param, index) => ({
427
+ name: isKeepingNames ? param.name : `r#${index}`,
428
+ shape: 0,
429
+ })),
430
+ body: renameParams(isKeepingNames, lambda.body),
343
431
  },
344
432
  ],
345
433
  };
@@ -347,7 +435,7 @@ const renameParams = (expression: Expr): Expr => {
347
435
  return mapScoped(
348
436
  undefined,
349
437
  expression,
350
- (_state, child) => renameParams(child),
438
+ (_state, child) => renameParams(isKeepingNames, child),
351
439
  () => undefined,
352
440
  );
353
441
  };
@@ -369,16 +457,149 @@ const checkArity = (expression: Expr): Expr => {
369
457
  );
370
458
  };
371
459
 
460
+ // lambdify_action_operators#expand: binding, shifting, anonymizing the bound names, and renaming.
461
+ const lambdifyOperators = (
462
+ anonymizer: Anonymizer,
463
+ onWarning: Warn,
464
+ scope: Scope | undefined,
465
+ expression: Expr,
466
+ options: ActionOptions,
467
+ isKeepingNames: boolean,
468
+ ) => {
469
+ const bound = bindVariables(options, onWarning, undefined, undefined, scope, expression);
470
+ return renameParams(isKeepingNames, anonymizer.expr(scope, shiftIndices(shift(0), bound)));
471
+ };
472
+
473
+ const LAMBDIFY_ALL: ActionOptions = { isEnabled: true, isCdot: true, isAutoUse: true };
474
+
372
475
  export const lambdify = (
373
476
  anonymizer: Anonymizer,
374
- onWarning: (warning: ObligationWarning) => void,
477
+ onWarning: Warn,
478
+ scope: Scope | undefined,
479
+ expression: Expr,
480
+ options = LAMBDIFY_ALL,
481
+ ) => {
482
+ const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
483
+ return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
484
+ };
485
+
486
+ // replace_action_operators_with_quantifiers: each lambdified ENABLED or \cdot that the frontend
487
+ // expands becomes \E over the parameters of its LAMBDA.
488
+ const replaceWithQuantifiers = (
489
+ options: ActionOptions,
490
+ onWarning: Warn,
491
+ scope: Scope | undefined,
492
+ expression: Expr,
493
+ isInScope: boolean,
494
+ ): Expr => {
495
+ const quantify = (params: Param[], body: Expr): Expr => ({
496
+ kind: "Quant",
497
+ quantifier: "Exists",
498
+ bounds: params.map((param) => ({
499
+ name: param.name,
500
+ level: "Constant",
501
+ domain: { kind: "NoDomain" },
502
+ })),
503
+ body: replaceWithQuantifiers(
504
+ options,
505
+ onWarning,
506
+ adjoinAll(
507
+ scope,
508
+ params.map((param) => getFresh(param.name, "Unknown", param.shape)),
509
+ ),
510
+ body,
511
+ true,
512
+ ),
513
+ });
514
+ const isExpanded = (builtin: "ENABLED" | "Cdot") =>
515
+ builtin === "ENABLED" ? options.isEnabled : options.isCdot;
516
+ if (expression.kind === "Apply" && expression.args.length === 1) {
517
+ const operator = expression.operator;
518
+ const [lambda] = expression.args;
519
+ if (lambda.kind === "Lambda") {
520
+ if (
521
+ operator.kind === "Opaque" &&
522
+ ((options.isEnabled && operator.name === ENABLED_WRAPPER) ||
523
+ (options.isCdot && operator.name === CDOT_WRAPPER))
524
+ ) {
525
+ return quantify(lambda.params, lambda.body);
526
+ }
527
+ if (operator.kind === "Ix" && (options.isEnabled || options.isCdot)) {
528
+ const hyp = getHyp(scope, operator.index);
529
+ const isWrapperDefinition =
530
+ hyp.kind === "Defn" &&
531
+ hyp.definition.kind === "Operator" &&
532
+ (hyp.definition.name === ENABLED_WRAPPER || hyp.definition.name === CDOT_WRAPPER);
533
+ if (isWrapperDefinition) return quantify(lambda.params, lambda.body);
534
+ }
535
+ if (isActionOperator(operator) && isExpanded(operator.builtin)) {
536
+ return quantify(lambda.params, lambda.body);
537
+ }
538
+ }
539
+ if (isActionOperator(operator) && isExpanded(operator.builtin)) {
540
+ return replaceWithQuantifiers(options, onWarning, scope, lambda, true);
541
+ }
542
+ }
543
+ if (isBuiltinApply(expression, "ENABLED") && isInScope) {
544
+ fail(onWarning, expression, NESTED_ENABLED, "Expr.Action");
545
+ }
546
+ if (isBuiltinApply(expression, "Cdot") && isInScope) {
547
+ fail(
548
+ onWarning,
549
+ expression,
550
+ `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`,
551
+ "Expr.Action",
552
+ );
553
+ }
554
+ return mapScoped(
555
+ scope,
556
+ expression,
557
+ (inner, child) => replaceWithQuantifiers(options, onWarning, inner, child, isInScope),
558
+ adjoin,
559
+ );
560
+ };
561
+
562
+ // commute_exists_disjunction: \E x : A \/ B as (\E x : A) \/ (\E x : B), everywhere.
563
+ const commuteExistsDisjunction = (expression: Expr): Expr => {
564
+ if (expression.kind === "Quant" && expression.quantifier === "Exists") {
565
+ const body = expression.body;
566
+ if (body.kind === "List" && body.bullet === "Or") {
567
+ return commuteExistsDisjunction({
568
+ ...body,
569
+ items: body.items.map((item) => ({ ...expression, body: item })),
570
+ });
571
+ }
572
+ if (
573
+ body.kind === "Apply" &&
574
+ body.operator.kind === "Internal" &&
575
+ body.operator.builtin === "Disj"
576
+ ) {
577
+ if (body.args.length !== 2) throw new TlapmBugError();
578
+ return commuteExistsDisjunction({
579
+ ...body,
580
+ args: body.args.map((arg) => ({ ...expression, body: arg })),
581
+ });
582
+ }
583
+ }
584
+ return mapScoped(
585
+ undefined,
586
+ expression,
587
+ (_state, child) => commuteExistsDisjunction(child),
588
+ () => undefined,
589
+ );
590
+ };
591
+
592
+ // expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
593
+ export const expandActionOperators = (
594
+ anonymizer: Anonymizer,
595
+ onWarning: Warn,
375
596
  scope: Scope | undefined,
376
597
  expression: Expr,
598
+ options: ActionOptions,
377
599
  ) => {
378
- const expanded = expandDefinitions(onWarning, scope, expression, undefined);
379
- const bound = shiftIndices(
380
- shift(0),
381
- bindVariables(onWarning, undefined, undefined, scope, expanded),
600
+ const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
601
+ const lambdified = lambdifyOperators(anonymizer, onWarning, scope, expanded, options, true);
602
+ return commuteExistsDisjunction(
603
+ replaceWithQuantifiers(options, onWarning, scope, lambdified, false),
382
604
  );
383
- return checkArity(renameParams(anonymizer.expr(scope, bound)));
384
605
  };
@@ -1,7 +1,7 @@
1
1
  // A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon): names become de Bruijn
2
2
  // indices into the context, builtin definitions are inlined, and anonymous steps get names.
3
3
 
4
- import { TlapmBugError, TlaProofError } from "./errors";
4
+ import { TlapmBugError, TlaProofError } from "../errors";
5
5
  import {
6
6
  adjoin,
7
7
  adjoinAll,
@@ -35,8 +35,9 @@ import {
35
35
  type Selector,
36
36
  type Sequent,
37
37
  type WhereDefined,
38
- } from "./obligation-expression";
39
- import { resolveSubexpression } from "./obligation-deref";
38
+ } from "./expression";
39
+ import { resolveSubexpression } from "./deref";
40
+ import { getTime } from "./temporal";
40
41
  import {
41
42
  getStepName,
42
43
  getUnique,
@@ -46,12 +47,13 @@ import {
46
47
  type StepNumber,
47
48
  type UseDef,
48
49
  type Usable,
49
- } from "./obligation-proof";
50
+ } from "./proof";
50
51
 
51
52
  const DUMMY_FACT: Hyp = {
52
53
  kind: "Fact",
53
54
  expression: { kind: "At", isExcept: false },
54
55
  visibility: "Visible",
56
+ time: "Always",
55
57
  };
56
58
 
57
59
  const ANON_SELECTOR_FAILURES = {
@@ -331,6 +333,7 @@ export const createAnonymizer = (
331
333
  whereDefined: "User",
332
334
  visibility: "Visible",
333
335
  isLocal: true,
336
+ isConstnessUnset: true,
334
337
  });
335
338
  mapped.push(result);
336
339
  }
@@ -346,8 +349,10 @@ export const createAnonymizer = (
346
349
  return item;
347
350
  case "Defn":
348
351
  return { ...item, definition: defn(context, item.definition) };
349
- case "Fact":
350
- return { ...item, expression: expr(context, item.expression) };
352
+ case "Fact": {
353
+ const expression = expr(context, item.expression);
354
+ return { ...item, expression, time: getTime(context.scope, expression) };
355
+ }
351
356
  }
352
357
  })();
353
358
  return [adjoinContext(context, mapped), mapped];
@@ -367,9 +372,10 @@ export const createAnonymizer = (
367
372
  adjoinContext(context, {
368
373
  kind: "Defn",
369
374
  definition: { kind: "Operator", name: getStepName(step), body, location: from.location },
370
- whereDefined: "Proof",
375
+ whereDefined: { kind: "Proof", time: "Always" },
371
376
  visibility: "Visible",
372
377
  isLocal: true,
378
+ isConstnessUnset: true,
373
379
  location: from.location,
374
380
  });
375
381
 
@@ -0,0 +1,64 @@
1
+ // tlapm's Ctx, which names each binder apart from the names in scope by adding a salt, as a
2
+ // mutable stack: printers bind and unbind names in strict nesting order.
3
+
4
+ interface Ident {
5
+ rep: string;
6
+ salt: number;
7
+ }
8
+
9
+ export interface Context {
10
+ stack: Ident[];
11
+ idents: Map<string, Ident[]>;
12
+ defined: Map<string, number>;
13
+ }
14
+
15
+ const getIdentName = (ident: Ident) =>
16
+ ident.salt === 0 ? ident.rep : `${ident.rep}_${ident.salt}`;
17
+
18
+ export const createContext = (): Context => ({
19
+ stack: [],
20
+ idents: new Map(),
21
+ defined: new Map(),
22
+ });
23
+
24
+ // The name of the binder index places in, counting from 1 for the innermost.
25
+ export const getBoundName = (context: Context, index: number) => {
26
+ const ident = context.stack[context.stack.length - index];
27
+ return ident && getIdentName(ident);
28
+ };
29
+
30
+ export const pushName = (context: Context, rep: string) => {
31
+ const previous = context.idents.get(rep)?.at(-1);
32
+ let ident: Ident = previous ? { rep, salt: previous.salt + 1 } : { rep, salt: 0 };
33
+ while (context.defined.has(getIdentName(ident))) ident = { rep, salt: ident.salt + 1 };
34
+ context.stack.push(ident);
35
+ const idents = context.idents.get(rep);
36
+ if (idents) idents.push(ident);
37
+ else context.idents.set(rep, [ident]);
38
+ const key = getIdentName(ident);
39
+ context.defined.set(key, (context.defined.get(key) ?? 0) + 1);
40
+ return key;
41
+ };
42
+
43
+ export const popNames = (context: Context, count: number) => {
44
+ for (let index = 0; index < count; index++) {
45
+ const ident = context.stack.pop();
46
+ if (!ident) return;
47
+ context.idents.get(ident.rep)?.pop();
48
+ const key = getIdentName(ident);
49
+ const remaining = (context.defined.get(key) ?? 1) - 1;
50
+ if (remaining === 0) context.defined.delete(key);
51
+ else context.defined.set(key, remaining);
52
+ }
53
+ };
54
+
55
+ export const withNames = <Result>(
56
+ context: Context,
57
+ names: string[],
58
+ body: (idents: string[]) => Result,
59
+ ) => {
60
+ const idents = names.map((name) => pushName(context, name));
61
+ const result = body(idents);
62
+ popNames(context, names.length);
63
+ return result;
64
+ };
@@ -1,7 +1,7 @@
1
1
  // A port of tlapm's Expr.Deref: a subexpression reference such as Op!2!<< resolves to the
2
2
  // subexpression it names, abstracted over the bound names it uses.
3
3
 
4
- import { TlaProofError, TlapmBugError } from "./errors";
4
+ import { TlaProofError, TlapmBugError } from "../errors";
5
5
  import {
6
6
  at,
7
7
  consAll,
@@ -20,7 +20,7 @@ import {
20
20
  type ObligationWarning,
21
21
  type Param,
22
22
  type Selector,
23
- } from "./obligation-expression";
23
+ } from "./expression";
24
24
 
25
25
  interface Deref {
26
26
  params: Param[];