Support $$foo, @$foo and %$foo as equivalents for $($foo), @($foo) an…

…d %($foo).
rakudo · Oct 2, 2011 · 1f1df92 · 1f1df92
1 parent 3515e47
commit 1f1df92
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -946,6 +946,12 @@ class Perl6::Actions is HLL::Actions {
             $key, $value
         )
     }
+
+    method desigilname($/) {
+        if $<variable> {
+            make PAST::Op.new( :pasttype('callmethod'), $<variable>.ast );
+        }
+    }
 
     method variable($/) {
         my $past;
@@ -964,6 +970,12 @@ class Perl6::Actions is HLL::Actions {
         elsif $<infixish> {
             $past := PAST::Op.new( :pirop('find_sub_not_null__Ps'), '&infix:<' ~ $<infixish>.Str ~ '>' );
         }
+        elsif $<desigilname><variable> {
+            $past := $<desigilname>.ast;
+            $past.name(~$<sigil> eq '@' ?? 'list' !!
+                       ~$<sigil> eq '%' ?? 'hash' !!
+                                           'item');
+        }
         else {
             if $<desigilname> && $<desigilname><longname> && self.is_indirect_lookup($<desigilname><longname>) {
                 if $*IN_DECL {

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1043,10 +1043,12 @@ grammar Perl6::Grammar is HLL::Grammar {
         <.obs('$? variable as child error', '$!')>
     }
 
-
     token desigilname {
         [
-    #    | <?before '$' > <variable>
+        | <?before '$' >
+            [ <?{ $*IN_DECL }> <.panic: "Cannot declare an indirect variable name"> ]?
+            <variable>
+        | <?before <[\@\%\&]> <sigil>* \w > <.panic: "Invalid hard reference syntax">
         | <longname>
         ]
     }