disallow extra brackets on various pair thingies

TimToady · TimToady · commit 4731beb845ea · 2013-12-21T09:17:45.000-08:00
diff --git a/STD.pm6 b/STD.pm6
@@ -2167,6 +2167,7 @@ grammar P6 is STD {
                 | '<' <desigilname> '>'
                 ]
             )
+            [ <?before <[ \[ \( \< \{ ]>> <.panic: "Extra argument not allowed; pair already has variable argument"> ]?
             { $key = $<var><desigilname>.Str; $value = $<var>; $¢.check_variable($value); }
         ]
         $<k> = {$key} $<v> = {$value}
@@ -2926,6 +2927,8 @@ grammar P6 is STD {
         | <param_var(1)>
         | '\\' <defterm>
         ]
+        [ <?before <[ \( \[ ]>> <.panic: "Subsignature not allowed after named parameter; please insert whitespace"> ]?
+        [ <?before <[ \{ \< ]>> <.panic: "Cannot apply this shape"> ]?
     }
 
     token named_param_term {

Original file line number	Diff line number	Diff line change
`@@ -2167,6 +2167,7 @@ grammar P6 is STD {`
`2167`	`2167`	`\| '<' <desigilname> '>'`
`2168`	`2168`	`]`
`2169`	`2169`	`)`
	`2170`	`+ [ <?before <[ \[ \( \< \{ ]>> <.panic: "Extra argument not allowed; pair already has variable argument"> ]?`
`2170`	`2171`	`{ $key = $<var><desigilname>.Str; $value = $<var>; $¢.check_variable($value); }`
`2171`	`2172`	`]`
`2172`	`2173`	`$<k> = {$key} $<v> = {$value}`
`@@ -2926,6 +2927,8 @@ grammar P6 is STD {`
`2926`	`2927`	`\| <param_var(1)>`
`2927`	`2928`	`\| '\\' <defterm>`
`2928`	`2929`	`]`
	`2930`	`+ [ <?before <[ \( \[ ]>> <.panic: "Subsignature not allowed after named parameter; please insert whitespace"> ]?`
	`2931`	`+ [ <?before <[ \{ \< ]>> <.panic: "Cannot apply this shape"> ]?`
`2929`	`2932`	`}`
`2930`	`2933`
`2931`	`2934`	`token named_param_term {`