Get need in place. Sketch out import, though export is a bit too inco…

…mplete for it to really work out yet.
rakudo · Aug 8, 2011 · 918e8c6 · 918e8c6
1 parent bf856cd
commit 918e8c6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -612,15 +612,14 @@ class Perl6::Actions is HLL::Actions {
 
     method statement_control:sym<need>($/) {
         my $past := PAST::Stmts.new( :node($/) );
-        for $<module_name> {
-            need($_);
+        for $<version> {
+            # XXX TODO: Version checks.
         }
         make $past;
     }
 
     method statement_control:sym<import>($/) {
         my $past := PAST::Stmts.new( :node($/) );
-        import($/);
         make $past;
     }
 

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -585,11 +585,29 @@ grammar Perl6::Grammar is HLL::Grammar {
         | <version>
         | <module_name>
         ] ** ','
+        {
+            for $<module_name> {
+                $*ST.load_module(~$_<longname>, $*GLOBALish);
+            }
+        }
     }
 
     token statement_control:sym<import> {
         <sym> <.ws>
         <module_name> [ <.spacey> <arglist> ]? <.ws>
+        {
+            my @name := parse_name(~$<module_name><longname>);
+            my $module;
+            my $found := 0;
+            try { $module := $*ST.find_symbol(@name); $found := 1; }
+            if $found {
+                do_import($module.WHO, $<arglist>);
+            }
+            else {
+                $/.CURSOR.panic("Could not find module " ~ ~$<module_name> ~
+                    " to import symbols from");
+            }
+        }
     }
 
     token statement_control:sym<use> {
@@ -623,19 +641,23 @@ grammar Perl6::Grammar is HLL::Grammar {
             || { 
                     if $longname {
                         my $module := $*ST.load_module(~$longname, $*GLOBALish);
-                        if pir::exists($module, 'EXPORT') {
-                            my $EXPORT := $module<EXPORT>.WHO;
-                            if pir::exists($EXPORT, 'DEFAULT') {
-                                $*ST.import($EXPORT<DEFAULT>);
-                            }
-                        }
+                        do_import($module, $<arglist>);
                         $/.CURSOR.import_EXPORTHOW($module);
                     }
                 }
             ]
         ]
         <.ws>
     }
+
+    sub do_import($module, $arglist) {
+        if pir::exists($module, 'EXPORT') {
+            my $EXPORT := $module<EXPORT>.WHO;
+            if pir::exists($EXPORT, 'DEFAULT') {
+                $*ST.import($EXPORT<DEFAULT>);
+            }
+        }
+    }
 
     rule statement_control:sym<require> {
         <sym>