Fix loading foreign libraries.

Import the proper namespace for foreign libraries.
rakudo · Jun 3, 2009 · 77db80c · 77db80c
1 parent 7cfa196
commit 77db80c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/builtins/eval.pir b/src/builtins/eval.pir
@@ -153,13 +153,13 @@ itself can be found in src/builtins/control.pir.
     $P0 = ver['lang']
     if null $P0 goto no_hll
     lang = $P0
-    .local pmc compiler, library, imports, callerns
+    .local pmc name, compiler, library, imports, callerns, foreignlibns
     $P0 = getinterp
     callerns = $P0['namespace';1]
     'load-language'(lang)
     compiler = compreg lang
-    $P0 = compiler_obj.'parse_name'(module)
-    library = compiler.'load_library'($P0)
+    name = compiler_obj.'parse_name'(module)
+    library = compiler.'load_library'(name)
     imports = library['symbols']
     imports = imports['DEFAULT']
     .local pmc ns_iter, item
@@ -171,6 +171,11 @@ itself can be found in src/builtins/control.pir.
     callerns[$S0] = $P0
     goto import_loop
   import_loop_end:
+    foreignlibns = library['namespace']
+    if null foreignlibns goto no_foreign_ns
+    $S0 = pop name
+    set_hll_global name, $S0, foreignlibns
+  no_foreign_ns:
     .return (library)
   no_hll:
     # Require module.

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -415,8 +415,9 @@ method use_statement($/) {
         }
 
         ##  Handle versioning
+        my $ver;
         if $<colonpair> {
-            my $ver := PAST::Op.new( :pasttype('call'), :name('hash') );
+            $ver := PAST::Op.new( :pasttype('call'), :name('hash') );
             for $<colonpair> {
                 $ver.push( $_.ast );
             }
@@ -430,12 +431,14 @@ method use_statement($/) {
         ##  XXX Need to handle tags here too, and creating needed lexical
         ##  slots.
         our @?NS;
+        my %ver_hash;
+        for @($ver) { if $_ { %ver_hash{$_[0].value()} := $_[1].value() } }
         if $tags {
             my %tag_hash;
             for @($tags) { %tag_hash{$_[0].value()} := 1 }
-            use($name, :import_to(@?NS ?? @?NS[0] !! ''), :tags(%tag_hash));
+            use($name, :import_to(@?NS ?? @?NS[0] !! ''), :ver(%ver_hash), :tags(%tag_hash));
         } else {
-            use($name, :import_to(@?NS ?? @?NS[0] !! ''));
+            use($name, :import_to(@?NS ?? @?NS[0] !! ''), :ver(%ver_hash),);
         }
     }
     $past := PAST::Stmts.new( :node($/) );