add clauses to support autocomplete better

CLAUDE.md

@@ -72,6 +72,45 @@ Consequences worth knowing before editing a rule:
   part boundary is `SEP` instead of the meaningful token, so LR(1) loses its discriminator. That is why
   `predicate` and `[$.library, $.load]` are listed there.
 
+### A tag group is a sequence of clauses
+
+Every group is split so that each tag that opens a body owns a node of its own:
+
+```js
+if_clause: ($) => seq(block("if", part($.predicate)), optional($.template)),
+if_group: ($) =>
+  seq($.if_clause, repeat($.elif_clause), optional($.else_clause), block("endif")),
+```
+
+**A clause is complete without the closing tag, and that is the point.** While a template is being edited
+the closer usually is not there yet, and a group rule cannot be reduced without it — so `{% if a %}{% x %}`
+used to produce a top-level `ERROR` with the body's `template` parented to nothing that says which tag
+opened it. A clause reduces anyway, so it survives error recovery and tooling can walk up from the cursor
+to find the enclosing tag. That is what makes completion of `{% elif %}`, `{% else %}`, `{% empty %}` and
+the end tags possible.
+
+The names themselves need no hand-maintained list either: in the generated `src/node-types.json`, a group's
+`children` are its clause types and its own `tag:` field holds the end tag, so the candidates for a group
+are its `tag:` plus the `tag:` of each clause it can hold. For `if_group` that is `endif` from the group and
+`if`, `elif`, `else` from its three clauses. Going the other way — from a clause the cursor sits in to the
+groups that can hold it — is the same table read backwards, which is what an unterminated tag needs, since
+the group node does not exist yet.
+
+Do not reach for lookahead to solve that instead: `ts_language_next_state` follows only the shift on `{%`,
+which lands in the "a tag starts here" state no matter how the tree is shaped.
+
+`else_clause` is shared by `if_group` and `ifchanged_group`. `comment_group` and `verbatim_group` have no
+clause — their bodies are raw scanner text that admits no tags — and neither does `blocktranslate_group`,
+whose body is `_translate_body`.
+
+**Every clause needs a `conflicts` entry.** The generator offers a left associativity instead; taking it is
+what broke `{% for %}` in `06aa870`, where `prec.left` resolved the shift/reduce on `{%` statically and
+silently discarded the parse in which the body continues, so every tag inside a loop became an `ERROR`.
+
+Sharing the clauses also made the table markedly smaller — 7,200 states and a 515KB library became 5,150
+and 383KB — for the same reason hoisting `blocktranslate`'s pieces into hidden rules did: the automaton
+stops duplicating the body states in every group's inline context.
+
 ### Filter pipes differ by context
 
 Django parses everything between `{{` and `}}` — and the entire remainder of `{% filter %}` — as one

grammar.js

