Catch a few more special P5 variable names

rakudo · Aug 21, 2013 · a24bf6f · a24bf6f
1 parent bda4465
commit a24bf6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -1773,7 +1773,10 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
             | :dba('contextualizer') <sigil> '(' ~ ')' <semilist> [<?{ $*IN_DECL }> <.panic: "Cannot declare a contextualizer">]?
             | $<sigil>=['$'] $<desigilname>=[<[/_!]>]
             | <sigil> <?{ $*IN_DECL }>
-            | <!{ $*QSIGIL }> <.typed_panic: 'X::Syntax::SigilWithoutName'>
+            | <!{ $*QSIGIL }> {
+                $/.CURSOR.typed_panic( 'X::Syntax::Perl5Var',
+                  name => nqp::substr(~$/.orig, $/.to - 1, 3 ) )
+              }
             ]
         ]
         [ <?{ $<twigil> && $<twigil>[0] eq '.' }>

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -908,12 +908,14 @@ my class X::Syntax::Perl5Var does X::Syntax {
 
       '%-'  => '.from method',
       '%+'  => '.to method',
-      '%!'  => 'your time to implement this',
+      '%!'  => 'your time to implement this in Perl6',
       '%^H' => '$?FOO variables',
     ;
     method message() {
-        "Unsupported use of {$.name} variable"
-          ~ ( %m{$.name} ?? "; in Perl 6 please use {%m{$.name}}" !! '' );
+        my $v = ~($.name ~~ m/ <[ $ @ % & ]> [ \^ <[ A..Z ]> | \W ] /);
+        %m{$v}
+          ?? "Unsupported use of {$v} variable; in Perl 6 please use {%m{$v}}"
+          !! 'Unknown Perl 5 like special variable not supported';
     }
 }
 my class X::Syntax::SigilWithoutName does X::Syntax {