implement require EXPR;

rakudo · Sep 24, 2010 · 7b21bf1 · 7b21bf1
1 parent b3efa7a
commit 7b21bf1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -515,18 +515,20 @@ method statement_control:sym<use>($/) {
 }
 
 method statement_control:sym<require>($/) {
-    if $<EXPR> {
+    if $<module_name> && $<EXPR> {
         $/.CURSOR.panic("require with argument list not yet implemented");
     }
-    my $name := $<module_name><longname><name>.Str;
+    my $name_past := $<module_name>
+                    ?? PAST::Val.new(:value($<module_name><longname><name>.Str))
+                    !! $<EXPR>[0].ast;
     my @module_loader := Perl6::Grammar::parse_name('Perl6::Module::Loader');
     my $past := PAST::Op.new(
         :node($/),
         :pasttype('callmethod'),
         :name('need'),
         PAST::Var.new( :name(@module_loader.pop),
                        :namespace(@module_loader), :scope('package') ),
-        $name
+        $name_past
     );
     make $past;
 }

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -462,7 +462,10 @@ token statement_control:sym<use> {
 
 rule statement_control:sym<require> {
     <sym>
-    <module_name> <EXPR>?
+    [
+    | <module_name> <EXPR>?
+    | <EXPR>
+    ]
 }
 
 token statement_control:sym<given> {