add unexpected argument error

test/corpus/blocktranslate.txt

@@ -380,13 +380,29 @@ Blocktrans With Plural And No Count
 
 ==================
 Blocktrans Counting Two Bindings
-:error
 ==================
 
 {% blocktrans count n=x c=d %}one{% plural %}many{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier))))
+        (unexpected_argument))
+      (content)
+      (plural_block
+        (plural_tag)
+        (content)))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Nothing To Bind
@@ -400,13 +416,21 @@ Blocktrans With Nothing To Bind
 
 ==================
 Blocktrans With An Unknown Option
-:error
 ==================
 
 {% blocktrans bogus %}hi{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Asvar And No Name
@@ -478,73 +502,155 @@ Blocktrans With Two Plurals
 
 ==================
 Blocktrans With An Argument On Plural
-:error
 ==================
 
 {% blocktrans count n=x %}one{% plural extra %}many{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier)))))
+      (content)
+      (plural_block
+        (plural_tag
+          (unexpected_argument))
+        (content)))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Trimmed Twice
-:error
 ==================
 
 {% blocktrans trimmed trimmed %}hi{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With With Twice
-:error
 ==================
 
 {% blocktrans with a=b with c=d %}hi{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier))))
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Context Twice
-:error
 ==================
 
 {% blocktrans context "a" context "b" %}hi{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (filtered_value
+          (value
+            (literal
+              (string))))
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Asvar Twice
-:error
 ==================
 
 {% blocktrans asvar x asvar y %}hi{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktrans With Count Twice
-:error
 ==================
 
 {% blocktrans count n=x count m=y %}a{% plural %}b{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier))))
+        (unexpected_argument))
+      (content)
+      (plural_block
+        (plural_tag)
+        (content)))
+    (endblocktrans_tag))
+  (content))
 
 ==================
 Blocktranslate With Trimmed Twice
-:error
 ==================
 
 {% blocktranslate trimmed trimmed %}hi{% endblocktranslate %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktranslate_block
+      (blocktranslate_tag
+        (unexpected_argument))
+      (content))
+    (endblocktranslate_tag))
+  (content))
 
 ==================
 Blocktrans Repeating An Option Of The Tag Before It
@@ -570,10 +676,23 @@ Blocktrans Repeating An Option Of The Tag Before It
 
 ==================
 Blocktrans With A Binding Twice
-:error
 ==================
 
 {% blocktrans with a=1 a=2 %}x{% endblocktrans %}
 
 ---
 
+(template
+  (content)
+  (blocktranslate_group
+    (blocktrans_block
+      (blocktrans_tag
+        (identifier)
+        (filtered_value
+          (value
+            (literal
+              (number))))
+        (unexpected_argument))
+      (content))
+    (endblocktrans_tag))
+  (content))

test/corpus/cache.txt

@@ -221,13 +221,31 @@ Cache Without A Fragment Name
 
 ==================
 Cache With Anything After Using
-:error
 ==================
 
 {% cache 500 sidebar using="c" extra %}x{% endcache %}
 
 ---
 
+(template
+  (content)
+  (cache_group
+    (cache_block
+      (cache_tag
+        (filtered_value
+          (value
+            (literal
+              (number))))
+        (identifier)
+        (filtered_value
+          (value
+            (literal
+              (string))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endcache_tag))
+  (content))
 
 ==================
 Cache With An Empty Using
@@ -257,3 +275,4 @@ Cache With Using As Its Fragment Name
 {% cache 500 using="c" %}x{% endcache %}
 
 ---
+

test/corpus/csp_nonce_attr.txt

@@ -48,14 +48,21 @@ Csp Nonce Attr With Media Keyword
 
 ==================
 Csp Nonce Attr Takes One Argument
-:error
 ==================
 
 {% csp_nonce_attr "a" "b" %}
 
 ---
 
-(ERROR)
+(template
+  (content)
+  (csp_nonce_attr_tag
+    (filtered_value
+      (value
+        (literal
+          (string))))
+    (unexpected_argument))
+  (content))
 
 ==================
 Csp Nonce Attr Rejects Unknown Keyword
@@ -68,6 +75,7 @@ Csp Nonce Attr Rejects Unknown Keyword
 
 (ERROR)
 
+
 ==================
 Csp Nonce Attr Rejects Repeated Keyword
 :error
@@ -88,3 +96,4 @@ Csp Nonce Attr With Media Twice
 {% csp_nonce_attr media="a" media="b" %}
 
 ---
+

test/corpus/for.txt

@@ -486,13 +486,27 @@ For Reversed With A Tag In Its Body
 
 ==================
 For With Reversed Twice
-:error
 ==================
 
 {% for x in y reversed reversed %}a{% endfor %}
 
 ---
 
+(template
+  (content)
+  (for_group
+    (for_block
+      (for_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endfor_tag))
+  (content))
 
 ==================
 For With Reversed Before In
@@ -503,6 +517,7 @@ For With Reversed Before In
 
 ---
 
+
 ==================
 For Over A Variable Named Reversed
 ==================
@@ -587,10 +602,24 @@ For With Reversed As Its Whole Sequence
 
 ==================
 For With Reversed Three Times
-:error
 ==================
 
 {% for x in reversed reversed reversed %}a{% endfor %}
 
 ---
 
+(template
+  (content)
+  (for_group
+    (for_block
+      (for_tag
+        (identifier)
+        (filtered_value
+          (value
+            (variable_attribute
+              (identifier))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endfor_tag))
+  (content))

test/corpus/i18n.txt

@@ -400,13 +400,26 @@ Language Without An Argument
 
 ==================
 Language With Two Arguments
-:error
 ==================
 
 {% language "a" "b" %}x{% endlanguage %}
 
 ---
 
+(template
+  (content)
+  (language_group
+    (language_block
+      (language_tag
+        (filtered_value
+          (value
+            (literal
+              (string))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endlanguage_tag))
+  (content))
 
 ==================
 Language Name Filter
@@ -493,6 +506,7 @@ Language Name Filter With An Argument
 
 ---
 
+
 ==================
 Translate With A Context Named After Noop
 :error

test/corpus/ifchanged.txt

@@ -219,8 +219,11 @@ b
     (ifchanged_block
       (ifchanged_tag)
       (template
-        (content)
-        (unexpected_tag)
+        (content)))
+    (else_block
+      (else_tag
+        (unexpected_argument))
+      (template
         (content)))
     (endifchanged_tag))
   (content))

test/corpus/include.txt

@@ -233,9 +233,18 @@ Include With A Legacy Binding
 
 ==================
 Include With A Second Name
-:error
 ==================
 
 {% include "t.html" "u.html" %}
 
 ---
+
+(template
+  (content)
+  (include_tag
+    (filtered_value
+      (value
+        (literal
+          (string))))
+    (unexpected_argument))
+  (content))

test/corpus/l10n.txt

@@ -105,13 +105,22 @@ Localize With Another Argument
 
 ==================
 Localize With Two Arguments
-:error
 ==================
 
 {% localize on off %}x{% endlocalize %}
 
 ---
 
+(template
+  (content)
+  (localize_group
+    (localize_block
+      (localize_tag
+        (unexpected_argument))
+      (template
+        (content)))
+    (endlocalize_tag))
+  (content))
 
 ==================
 Localize Unclosed
@@ -130,7 +139,6 @@ Localize Unclosed
         (content)))
     (missing_endlocalize_tag)))
 
-
 ==================
 Localize Filter
 ==================
@@ -187,3 +195,4 @@ Unlocalize Filter With An Argument
 {{ x|unlocalize:1 }}
 
 ---
+

test/corpus/missing.txt

@@ -950,7 +950,8 @@ Endblock Naming No Open Block
             (block_tag
               (push_block))
             (template
-              (unexpected_tag)
+              (unexpected_tag
+                (unexpected_argument))
               (content)))
           (missing_endblock_tag))))
     (missing_endblock_tag)))

