[js] Fixup some convertions to primitive types in async/await mode

Some grammars now work
Raku · Jul 19, 2017 · 2f72761 · 2f72761
1 parent 282e72f
commit 2f72761
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/vm/js/Compiler.nqp b/src/vm/js/Compiler.nqp
@@ -542,7 +542,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
                 %convert{$T_STR} := 'toStr';
                 %convert{$T_NUM} := 'toNum';
                 %convert{$T_INT} := 'toInt';
-                return Chunk.new($desired, 'nqp.' ~ %convert{$desired} ~ '(' ~ $chunk.expr ~ ", {$*CTX})", $chunk);
+                return Chunk.new($desired, '(' ~ self.await ~ 'nqp.' ~ %convert{$desired} ~ '(' ~ $chunk.expr ~ ", {$*CTX}))", $chunk);
             }
 
             if $desired == $T_STR {

diff --git a/src/vm/js/RegexCompiler.nqp b/src/vm/js/RegexCompiler.nqp
@@ -56,7 +56,7 @@ class RegexCompiler {
             "{$!cursor} = $start[0];\n",
             self.set_cursor_var(),
             "{$!target} = $start[1];\n",
-            "{$!pos} = nqp.toInt($start[2], $*CTX);\n",
+            "{$!pos} = await nqp.toInt($start[2], $*CTX);\n",
             ($!has_cursor_type ?? '' !! "{$!cursor_type_runtime} = $start[3];\n"),
             "{$!bstack} = $start[4].array;\n",
             "{$!restart} = $start[5];\n",

diff --git a/src/vm/js/nqp-runtime/runtime.js b/src/vm/js/nqp-runtime/runtime.js
@@ -177,7 +177,7 @@ op.setdispatcherfor = function(dispatcher, dispatcherFor) {
   }
 };
 
-exports.toStr = function(arg_, ctx) {
+exports.toStr = async function(arg_, ctx) {
   var arg = arg_.$$decont(ctx);
   if (typeof arg == 'number') {
     return numToStr(arg);
@@ -192,7 +192,7 @@ exports.toStr = function(arg_, ctx) {
   } else if (arg.$$getStr) {
     return arg.$$getStr();
   } else if (arg.Str) {
-    let ret = arg.Str(ctx, null, arg).$$decont(ctx); // eslint-disable-line new-cap
+    let ret = (await arg.Str(ctx, null, arg)).$$decont(ctx); // eslint-disable-line new-cap
     if (typeof ret == 'string') return ret;
     return ret.$$getStr();
   } else if (arg.$$getNum) {
@@ -227,7 +227,7 @@ function numToStr(num) {
 
 exports.numToStr = numToStr;
 
-exports.toNum = function(arg_, ctx) {
+exports.toNum = async function(arg_, ctx) {
   let arg = arg_.$$decont(ctx);
   if (typeof arg == 'number') {
     return arg;
@@ -236,7 +236,7 @@ exports.toNum = function(arg_, ctx) {
   } else if (typeof arg == 'string') {
     return strToNum(arg);
   } else if (arg._STable && arg._STable.methodCache && arg._STable.methodCache.get('Num')) {
-    var result = arg.Num(ctx, null, arg); // eslint-disable-line new-cap
+    var result = await arg.Num(ctx, null, arg); // eslint-disable-line new-cap
     if (result.$$getNum) {
       return result.$$getNum();
     } else if (result.$$numify) {
@@ -259,8 +259,8 @@ exports.toNum = function(arg_, ctx) {
   }
 };
 
-exports.toInt = function(arg, ctx) {
-  return (exports.toNum(arg, ctx) | 0);
+exports.toInt = async function(arg, ctx) {
+  return ((await exports.toNum(arg, ctx)) | 0);
 };
 
 exports.intToObj = function(hllName, i) {