Allow leading & on subroutine declarations.

perl6 · Dec 2, 2009 · 4633d19 · 4633d19
1 parent cd02597
commit 4633d19
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -389,7 +389,7 @@ method routine_def($/) {
     $past.blocktype('declaration');
     $past.control('return_pir');
     if $<deflongname> {
-        my $name := ~$<deflongname>[0].ast;
+        my $name := ~$<sigil>[0] ~ $<deflongname>[0].ast;
         $past.name($name);
         if $*SCOPE ne 'our' {
             @BLOCK[0][0].push(PAST::Var.new( :name($name), :isdecl(1),

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -271,7 +271,7 @@ token routine_declarator:sym<sub>    { <sym> <routine_def> }
 token routine_declarator:sym<method> { <sym> <method_def> }
 
 rule routine_def {
-    <deflongname>?
+    [ $<sigil>=['&'?]<deflongname> ]?
     <.newpad>
     [ '(' <signature> ')'
         || <.panic: 'Routine declaration requires a signature'> ]

diff --git a/t/nqp/11-sub.t b/t/nqp/11-sub.t
@@ -2,7 +2,7 @@
 
 # check subs
 
-say('1..11');
+say('1..12');
 
 sub one ( ) {
     say("ok 1 # sub def and call");
@@ -74,3 +74,11 @@ sub eleven ($arg) {
     say("ok 11 # parameter with a trailing comma");
 }
 eleven( 'dummy', );
+
+sub &twelve() {
+    say("ok 12 # subroutine name with leading &");
+}
+
+&twelve();
+
+