make adhoc declared variables our-scoped

rakudo-p5 · May 22, 2013 · 07924e6 · 07924e6
1 parent 6f80ba5
commit 07924e6
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/lib/Perl5/Grammar.nqp b/lib/Perl5/Grammar.nqp
@@ -351,7 +351,7 @@ role STD5 {
                         my $descriptor := $*W.create_container_descriptor(%cont_info<value_type>, 1, $name);
 
                         $*W.install_lexical_container($BLOCK, $name, %cont_info, $descriptor,
-                            :scope($*SCOPE), :package($*PACKAGE));
+                            :scope('our'), :package($*PACKAGE));
 
                         # Set scope and type on container, and if needed emit code to
                         # reify a generic type.
@@ -366,13 +366,11 @@ role STD5 {
                                     QAST::Op.new( :op('curlexpad') ));
                             }
 
-                            if $*SCOPE eq 'our' {
-                                $BLOCK[0].push(QAST::Op.new(
-                                    :op('bind'),
-                                    $varast,
-                                    $*W.symbol_lookup([$name], $/, :package_only(1), :lvalue(1))
-                                ));
-                            }
+                            $BLOCK[0].push(QAST::Op.new(
+                                :op('bind'),
+                                $varast,
+                                $*W.symbol_lookup([$name], $/, :package_only(1), :lvalue(1))
+                            ));
                         }
                     }
                     else  {