X::Syntax::Reserved

rakudo · Feb 24, 2012 · 8a29c50 · zhuomingliang · Feb 24, 2012 · moritz
1 parent 1ccc79f
commit 8a29c50
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1450,16 +1450,23 @@ grammar Perl6::Grammar is HLL::Grammar {
                 {
                     my $sigil := nqp::substr($var, 0, 1);
                     if $sigil eq '&' {
-                        $/.CURSOR.panic("The () shape syntax in routine declarations is reserved (maybe use :() to declare a longname?)");
+                        $*W.throw($/, 'X::Syntax::Reserved',
+                            reserved => '() shape syntax in routine declarations',
+                            instead => ' (maybe use :() to declare a longname?)'
+                        );
                     }
                     elsif $sigil eq '@' {
-                        $/.CURSOR.panic("The () shape syntax in array declarations is reserved");
+
+                        $*W.throw($/, 'X::Syntax::Reserved',
+                            reserved => '() shape syntax in array declarations');
                     }
                     elsif $sigil eq '%' {
-                        $/.CURSOR.panic("The () shape syntax in hash declarations is reserved");
+                        $*W.throw($/, 'X::Syntax::Reserved',
+                            reserved => '() shape syntax in hash declarations');
                     }
                     else {
-                        $/.CURSOR.panic("The () shape syntax in variable declarations is reserved");
+                        $*W.throw($/, 'X::Syntax::Reserved',
+                            reserved => '() shape syntax in variable declarations');
                     }
                 }
             | '[' ~ ']' <semilist> <.panic: "Shaped variable declarations are not yet implemented">

diff --git a/src/core/Exceptions.pm b/src/core/Exceptions.pm
@@ -187,7 +187,13 @@ my class X::Syntax::Name::Null does X::Syntax {
 }
 
 my class X::Syntax::UnlessElse does X::Syntax {
-    method message() { 'unless does not take "else", please rewrite using "if"' }
+    method message() { '"unless" does not take "else", please rewrite using "if"' }
+}
+
+my class X::Syntax::Reserved does X::Syntax {
+    has $.reserved;
+    has $.instead = '';
+    method message() { "The $.reserved is reserved$.instead" }
 }
 
 my class X::Syntax::P5 does X::Syntax {
@@ -200,7 +206,7 @@ my class X::Syntax::NegatedPair does X::Syntax {
 
 my class X::Syntax::Variable::Numeric does X::Syntax {
     has $.what = 'variable';
-    method message() { "Cannot declare a numeric $.what" }
+    method message() { "Cannot declare a numeric variable" }
 }
 
 my class X::Syntax::Variable::Match does X::Syntax {