Enable contextual variable definitions and dynamic lookups.

rakudo · Sep 5, 2009 · 7734f9b · 7734f9b
1 parent 2276af9
commit 7734f9b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/build/PARROT_REVISION b/build/PARROT_REVISION
@@ -1 +1 @@
-40984
+40987
diff --git a/src/builtins/globals.pir b/src/builtins/globals.pir
@@ -97,6 +97,9 @@ src/builtins/globals.pir - initialize miscellaneous global variables
 .sub '!find_contextual'
     .param string name
 
+    $P0 = find_dynamic_lex name
+    unless null $P0 goto done
+
     .local string pkgname
     pkgname = clone name
     substr pkgname, 1, 1, ''

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -2124,13 +2124,15 @@ method variable($/, $key) {
         $var<sigil> := ~$<sigil>;
         if $twigil { $var<twigil> := $twigil; }
 
-        # Variables with '*' twigils are contextual.
+        # Variables with '*' twigils are contextual.  Normally
+        # this is handled by a call to !find_contextual, but
+        # we also create a PAST::Var in case it's a variable
+        # declaration.
         if $twigil eq '*' {
             my $vardecl := $var;
             $var := PAST::Op.new( $varname, 
                                   :name('!find_contextual'),
                                   :lvalue(0) );
-            $varname := $sigil ~ $name;
             $vardecl.name($varname);
             $vardecl.namespace(@ns);
             $vardecl.scope('package');