Fix failure to scream to the high heavens about certain redeclarations.

rakudo · Oct 2, 2011 · 8b07dd1 · 8b07dd1
1 parent 1f1df92
commit 8b07dd1
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1188,8 +1188,8 @@ grammar Perl6::Grammar is HLL::Grammar {
                     # variants are OK) or else an illegal redecl.
                     if $exists && $*PKGDECL ne 'role' {
                         if $*PACKAGE.HOW.is_composed($*PACKAGE) {
-                            $/.CURSOR.panic("Illegal redeclaration of $*PKGDECL '" ~
-                                ~$longname<name> ~ "'");
+                            $/.CURSOR.panic("Illegal redeclaration of symbol " ~
+                                ~$longname<name>);
                         }
                     }
 
@@ -1650,6 +1650,13 @@ grammar Perl6::Grammar is HLL::Grammar {
         <sym> <.ws>
         [
         | <longname>
+            {
+                my @name := parse_name(~$<longname><name>);
+                if $*ST.already_declared($*SCOPE, $*PACKAGE, $*ST.cur_lexpad(), @name) {
+                    $/.CURSOR.panic("Illegal redeclaration of symbol " ~
+                        ~$<longname><name>);
+                }
+            }
         | <variable>
         | <?>
         ]
@@ -1665,7 +1672,16 @@ grammar Perl6::Grammar is HLL::Grammar {
         :s
         [
             [
-                [ <longname> ]?
+                [
+                    <longname>
+                    {
+                        my @name := parse_name(~$<longname><name>);
+                        if $*ST.already_declared($*SCOPE, $*PACKAGE, $*ST.cur_lexpad(), @name) {
+                            $/.CURSOR.panic("Illegal redeclaration of symbol " ~
+                                ~$<longname><name>);
+                        }
+                    }
+                ]?
                 { $*IN_DECL := '' }
                 <trait>*
                 [ where <EXPR('e=')> ]?