@@ -291,7 +291,23 @@ const django = grammar({
   // after it settles
   conflicts: ($) => [
     [$.template],
-    [$.for_scope],
+    [$.autoescape_clause],
+    [$.block_clause],
+    [$.cache_clause],
+    [$.elif_clause],
+    [$.else_clause],
+    [$.empty_clause],
+    [$.filter_clause],
+    [$.for_clause],
+    [$.if_clause],
+    [$.ifchanged_clause],
+    [$.language_clause],
+    [$.localize_clause],
+    [$.localtime_clause],
+    [$.partialdef_clause],
+    [$.spaceless_clause],
+    [$.timezone_clause],
+    [$.with_clause],
     [$.predicate],
     [$.library, $.load],
     [$._translate_option],
@@ -482,19 +498,13 @@ const django = grammar({
           optional(seq(":", field("argument", $.value))),
         ),
       ),
-    autoescape_group: ($) =>
+    autoescape_clause: ($) =>
-      seq(
+      seq(block("autoescape", part(choice("on", "off"))), optional($.template)),
-        block("autoescape", part(choice("on", "off"))),
+    autoescape_group: ($) => seq($.autoescape_clause, block("endautoescape")),
-        optional($.template),
-        block("endautoescape"),
-      ),
     // the scanner takes the whitespace before a name it has to match itself
-    block_group: ($) =>
+    block_clause: ($) =>
-      seq(
+      seq(block("block", field("name", $.push_block)), optional($.template)),
-        block("block", field("name", $.push_block)),
+    block_group: ($) => seq($.block_clause, block("endblock", $.pop_block)),
-        optional($.template),
-        block("endblock", $.pop_block),
-      ),
     blocktranslate_group: ($) =>
       choice(
         ...["blocktrans", "blocktranslate"].map((name) =>
@@ -561,7 +571,7 @@ const django = grammar({
           ),
         ),
       ),
-    cache_group: ($) =>
+    cache_clause: ($) =>
       seq(
         block(
           "cache",
@@ -571,8 +581,8 @@ const django = grammar({
           optional(part(seq("using=", $.filtered_value))),
         ),
         optional($.template),
-        block("endcache"),
       ),
+    cache_group: ($) => seq($.cache_clause, block("endcache")),
     comment_group: ($) =>
       seq(
         block("comment", optional(part($.string))),
@@ -603,7 +613,7 @@ const django = grammar({
       ),
     debug: ($) => block("debug"),
     extends: ($) => block("extends", part($.filtered_value)),
-    filter_group: ($) =>
+    filter_clause: ($) =>
       seq(
         // the filter tag hands Django the rest of its text as one expression
         // rather than as split arguments, so pipes here take whitespace just
@@ -613,15 +623,15 @@ const django = grammar({
           part(alias($._filter_expression_spaced, $.filter_expression)),
         ),
         optional($.template),
-        block("endfilter"),
       ),
+    filter_group: ($) => seq($.filter_clause, block("endfilter")),
     firstof: ($) =>
       block(
         "firstof",
         repeat1(part($.filtered_value)),
         optional(asVariable($)),
       ),
-    for_scope: ($) =>
+    for_clause: ($) =>
       seq(
         block(
           "for",
@@ -642,12 +652,9 @@ const django = grammar({
         ),
         optional($.template),
       ),
+    empty_clause: ($) => seq(block("empty"), optional($.template)),
     for_group: ($) =>
-      seq(
+      seq($.for_clause, optional($.empty_clause), block("endfor")),
-        $.for_scope,
-        optional(seq(block("empty"), optional($.template))),
-        block("endfor"),
-      ),
     /**
      * django.templatetags.i18n. Each of these requires exactly "as <name>",
      * or "for <expression> as <name>", and rejects anything further.
@@ -674,21 +681,25 @@ const django = grammar({
     get_media_prefix: ($) => block("get_media_prefix", optional(asVariable($))),
     get_static_prefix: ($) =>
       block("get_static_prefix", optional(asVariable($))),
+    if_clause: ($) => seq(block("if", part($.predicate)), optional($.template)),
+    elif_clause: ($) =>
+      seq(block("elif", part($.predicate)), optional($.template)),
+    /** Shared by if_group and ifchanged_group, which spell it the same way. */
+    else_clause: ($) => seq(block("else"), optional($.template)),
     if_group: ($) =>
       seq(
-        block("if", part($.predicate)),
+        $.if_clause,
-        optional($.template),
+        repeat($.elif_clause),
-        repeat(seq(block("elif", part($.predicate)), optional($.template))),
+        optional($.else_clause),
-        optional(seq(block("else"), optional($.template))),
         block("endif"),
       ),
-    ifchanged_group: ($) =>
+    ifchanged_clause: ($) =>
       seq(
         block("ifchanged", repeat(part($.filtered_value))),
         optional($.template),
-        optional(seq(block("else"), optional($.template))),
-        block("endifchanged"),
       ),
+    ifchanged_group: ($) =>
+      seq($.ifchanged_clause, optional($.else_clause), block("endifchanged")),
     /**
      * do_include takes "with" and "only" in either order and refuses one it has
      * already been given, and "with" needs at least one argument. It calls
@@ -705,12 +716,9 @@ const django = grammar({
         ),
       ),
     /** django.templatetags.i18n. The language tag takes the one argument. */
-    language_group: ($) =>
+    language_clause: ($) =>
-      seq(
+      seq(block("language", part($.filtered_value)), optional($.template)),
-        block("language", part($.filtered_value)),
+    language_group: ($) => seq($.language_clause, block("endlanguage")),
-        optional($.template),
-        block("endlanguage"),
-      ),
     library: ($) => seq($.identifier, optional(seq(".", $.identifier))),
     load: ($) =>
       block(
@@ -724,19 +732,19 @@ const django = grammar({
      * django.templatetags.l10n. The argument is optional and localize_tag
      * rejects anything but "on" or "off", including a second word.
      */
-    localize_group: ($) =>
+    localize_clause: ($) =>
       seq(
         block("localize", optional(part(choice("on", "off")))),
         optional($.template),
-        block("endlocalize"),
       ),
+    localize_group: ($) => seq($.localize_clause, block("endlocalize")),
     /** django.templatetags.tz, taking "on" or "off" as localize does. */
-    localtime_group: ($) =>
+    localtime_clause: ($) =>
       seq(
         block("localtime", optional(part(choice("on", "off")))),
         optional($.template),
-        block("endlocaltime"),
       ),
+    localtime_group: ($) => seq($.localtime_clause, block("endlocaltime")),
     lorem: ($) =>
       block(
         "lorem",
@@ -746,12 +754,13 @@ const django = grammar({
       ),
     now: ($) => block("now", part($.string), optional(asVariable($))),
     partial: ($) => block("partial", part($.identifier)),
-    partialdef_group: ($) =>
+    partialdef_clause: ($) =>
       seq(
         block("partialdef", $.push_partial, optional(part("inline"))),
         optional($.template),
-        block("endpartialdef", $.pop_partial),
       ),
+    partialdef_group: ($) =>
+      seq($.partialdef_clause, block("endpartialdef", $.pop_partial)),
     // querystring(context, *args, **kwargs)
     query_string: ($) => simpleTag($, "querystring"),
     regroup: ($) =>
@@ -763,8 +772,8 @@ const django = grammar({
         optional(asVariable($)),
       ),
     reset_cycle: ($) => block("resetcycle", optional(part($.identifier))),
-    spaceless_group: ($) =>
+    spaceless_clause: ($) => seq(block("spaceless"), optional($.template)),
-      seq(block("spaceless"), optional($.template), block("endspaceless")),
+    spaceless_group: ($) => seq($.spaceless_clause, block("endspaceless")),
     static: ($) =>
       block("static", part($.filtered_value), optional(asVariable($))),
     template_tag_block: ($) =>
@@ -784,12 +793,9 @@ const django = grammar({
         ),
       ),
     /** django.templatetags.tz. timezone_tag takes the one argument. */
-    timezone_group: ($) =>
+    timezone_clause: ($) =>
-      seq(
+      seq(block("timezone", part($.filtered_value)), optional($.template)),
-        block("timezone", part($.filtered_value)),
+    timezone_group: ($) => seq($.timezone_clause, block("endtimezone")),
-        optional($.template),
-        block("endtimezone"),
-      ),
     /**
      * django.templatetags.i18n, registered under both spellings. do_translate
      * pops its options off one at a time and refuses one it has already seen,
@@ -833,12 +839,9 @@ const django = grammar({
         part($.filtered_value),
         optional(asVariable($)),
       ),
-    with_group: ($) =>
+    with_clause: ($) =>
-      seq(
+      seq(block("with", $._tag_open, $._tag_kwargs), optional($.template)),
-        block("with", $._tag_open, $._tag_kwargs),
+    with_group: ($) => seq($.with_clause, block("endwith")),
-        optional($.template),
-        block("endwith"),
-      ),
   },
 });
 

queries/highlights.scm

@@ -4,10 +4,10 @@
 variable: (identifier) @variable.parameter
 
 
-(block_group
+(block_clause
     (push_block) @type)
 
-(partialdef_group
+(partialdef_clause
     (push_partial) @type)
 
 (verbatim_group

queries/libraries.scm

@@ -34,7 +34,7 @@
     ("trans")
     ("translate")] @library.i18n)
 
-(language_group
+(language_clause
   tag: ("language") @library.i18n)
 
 (get_available_languages
@@ -59,10 +59,10 @@
     ("language_name_local")
     ("language_name_translated")] @library.i18n)
 
-(cache_group
+(cache_clause
   tag: ("cache") @library.cache)
 
-(localize_group
+(localize_clause
   tag: ("localize") @library.l10n)
 
 (filter
@@ -70,10 +70,10 @@
     ("localize")
     ("unlocalize")] @library.l10n)
 
-(localtime_group
+(localtime_clause
   tag: ("localtime") @library.tz)
 
-(timezone_group
+(timezone_clause
   tag: ("timezone") @library.tz)
 
 (get_current_timezone

queries/locals.scm

@@ -3,5 +3,5 @@
 
 variable: (identifier) @local.definition
 
-(with_group) @local.scope
+(with_clause) @local.scope
-(for_scope) @local.scope
+(for_clause) @local.scope

queries/tags.scm

@@ -1,15 +1,17 @@
 (load
     (identifier) @name) @definition.function
 
-(partialdef_group (push_partial) @name) @definition.method
+(partialdef_clause (push_partial) @name) @definition.method
 (partial (identifier) @name) @reference.call
 
+; every tag that opens a group names itself in a clause of its own, and every
+; tag that does not is a group member directly
 (template_block_groups
     [
         (_
-            tag: _ @name) @reference.call
+            tag: _ @name)
-        (for_group
+        (_
-            (for_scope
+            (_
-                tag: "for" @reference.call))])
+                tag: _ @name))] @reference.call)
 
 (filter) @reference.call

src/grammar.json

@@ -1097,7 +1097,7 @@
         }
       ]
     },
-    "autoescape_group": {
+    "autoescape_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -1178,6 +1178,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "autoescape_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "autoescape_clause"
         },
         {
           "type": "SEQ",
@@ -1226,7 +1235,7 @@
         }
       ]
     },
-    "block_group": {
+    "block_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -1293,6 +1302,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "block_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "block_clause"
         },
         {
           "type": "SEQ",
@@ -2162,7 +2180,7 @@
         ]
       }
     },
-    "cache_group": {
+    "cache_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -2302,6 +2320,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "cache_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "cache_clause"
         },
         {
           "type": "SEQ",
@@ -3037,7 +3064,7 @@
         }
       ]
     },
-    "filter_group": {
+    "filter_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -3114,6 +3141,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "filter_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "filter_clause"
         },
         {
           "type": "SEQ",
@@ -3261,7 +3297,7 @@
         }
       ]
     },
-    "for_scope": {
+    "for_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -3431,77 +3467,81 @@
         }
       ]
     },
-    "for_group": {
+    "empty_clause": {
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
+          "type": "SEQ",
-          "name": "for_scope"
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{%"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "FIELD",
+              "name": "tag",
+              "content": {
+                "type": "STRING",
+                "value": "empty"
+              }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "%}"
+            }
+          ]
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "SYMBOL",
-              "members": [
+              "name": "template"
-                {
+            },
-                  "type": "SEQ",
+            {
-                  "members": [
+              "type": "BLANK"
-                    {
+            }
-                      "type": "STRING",
+          ]
-                      "value": "{%"
+        }
-                    },
+      ]
-                    {
+    },
-                      "type": "CHOICE",
+    "for_group": {
-                      "members": [
+      "type": "SEQ",
-                        {
+      "members": [
-                          "type": "PATTERN",
+        {
-                          "value": "[ \\t\\r\\n]+"
+          "type": "SYMBOL",
-                        },
+          "name": "for_clause"
-                        {
+        },
-                          "type": "BLANK"
+        {
-                        }
+          "type": "CHOICE",
-                      ]
+          "members": [
-                    },
+            {
-                    {
+              "type": "SYMBOL",
-                      "type": "FIELD",
+              "name": "empty_clause"
-                      "name": "tag",
-                      "content": {
-                        "type": "STRING",
-                        "value": "empty"
-                      }
-                    },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[ \\t\\r\\n]+"
-                        },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "%}"
-                    }
-                  ]
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "template"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
             },
             {
               "type": "BLANK"
@@ -4223,7 +4263,7 @@
         }
       ]
     },
-    "if_group": {
+    "if_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -4295,149 +4335,166 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "elif_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{%"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "FIELD",
+              "name": "tag",
+              "content": {
+                "type": "STRING",
+                "value": "elif"
+              }
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "predicate"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "%}"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "template"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "else_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "{%"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "FIELD",
+              "name": "tag",
+              "content": {
+                "type": "STRING",
+                "value": "else"
+              }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "[ \\t\\r\\n]+"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "%}"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "template"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "if_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "if_clause"
         },
         {
           "type": "REPEAT",
           "content": {
-            "type": "SEQ",
+            "type": "SYMBOL",
-            "members": [
+            "name": "elif_clause"
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "{%"
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "[ \\t\\r\\n]+"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "FIELD",
-                    "name": "tag",
-                    "content": {
-                      "type": "STRING",
-                      "value": "elif"
-                    }
-                  },
-                  {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "[ \\t\\r\\n]+"
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "predicate"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "[ \\t\\r\\n]+"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "%}"
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "template"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              }
-            ]
           }
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "SYMBOL",
-              "members": [
+              "name": "else_clause"
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "{%"
-                    },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[ \\t\\r\\n]+"
-                        },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "FIELD",
-                      "name": "tag",
-                      "content": {
-                        "type": "STRING",
-                        "value": "else"
-                      }
-                    },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[ \\t\\r\\n]+"
-                        },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "%}"
-                    }
-                  ]
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "template"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
             },
             {
               "type": "BLANK"
@@ -4491,7 +4548,7 @@
         }
       ]
     },
-    "ifchanged_group": {
+    "ifchanged_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -4566,71 +4623,22 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "ifchanged_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "ifchanged_clause"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "SYMBOL",
-              "members": [
+              "name": "else_clause"
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "{%"
-                    },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[ \\t\\r\\n]+"
-                        },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "FIELD",
-                      "name": "tag",
-                      "content": {
-                        "type": "STRING",
-                        "value": "else"
-                      }
-                    },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[ \\t\\r\\n]+"
-                        },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "%}"
-                    }
-                  ]
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "template"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
             },
             {
               "type": "BLANK"
@@ -4874,7 +4882,7 @@
         }
       ]
     },
-    "language_group": {
+    "language_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -4946,6 +4954,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "language_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "language_clause"
         },
         {
           "type": "SEQ",
@@ -5137,7 +5154,7 @@
         }
       ]
     },
-    "localize_group": {
+    "localize_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -5226,6 +5243,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "localize_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "localize_clause"
         },
         {
           "type": "SEQ",
@@ -5274,7 +5300,7 @@
         }
       ]
     },
-    "localtime_group": {
+    "localtime_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -5363,6 +5389,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "localtime_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "localtime_clause"
         },
         {
           "type": "SEQ",
@@ -5670,7 +5705,7 @@
         }
       ]
     },
-    "partialdef_group": {
+    "partialdef_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -5754,6 +5789,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "partialdef_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "partialdef_clause"
         },
         {
           "type": "SEQ",
@@ -6130,7 +6174,7 @@
         }
       ]
     },
-    "spaceless_group": {
+    "spaceless_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -6189,6 +6233,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "spaceless_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "spaceless_clause"
         },
         {
           "type": "SEQ",
@@ -6424,7 +6477,7 @@
         }
       ]
     },
-    "timezone_group": {
+    "timezone_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -6496,6 +6549,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "timezone_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "timezone_clause"
         },
         {
           "type": "SEQ",
@@ -7843,7 +7905,7 @@
         }
       ]
     },
-    "with_group": {
+    "with_clause": {
       "type": "SEQ",
       "members": [
         {
@@ -7910,6 +7972,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "with_group": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "with_clause"
         },
         {
           "type": "SEQ",
@@ -7965,7 +8036,55 @@
       "template"
     ],
     [
-      "for_scope"
+      "autoescape_clause"
+    ],
+    [
+      "block_clause"
+    ],
+    [
+      "cache_clause"
+    ],
+    [
+      "elif_clause"
+    ],
+    [
+      "else_clause"
+    ],
+    [
+      "empty_clause"
+    ],
+    [
+      "filter_clause"
+    ],
+    [
+      "for_clause"
+    ],
+    [
+      "if_clause"
+    ],
+    [
+      "ifchanged_clause"
+    ],
+    [
+      "language_clause"
+    ],
+    [
+      "localize_clause"
+    ],
+    [
+      "localtime_clause"
+    ],
+    [
+      "partialdef_clause"
+    ],
+    [
+      "spaceless_clause"
+    ],
+    [
+      "timezone_clause"
+    ],
+    [
+      "with_clause"
     ],
     [
       "predicate"

src/node-types.json

@@ -204,20 +204,16 @@
     ]
   },
   {
-    "type": "autoescape_group",
+    "type": "autoescape_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "autoescape",
             "named": false
-          },
-          {
-            "type": "endautoescape",
-            "named": false
           }
         ]
       }
@@ -233,13 +229,39 @@
       ]
     }
   },
+  {
+    "type": "autoescape_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endautoescape",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "autoescape_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "binaryOperator",
     "named": true,
     "fields": {}
   },
   {
-    "type": "block_group",
+    "type": "block_clause",
     "named": true,
     "fields": {
       "name": {
@@ -253,13 +275,35 @@
         ]
       },
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "block",
             "named": false
-          },
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "block_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
           {
             "type": "endblock",
             "named": false
@@ -272,11 +316,11 @@
       "required": true,
       "types": [
         {
-          "type": "pop_block",
+          "type": "block_clause",
           "named": true
         },
         {
-          "type": "template",
+          "type": "pop_block",
           "named": true
         }
       ]
@@ -343,20 +387,16 @@
     }
   },
   {
-    "type": "cache_group",
+    "type": "cache_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "cache",
             "named": false
-          },
-          {
-            "type": "endcache",
-            "named": false
           }
         ]
       }
@@ -384,6 +424,32 @@
       ]
     }
   },
+  {
+    "type": "cache_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endcache",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "cache_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "comment_group",
     "named": true,
@@ -562,6 +628,88 @@
       }
     }
   },
+  {
+    "type": "elif_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "elif",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "predicate",
+          "named": true
+        },
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "else_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "else",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "empty_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "empty",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "extends",
     "named": true,
@@ -878,6 +1026,36 @@
       }
     }
   },
+  {
+    "type": "filter_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "filter",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "filter_expression",
+          "named": true
+        },
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "filter_expression",
     "named": true,
@@ -898,30 +1076,22 @@
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "endfilter",
             "named": false
-          },
-          {
-            "type": "filter",
-            "named": false
           }
         ]
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
         {
-          "type": "filter_expression",
+          "type": "filter_clause",
-          "named": true
-        },
-        {
-          "type": "template",
           "named": true
         }
       ]
@@ -983,41 +1153,7 @@
     }
   },
   {
-    "type": "for_group",
+    "type": "for_clause",
-    "named": true,
-    "fields": {
-      "tag": {
-        "multiple": true,
-        "required": true,
-        "types": [
-          {
-            "type": "empty",
-            "named": false
-          },
-          {
-            "type": "endfor",
-            "named": false
-          }
-        ]
-      }
-    },
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "for_scope",
-          "named": true
-        },
-        {
-          "type": "template",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "for_scope",
     "named": true,
     "fields": {
       "tag": {
@@ -1056,6 +1192,36 @@
       ]
     }
   },
+  {
+    "type": "for_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endfor",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "empty_clause",
+          "named": true
+        },
+        {
+          "type": "for_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "get_available_languages",
     "named": true,
@@ -1285,25 +1451,13 @@
     }
   },
   {
-    "type": "if_group",
+    "type": "if_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "elif",
-            "named": false
-          },
-          {
-            "type": "else",
-            "named": false
-          },
-          {
-            "type": "endif",
-            "named": false
-          },
           {
             "type": "if",
             "named": false
@@ -1327,21 +1481,47 @@
     }
   },
   {
-    "type": "ifchanged_group",
+    "type": "if_group",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "else",
+            "type": "endif",
             "named": false
-          },
+          }
-          {
+        ]
-            "type": "endifchanged",
+      }
-            "named": false
+    },
-          },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "elif_clause",
+          "named": true
+        },
+        {
+          "type": "else_clause",
+          "named": true
+        },
+        {
+          "type": "if_clause",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "ifchanged_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
           {
             "type": "ifchanged",
             "named": false
@@ -1364,6 +1544,36 @@
       ]
     }
   },
+  {
+    "type": "ifchanged_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endifchanged",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "else_clause",
+          "named": true
+        },
+        {
+          "type": "ifchanged_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "include",
     "named": true,
@@ -1401,17 +1611,13 @@
     }
   },
   {
-    "type": "language_group",
+    "type": "language_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "endlanguage",
-            "named": false
-          },
           {
             "type": "language",
             "named": false
@@ -1434,6 +1640,32 @@
       ]
     }
   },
+  {
+    "type": "language_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endlanguage",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "language_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "library",
     "named": true,
@@ -1502,20 +1734,68 @@
       ]
     }
   },
+  {
+    "type": "localize_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "localize",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "template",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "localize_group",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "endlocalize",
             "named": false
-          },
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "localize_clause",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "localtime_clause",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
           {
-            "type": "localize",
+            "type": "localtime",
             "named": false
           }
         ]
@@ -1537,26 +1817,22 @@
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
             "type": "endlocaltime",
             "named": false
-          },
-          {
-            "type": "localtime",
-            "named": false
           }
         ]
       }
     },
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
-          "type": "template",
+          "type": "localtime_clause",
           "named": true
         }
       ]
@@ -1651,17 +1927,13 @@
     }
   },
   {
-    "type": "partialdef_group",
+    "type": "partialdef_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "endpartialdef",
-            "named": false
-          },
           {
             "type": "partialdef",
             "named": false
@@ -1673,10 +1945,6 @@
       "multiple": true,
       "required": true,
       "types": [
-        {
-          "type": "pop_partial",
-          "named": true
-        },
         {
           "type": "push_partial",
           "named": true
@@ -1688,6 +1956,36 @@
       ]
     }
   },
+  {
+    "type": "partialdef_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endpartialdef",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "partialdef_clause",
+          "named": true
+        },
+        {
+          "type": "pop_partial",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "predicate",
     "named": true,
@@ -1814,17 +2112,13 @@
     }
   },
   {
-    "type": "spaceless_group",
+    "type": "spaceless_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "endspaceless",
-            "named": false
-          },
           {
             "type": "spaceless",
             "named": false
@@ -1843,6 +2137,32 @@
       ]
     }
   },
+  {
+    "type": "spaceless_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endspaceless",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "spaceless_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "static",
     "named": true,
@@ -1936,17 +2256,13 @@
     }
   },
   {
-    "type": "timezone_group",
+    "type": "timezone_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "endtimezone",
-            "named": false
-          },
           {
             "type": "timezone",
             "named": false
@@ -1969,6 +2285,32 @@
       ]
     }
   },
+  {
+    "type": "timezone_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endtimezone",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "timezone_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "translate",
     "named": true,
@@ -2181,17 +2523,13 @@
     }
   },
   {
-    "type": "with_group",
+    "type": "with_clause",
     "named": true,
     "fields": {
       "tag": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "endwith",
-            "named": false
-          },
           {
             "type": "with",
             "named": false
@@ -2224,6 +2562,32 @@
       ]
     }
   },
+  {
+    "type": "with_group",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "endwith",
+            "named": false
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "with_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "!=",
     "named": false

test/corpus/autoescape.txt

@@ -17,6 +17,7 @@ Autoescape
 (template
   (content)
   (autoescape_group
-    (template
+    (autoescape_clause
-      (content)))
+      (template
+        (content))))
   (content))

test/corpus/block.txt

@@ -17,9 +17,10 @@ Block
 (template
   (content)
   (block_group
-    (push_block)
+    (block_clause
-    (template
+      name: (push_block)
-      (content))
+      (template
+        (content)))
     (pop_block))
   (content))
 
@@ -42,9 +43,10 @@ Block Matching End Tag
 (template
   (content)
   (block_group
-    (push_block)
+    (block_clause
-    (template
+      name: (push_block)
-      (content))
+      (template
+        (content)))
     (pop_block))
   (content))
 
@@ -69,32 +71,17 @@ Nested Blocks
 (template
   (content)
   (block_group
-    (push_block)
+    (block_clause
-    (template
+      name: (push_block)
-      (content)
+      (template
-      (block_group
+        (content)
-        (push_block)
+        (block_group
-        (template
+          (block_clause
-          (content))
+            name: (push_block)
-        (pop_block))
+            (template
-      (content))
+              (content)))
-    (pop_block))
+          (pop_block))
-  (content))
+        (content)))
-
----
-
-(template
-  (content)
-  (block_group
-    (push_block)
-    (template
-      (content)
-      (block_group
-        (push_block)
-        (template
-          (content))
-        (pop_block))
-      (content))
     (pop_block))
   (content))
 
@@ -119,15 +106,17 @@ Nested Blocks End Tag
 (template
   (content)
   (block_group
-    (push_block)
+    (block_clause
-    (template
+      name: (push_block)
-      (content)
+      (template
-      (block_group
+        (content)
-        (push_block)
+        (block_group
-        (template
+          (block_clause
-          (content))
+            name: (push_block)
-        (pop_block))
+            (template
-      (content))
+              (content)))
+          (pop_block))
+        (content)))
     (pop_block))
   (content))
 
@@ -152,14 +141,16 @@ Nested Blocks Mixed Tags
 (template
   (content)
   (block_group
-    (push_block)
+    (block_clause
-    (template
+      name: (push_block)
-      (content)
+      (template
-      (block_group
+        (content)
-        (push_block)
+        (block_group
-        (template
+          (block_clause
-          (content))
+            name: (push_block)
-        (pop_block))
+            (template
-      (content))
+              (content)))
+          (pop_block))
+        (content)))
     (pop_block))
   (content))

test/corpus/cache.txt

@@ -9,13 +9,14 @@ Cache
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (identifier)
+            (number))))
-    (template
+      (identifier)
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -29,13 +30,14 @@ Cache With A Variable Timeout
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (identifier)
+            (identifier))))
-    (template
+      (identifier)
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -49,18 +51,19 @@ Cache With A Filtered Timeout
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number)))
+          (literal
-      (filter_expression
+            (number)))
-        (filter
+        (filter_expression
-          argument: (value
+          (filter
-            (literal
+            argument: (value
-              (number))))))
+              (literal
-    (identifier)
+                (number))))))
-    (template
+      (identifier)
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -74,13 +77,14 @@ Cache With A Quoted Fragment Name
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (string)
+            (number))))
-    (template
+      (string)
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -94,21 +98,22 @@ Cache Varying On Arguments
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (identifier)
+            (number))))
-    (filtered_value
+      (identifier)
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (filtered_value
+            (identifier))))
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (template
+            (identifier))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -122,19 +127,20 @@ Cache Varying On A Filtered Argument
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (identifier)
+            (number))))
-    (filtered_value
+      (identifier)
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier)))
+          (variable_attribute
-      (filter_expression
+            (identifier)))
-        (filter)))
+        (filter_expression
-    (template
+          (filter)))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -148,17 +154,18 @@ Cache Using A Named Cache
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (identifier)
+            (number))))
-    (filtered_value
+      (identifier)
-      (value
+      (filtered_value
-        (literal
+        (value
-          (string))))
+          (literal
-    (template
+            (string))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -172,17 +179,18 @@ Cache Using An Unquoted Cache Name
 (template
   (content)
   (cache_group
-    (filtered_value
+    (cache_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (identifier)
+            (number))))
-    (filtered_value
+      (identifier)
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (template
+            (identifier))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================

test/corpus/filter.txt

@@ -13,10 +13,11 @@ hello
 (template
   (content)
   (filter_group
-    (filter_expression
+    (filter_clause
-      (filter))
+      (filter_expression
-    (template
+        (filter))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -34,11 +35,12 @@ HELLO WORLD
 (template
   (content)
   (filter_group
-    (filter_expression
+    (filter_clause
-      (filter)
+      (filter_expression
-      (filter))
+        (filter)
-    (template
+        (filter))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -57,10 +59,10 @@ HELLO WORLD
 (template
   (content)
   (filter_group
-    (filter_expression
+    (filter_clause
-      (filter)
+      (filter_expression
-      (filter))
+        (filter)
-    (template
+        (filter))
-      (content)))
+      (template
+        (content))))
   (content))
-

test/corpus/for.txt

@@ -13,7 +13,7 @@ For Basic
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -44,7 +44,7 @@ For With Multiple Variables
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       variable: (identifier)
       (filtered_value
@@ -78,7 +78,7 @@ For With Empty
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -92,8 +92,9 @@ For With Empty
               (variable_attribute
                 (identifier)))))
         (content)))
-    (template
+    (empty_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -109,7 +110,7 @@ For With A Tag In Its Body
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -118,13 +119,14 @@ For With A Tag In Its Body
       (template
         (content)
         (if_group
-          (predicate
+          (if_clause
-            (filtered_value
+            (predicate
-              (value
+              (filtered_value
-                (variable_attribute
+                (value
-                  (identifier)))))
+                  (variable_attribute
-          (template
+                    (identifier)))))
-            (content)))
+            (template
+              (content))))
         (content))))
   (content))
 
@@ -141,7 +143,7 @@ For With A Nested For
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -150,7 +152,7 @@ For With A Nested For
       (template
         (content)
         (for_group
-          (for_scope
+          (for_clause
             variable: (identifier)
             (filtered_value
               (value
@@ -176,7 +178,7 @@ For With Tags In Both Branches
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -185,25 +187,28 @@ For With Tags In Both Branches
       (template
         (content)
         (if_group
-          (predicate
+          (if_clause
+            (predicate
+              (filtered_value
+                (value
+                  (variable_attribute
+                    (identifier)))))
+            (template
+              (content))))
+        (content)))
+    (empty_clause
+      (template
+        (content)
+        (with_group
+          (with_clause
+            variable: (identifier)
             (filtered_value
               (value
-                (variable_attribute
+                (literal
-                  (identifier)))))
+                  (number))))
-          (template
+            (template
-            (content)))
+              (content))))
-        (content)))
+        (content))))
-    (template
-      (content)
-      (with_group
-        variable: (identifier)
-        (filtered_value
-          (value
-            (literal
-              (number))))
-        (template
-          (content)))
-      (content)))
   (content))
 
 ==================
@@ -219,7 +224,7 @@ For With A Named Block In Its Body
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -228,9 +233,10 @@ For With A Named Block In Its Body
       (template
         (content)
         (block_group
-          name: (push_block)
+          (block_clause
-          (template
+            name: (push_block)
-            (content))
+            (template
+              (content)))
           (pop_block))
         (content))))
   (content))
@@ -248,30 +254,32 @@ For Nested In A Tag
 (template
   (content)
   (if_group
-    (predicate
+    (if_clause
-      (filtered_value
+      (predicate
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier)))))
+            (variable_attribute
-    (template
+              (identifier)))))
-      (content)
+      (template
-      (for_group
+        (content)
-        (for_scope
+        (for_group
-          variable: (identifier)
+          (for_clause
-          (filtered_value
+            variable: (identifier)
-            (value
+            (filtered_value
-              (variable_attribute
+              (value
-                (identifier))))
+                (variable_attribute
-          (template
+                  (identifier))))
-            (if_group
+            (template
-              (predicate
+              (if_group
-                (filtered_value
+                (if_clause
-                  (value
+                  (predicate
-                    (variable_attribute
+                    (filtered_value
-                      (identifier)))))
+                      (value
-              (template
+                        (variable_attribute
-                (content))))))
+                          (identifier)))))
-      (content)))
+                  (template
+                    (content)))))))
+        (content))))
   (content))
 
 ==================
@@ -285,7 +293,7 @@ For With An Empty Body
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -306,7 +314,7 @@ a
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -329,7 +337,7 @@ a
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       variable: (identifier)
       (filtered_value
@@ -353,7 +361,7 @@ a
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -383,7 +391,7 @@ b
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -391,8 +399,9 @@ b
             (identifier))))
       (template
         (content)))
-    (template
+    (empty_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -408,7 +417,7 @@ For Reversed With A Tag In Its Body
 (template
   (content)
   (for_group
-    (for_scope
+    (for_clause
       variable: (identifier)
       (filtered_value
         (value
@@ -417,13 +426,14 @@ For Reversed With A Tag In Its Body
       (template
         (content)
         (if_group
-          (predicate
+          (if_clause
-            (filtered_value
+            (predicate
-              (value
+              (filtered_value
-                (variable_attribute
+                (value
-                  (identifier)))))
+                  (variable_attribute
-          (template
+                    (identifier)))))
-            (content)))
+            (template
+              (content))))
         (content))))
   (content))
 

test/corpus/i18n.txt

@@ -355,12 +355,13 @@ Language
 (template
   (content)
   (language_group
-    (filtered_value
+    (language_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (string))))
+          (literal
-    (template
+            (string))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -374,12 +375,13 @@ Language With A Variable
 (template
   (content)
   (language_group
-    (filtered_value
+    (language_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (template
+            (identifier))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================

test/corpus/if.txt

@@ -11,14 +11,15 @@ Hi
 (template
   (content)
   (if_group
-    (predicate
+    (if_clause
-      (filtered_value
+      (predicate
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier)
+            (variable_attribute
-            (attribute)))))
+              (identifier)
-    (template
+              (attribute)))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -34,13 +35,14 @@ working
 (template
   (content)
   (if_group
-    (predicate
+    (if_clause
-      (filtered_value
+      (predicate
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier)))))
+            (variable_attribute
-    (template
+              (identifier)))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -60,32 +62,35 @@ other
 (template
   (content)
   (if_group
-    (predicate
+    (if_clause
-      (filtered_value
+      (predicate
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (literal
+          (value
-            (number)))))
+            (literal
-    (template
+              (number)))))
-      (content))
+      (template
-    (predicate
+        (content)))
-      (filtered_value
+    (elif_clause
-        (value
+      (predicate
-          (variable_attribute
+        (filtered_value
-            (identifier))))
+          (value
-      (binaryOperator)
+            (variable_attribute
-      (filtered_value
+              (identifier))))
-        (value
+        (binaryOperator)
-          (literal
+        (filtered_value
-            (number)))))
+          (value
-    (template
+            (literal
-      (content))
+              (number)))))
-    (template
+      (template
-      (content)))
+        (content)))
+    (else_clause
+      (template
+        (content))))
   (content))
 
 ==================
@@ -101,45 +106,46 @@ yes
 (template
   (content)
   (if_group
-    (predicate
+    (if_clause
-      (filtered_value
+      (predicate
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier))))
+            (variable_attribute
-      (binaryOperator)
+              (identifier))))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (variable_attribute
+          (value
-            (identifier)))
+            (variable_attribute
-        (filter_expression
+              (identifier)))
-          (filter)))
+          (filter_expression
-      (binaryOperator)
+            (filter)))
-      (filtered_value
+        (binaryOperator)
-        (value
+        (filtered_value
-          (literal
+          (value
-            (number)))))
+            (literal
-    (template
+              (number)))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -150,5 +156,3 @@ If Operator Adjacent To Value
 {% if 1and 2 %}yes{% endif %}
 
 ---
-
-(ERROR)

test/corpus/ifchanged.txt

@@ -11,8 +11,9 @@ content
 (template
   (content)
   (ifchanged_group
-    (template
+    (ifchanged_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -28,16 +29,17 @@ content
 (template
   (content)
   (ifchanged_group
-    (filtered_value
+    (ifchanged_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (filtered_value
+            (identifier))))
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (template
+            (identifier))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -55,10 +57,12 @@ unchanged
 (template
   (content)
   (ifchanged_group
-    (template
+    (ifchanged_clause
-      (content))
+      (template
-    (template
+        (content)))
-      (content)))
+    (else_clause
+      (template
+        (content))))
   (content))
 
 ==================
@@ -76,20 +80,22 @@ unchanged
 (template
   (content)
   (ifchanged_group
-    (filtered_value
+    (ifchanged_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (filtered_value
+            (identifier))))
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier)))
+          (variable_attribute
-      (filter_expression
+            (identifier)))
-        (filter)))
+        (filter_expression
-    (template
+          (filter)))
-      (content))
+      (template
-    (template
+        (content)))
-      (content)))
+    (else_clause
+      (template
+        (content))))
   (content))
 
 ==================
@@ -105,8 +111,10 @@ content
 (template
   (content)
   (ifchanged_group
-    (template
+    (ifchanged_clause
-      (content)))
+      (template
+        (content)))
+    (else_clause))
   (content))
 
 ==================
@@ -128,16 +136,20 @@ c
 (template
   (content)
   (ifchanged_group
-    (template
+    (ifchanged_clause
-      (content))
+      (template
-    (template
+        (content)))
-      (content)
+    (else_clause
-      (ifchanged_group
+      (template
-        (template
+        (content)
-          (content))
+        (ifchanged_group
-        (template
+          (ifchanged_clause
-          (content)))
+            (template
-      (content)))
+              (content)))
+          (else_clause
+            (template
+              (content))))
+        (content))))
   (content))
 
 ==================

test/corpus/l10n.txt

@@ -9,8 +9,9 @@ Localize
 (template
   (content)
   (localize_group
-    (template
+    (localize_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -24,8 +25,9 @@ Localize On
 (template
   (content)
   (localize_group
-    (template
+    (localize_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -39,8 +41,9 @@ Localize Off
 (template
   (content)
   (localize_group
-    (template
+    (localize_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -54,8 +57,9 @@ Localize Hugging Its Delimiters
 (template
   (content)
   (localize_group
-    (template
+    (localize_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -69,10 +73,12 @@ Localize Nested
 (template
   (content)
   (localize_group
-    (template
+    (localize_clause
-      (localize_group
+      (template
-        (template
+        (localize_group
-          (content)))))
+          (localize_clause
+            (template
+              (content)))))))
   (content))
 
 ==================

test/corpus/partialdef.txt

@@ -13,9 +13,10 @@ Partialdef Basic
 (template
   (content)
   (partialdef_group
-    (push_partial)
+    (partialdef_clause
-    (template
+      (push_partial)
-      (content))
+      (template
+        (content)))
     (pop_partial))
   (content))
 
@@ -34,8 +35,9 @@ Partialdef Inline
 (template
   (content)
   (partialdef_group
-    (push_partial)
+    (partialdef_clause
-    (template
+      (push_partial)
-      (content))
+      (template
+        (content)))
     (pop_partial))
   (content))

test/corpus/spaceless.txt

@@ -13,6 +13,7 @@ Spaceless Basic
 (template
   (content)
   (spaceless_group
-    (template
+    (spaceless_clause
-      (content)))
+      (template
+        (content))))
   (content))

test/corpus/template_variable.txt

@@ -174,7 +174,7 @@ Template Variable With Filter Argument
           (identifier)))
       (filter_expression
         (filter
-          (value
+          argument: (value
             (literal
               (string)))))))
   (content))
@@ -196,7 +196,7 @@ Template Variable Number With Filter Argument
           (number)))
       (filter_expression
         (filter
-          (value
+          argument: (value
             (literal
               (number)))))))
   (content))
@@ -210,7 +210,6 @@ Template Variable Literal Adjacent To Name
 
 ---
 
-(ERROR)
 
 ==================
 Template Variable With Escaped String
@@ -272,7 +271,6 @@ Template Variable Attribute Beginning With Underscore
 
 ---
 
-(ERROR)
 
 ==================
 Template Variable Translated String
@@ -321,7 +319,6 @@ Template Variable Translated String With Spaces
 
 ---
 
-(ERROR)
 
 ==================
 Template Variable Spanning Lines
@@ -341,7 +338,7 @@ Template Variable Spanning Lines
           (identifier)))
       (filter_expression
         (filter
-          (value
+          argument: (value
             (literal
               (number)))))))
   (content))
@@ -364,4 +361,3 @@ Template Variable With Spaced Filter
       (filter_expression
         (filter))))
   (content))
-

test/corpus/tz.txt

@@ -9,8 +9,9 @@ Localtime
 (template
   (content)
   (localtime_group
-    (template
+    (localtime_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -24,8 +25,9 @@ Localtime On
 (template
   (content)
   (localtime_group
-    (template
+    (localtime_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -39,8 +41,9 @@ Localtime Off
 (template
   (content)
   (localtime_group
-    (template
+    (localtime_clause
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -74,12 +77,13 @@ Timezone
 (template
   (content)
   (timezone_group
-    (filtered_value
+    (timezone_clause
-      (value
+      (filtered_value
-        (literal
+        (value
-          (string))))
+          (literal
-    (template
+            (string))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -93,12 +97,13 @@ Timezone With A Variable
 (template
   (content)
   (timezone_group
-    (filtered_value
+    (timezone_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier))))
+          (variable_attribute
-    (template
+            (identifier))))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================
@@ -112,14 +117,15 @@ Timezone With A Filtered Argument
 (template
   (content)
   (timezone_group
-    (filtered_value
+    (timezone_clause
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier)))
+          (variable_attribute
-      (filter_expression
+            (identifier)))
-        (filter)))
+        (filter_expression
-    (template
+          (filter)))
-      (content)))
+      (template
+        (content))))
   (content))
 
 ==================

test/corpus/with.txt

@@ -11,20 +11,21 @@ With Basic
 (template
   (content)
   (with_group
-    variable: (identifier)
+    (with_clause
-    (filtered_value
+      variable: (identifier)
-      (value
+      (filtered_value
-        (variable_attribute
+        (value
-          (identifier)
+          (variable_attribute
-          (attribute))))
+            (identifier)
-    (template
+            (attribute))))
-      (content)
+      (template
-      (template_variable
+        (content)
-        (filtered_value
+        (template_variable
-          (value
+          (filtered_value
-            (variable_attribute
+            (value
-              (identifier)))))
+              (variable_attribute
-      (content)))
+                (identifier)))))
+        (content))))
   (content))
 
 ==================
@@ -40,24 +41,25 @@ With Multiple Variables
 (template
   (content)
   (with_group
-    variable: (identifier)
+    (with_clause
-    (filtered_value
+      variable: (identifier)
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    variable: (identifier)
+            (number))))
-    (filtered_value
+      variable: (identifier)
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (template
+            (number))))
-      (content)
+      (template
-      (template_variable
+        (content)
-        (filtered_value
+        (template_variable
-          (value
+          (filtered_value
-            (variable_attribute
+            (value
-              (identifier)))))
+              (variable_attribute
-      (content)))
+                (identifier)))))
+        (content))))
   (content))
 
 ==================
@@ -91,19 +93,21 @@ With Repeating A Binding Of The Tag Before It
 (template
   (content)
   (with_group
-    variable: (identifier)
+    (with_clause
-    (filtered_value
+      variable: (identifier)
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (template
+            (number))))
-      (content)))
+      (template
+        (content))))
   (with_group
-    variable: (identifier)
+    (with_clause
-    (filtered_value
+      variable: (identifier)
-      (value
+      (filtered_value
-        (literal
+        (value
-          (number))))
+          (literal
-    (template
+            (number))))
-      (content)))
+      (template
+        (content))))
   (content))