[js] Use null for empty named arguments in regexes and immediate bloc…

…k calls.
Raku · Feb 16, 2016 · 56f5d83 · 56f5d83
1 parent 1a8567e
commit 56f5d83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/vm/js/Compiler.nqp b/src/vm/js/Compiler.nqp
@@ -907,7 +907,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
                 my $cont := self.unique_var('cont');
                 my $result := self.unique_var('result');
 
-                my @args := [$outer_ctx,'{}'];
+                my @args := [$outer_ctx, 'null'];
 
                 @args.push($cont);
 
@@ -920,7 +920,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
 
                 ChunkCPS.new($T_OBJ, $result, $setup, $cont, :$node);
             } else {
-                my @args := [$outer_ctx,'{}'];
+                my @args := [$outer_ctx, 'null'];
                 for @extra_args -> $arg {
                     @args.push($arg.expr);
                     $setup.push($arg);
@@ -1155,7 +1155,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
 
             my $main := self.as_js($main_block, :want($T_OBJ));
 
-            $body := Chunk.void($block_js, $main, $main.expr ~ ".\$apply([null, \{\}].concat(nqp.args(module)));\n");
+            $body := Chunk.void($block_js, $main, $main.expr ~ ".\$apply([null, null].concat(nqp.args(module)));\n");
 
         } else {
             $body := $block_js;

diff --git a/src/vm/js/RegexCompiler.nqp b/src/vm/js/RegexCompiler.nqp
@@ -33,7 +33,7 @@ class RegexCompiler {
 
         Chunk.new($T_OBJ, $!cursor, [
             "{$!label} = {$!initial_label};\n",
-            "$start = self['!cursor_start_all']({$*CTX}, \{\}).array;\n",
+            "$start = self['!cursor_start_all']({$*CTX}, null).array;\n",
             "{$!cursor} = $start[0];\n",
             "{$!target} = $start[1];\n",
             "{$!pos} = nqp.to_int($start[2], $*CTX);\n",
@@ -65,7 +65,7 @@ class RegexCompiler {
             self.goto($jump),
 
             self.case($!done_label),
-            "{$!cursor}['!cursor_fail']({$*CTX}, \{\});\n",
+            "{$!cursor}['!cursor_fail']({$*CTX}, null);\n",
             "break {$!js_loop_label}\n",
             "\}\n\}\n"
         ]);
@@ -240,7 +240,7 @@ class RegexCompiler {
 
     my sub call($invocant, $method, *@args) {
         nqp::unshift(@args, $*CTX);
-        nqp::unshift(@args, 'nqp.named([])');
+        nqp::unshift(@args, 'null');
         $invocant ~ "[" ~ quote_string($method) ~ "](" ~ nqp::join(",", @args) ~ ")";
     }
 
@@ -280,7 +280,7 @@ class RegexCompiler {
         else {
             #TODO think if arguments are possible, etc.
             my $block := $!compiler.as_js($node[0][0], :want($T_OBJ));
-            $call := Chunk.new($T_OBJ, $block.expr ~ ".\$call({$*CTX},nqp.named([]),$!cursor)", [$block]);
+            $call := Chunk.new($T_OBJ, $block.expr ~ ".\$call({$*CTX}, null, $!cursor)", [$block]);
         }
 
         my $testop := $node.negate ?? '>=' !! '<';