Port over a couple more errors from STD - mostly copy/paste/test.

rakudo · Jul 20, 2010 · ee1b11b · ee1b11b
1 parent 3139735
commit ee1b11b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -788,6 +788,17 @@ token variable {
         | <sigil> $<index>=[\d+]
         | <sigil> <?[<[]> <postcircumfix>
         | $<sigil>=['$'] $<desigilname>=[<[/_!]>]
+        | <sigil> <?{ $*IN_DECL }>
+        | <?>
+            {
+                if $*QSIGIL {
+                    return ();
+                }
+                else {
+                    $/.CURSOR.panic("Non-declarative sigil is missing its name");
+                }
+            }
+
         ]
     ]
     [ <?{ $<twigil> && $<twigil>[0] eq '.' }>
@@ -1400,7 +1411,8 @@ token old_rx_mods {
 token quote_escape:sym<$> {
     <?[$]>
     :my $*QSIGIL := '$';
-    <?quotemod_check('s')> <EXPR('y=')>
+    <?quotemod_check('s')>
+    [ <EXPR('y=')> || <.panic: "Non-variable \$ must be backslashed"> ]
 }
 
 token quote_escape:sym<array> {