Compile calls with multiple args correctly

rakudo · Jun 6, 2020 · 5e813ac · 5e813ac
1 parent f21a031
commit 5e813ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Raku/Actions.nqp b/src/Raku/Actions.nqp
@@ -240,8 +240,15 @@ class Raku::Actions is HLL::Actions {
 
     method arglist($/) {
         if $<EXPR> {
-            # TODO multiple args
-            make self.r('ArgList').new($<EXPR>.ast);
+            my $expr := $<EXPR>.ast;
+            if nqp::istype($expr, self.r('ApplyListInfix')) &&
+                    nqp::istype($expr.infix, self.r('Infix')) &&
+                    $expr.infix.operator eq ',' {
+                make self.r('ArgList').from-comma-list($expr);
+            }
+            else {
+                make self.r('ArgList').new($expr);
+            }
         }
         else {
             make self.r('ArgList').new();

diff --git a/src/Raku/ast/call.rakumod b/src/Raku/ast/call.rakumod
@@ -8,6 +8,13 @@ class RakuAST::ArgList is RakuAST::Node {
         $obj
     }
 
+    method from-comma-list(RakuAST::ApplyListInfix $comma-apply) {
+        my $obj := nqp::create(self);
+        nqp::bindattr($obj, RakuAST::ArgList, '$!args',
+            self.IMPL-UNWRAP-LIST($comma-apply.operands));
+        $obj
+    }
+
     method args() {
         self.IMPL-WRAP-LIST($!args)
     }