fix up REQUIRE_IMPORT

now it works, except that it currently imports our-symbols and not exported symbols
rakudo · Jun 10, 2012 · 200af35 · 200af35
1 parent 60a9808
commit 200af35
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -269,18 +269,17 @@ sub INDIRECT_NAME_LOOKUP($root, *@chunks) is rw {
 }
 
 sub REQUIRE_IMPORT($package-name, *@syms) {
-    my $package := OUR::{$package-name}.WHO;
+    my $package := CALLER::OUR::{$package-name}.WHO;
     my @missing;
     for @syms {
-        if $package.exists($_) {
-            CALLER::{$_} := $package{$_};
-        }
-        else {
+        unless $package.exists($_) {
             @missing.push: $_;
+            next;
         }
+        OUTER::CALLER::{$_} := $package{$_};
     }
     if @missing {
         X::Import::MissingSymbols.new(:from($package-name), :@missing).throw;
     }
-    OUR::{$package-name};
+    CALLER::OUR::{$package-name};
 }