test/corpus/static.txt

@@ -81,23 +81,40 @@ Static Without A Path
 
 ==================
 Static With A Second Path
-:error
 ==================
 
 {% static "a.css" "b.css" %}
 
 ---
 
+(template
+  (content)
+  (static_tag
+    (filtered_value
+      (value
+        (literal
+          (string))))
+    (unexpected_argument))
+  (content))
 
 ==================
 Static With Anything After As
-:error
 ==================
 
 {% static "a.css" as url junk %}
 
 ---
 
+(template
+  (content)
+  (static_tag
+    (filtered_value
+      (value
+        (literal
+          (string))))
+    (identifier)
+    (unexpected_argument))
+  (content))
 
 ==================
 Get Static Prefix

test/corpus/tz.txt

@@ -64,13 +64,22 @@ Localtime With Another Argument
 
 ==================
 Localtime With Two Arguments
-:error
 ==================
 
 {% localtime on off %}x{% endlocaltime %}
 
 ---
 
+(template
+  (content)
+  (localtime_group
+    (localtime_block
+      (localtime_tag
+        (unexpected_argument))
+      (template
+        (content)))
+    (endlocaltime_tag))
+  (content))
 
 ==================
 Timezone
@@ -152,13 +161,26 @@ Timezone Without An Argument
 
 ==================
 Timezone With Two Arguments
-:error
 ==================
 
 {% timezone "a" "b" %}x{% endtimezone %}
 
 ---
 
+(template
+  (content)
+  (timezone_group
+    (timezone_block
+      (timezone_tag
+        (filtered_value
+          (value
+            (literal
+              (string))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endtimezone_tag))
+  (content))
 
 ==================
 Get Current Timezone
@@ -186,13 +208,18 @@ Get Current Timezone Without As
 
 ==================
 Get Current Timezone With Anything After As
-:error
 ==================
 
 {% get_current_timezone as tz junk %}
 
 ---
 
+(template
+  (content)
+  (get_current_timezone_tag
+    (identifier)
+    (unexpected_argument))
+  (content))
 
 ==================
 Localtime Filter
@@ -272,3 +299,4 @@ Localtime Filter With An Argument
 {{ x|localtime:1 }}
 
 ---
+

test/corpus/with.txt

@@ -68,23 +68,56 @@ With Multiple Variables
 
 ==================
 With A Binding Twice
-:error
 ==================
 
 {% with a=1 a=2 %}x{% endwith %}
 
 ---
 
+(template
+  (content)
+  (with_group
+    (with_block
+      (with_tag
+        (identifier)
+        (filtered_value
+          (value
+            (literal
+              (number))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endwith_tag))
+  (content))
 
 ==================
 With A Binding Repeated Later
-:error
 ==================
 
 {% with a=1 b=2 a=3 %}x{% endwith %}
 
 ---
 
+(template
+  (content)
+  (with_group
+    (with_block
+      (with_tag
+        (identifier)
+        (filtered_value
+          (value
+            (literal
+              (number))))
+        (identifier)
+        (filtered_value
+          (value
+            (literal
+              (number))))
+        (unexpected_argument))
+      (template
+        (content)))
+    (endwith_tag))
+  (content))
 
 ==================
 With Repeating A Binding Of The Tag Before It