massive rename

queries/conditionals.scm

@@ -22,7 +22,7 @@
 ; If it is not, some pass through it binds nothing, so every definition inside
 ; is conditional. If it is, a definition escapes only when every branch makes
 ; it. Each capture names both halves of the pair, so no ancestor walk is needed
-; and no clause has to be attributed to a group by name.
+; and no block has to be attributed to a group by name.
 ;
 ; Branches nest, so the same test applies again to a group inside a branch.
 ;
@@ -34,20 +34,20 @@
 ; of the three pushes a context, so this is the case the check exists for.
 (if_group
   [
-    (if_clause)
-    (elif_clause)
+    (if_block)
+    (elif_block)
   ] @conditional.branch) @conditional.group
 
 (if_group
-  (else_clause) @conditional.default) @conditional.group
+  (else_block) @conditional.default) @conditional.group
 
 ; ifchanged renders its body only when the watched value differs from the
 ; previous pass, and its else otherwise. It pushes no context either.
 (ifchanged_group
-  (ifchanged_clause) @conditional.branch) @conditional.group
+  (ifchanged_block) @conditional.branch) @conditional.group
 
 (ifchanged_group
-  (else_clause) @conditional.default) @conditional.group
+  (else_block) @conditional.default) @conditional.group
 
 ; The loop body runs once per item and empty runs when there are none, so the
 ; two partition every render. Both are inside ForNode's context.push() — the
@@ -55,21 +55,21 @@
 ; nothing escapes either way. Named here because the construct does branch, and
 ; because a tool reading only this file should not have to infer that it does.
 (for_group
-  (for_clause) @conditional.branch) @conditional.group
+  (for_block) @conditional.branch) @conditional.group
 
 (for_group
-  (empty_clause) @conditional.default) @conditional.group
+  (empty_block) @conditional.default) @conditional.group
 
 ; A cache body is skipped entirely on a cache hit, and CacheNode pushes no
 ; context, so a binding made inside it reaches the rest of the template on the
 ; first render and is gone on the next. One branch and no default: never
 ; exhaustive, which is the right answer.
 (cache_group
-  (cache_clause) @conditional.branch) @conditional.group
+  (cache_block) @conditional.branch) @conditional.group
 
 ; Not here, deliberately: block and partialdef bodies may also fail to render —
 ; a child template overrides the block, and a partial renders only where
-; {% partial %} names it — but both clauses are @local.scope in locals.scm, so
+; {% partial %} names it — but both blocks are @local.scope in locals.scm, so
 ; nothing they bind escapes to be checked. Bodies that always render once
 ; (with, filter, autoescape, spaceless, language, localize, localtime,
 ; timezone) are not conditional at all, and comment, verbatim and