[js] Fix how exceptions are thrown in continuations

Raku · Jan 11, 2019 · 72c5cb4 · 72c5cb4
1 parent 82973f1
commit 72c5cb4
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/vm/js/nqp-runtime/async-continuations.js b/src/vm/js/nqp-runtime/async-continuations.js
@@ -27,13 +27,17 @@ function findReset(tag, ctx) {
 op.continuationreset = function(ctx, currentHLL, tag, block) {
   return new Promise(function(resolve, reject) {
     if (block instanceof Cont) {
-      block.resetCtx.$$outside = resolve;
+      block.resetCtx.$$outsideResolve = resolve;
+      block.resetCtx.$$outsideReject = reject;
       block.inside(Null);
     } else {
       const newCtx = new CtxJustReset(ctx, ctx, null);
-      newCtx.$$outside = resolve;
+      newCtx.$$outsideResolve = resolve;
+      newCtx.$$outsideReject = reject;
       newCtx.$$tag = tag;
-      block.$$call(newCtx, null).then(value => newCtx.$$outside(nqp.retval(currentHLL, value)), reject);
+      block.$$call(newCtx, null).then(
+        value => newCtx.$$outsideResolve(nqp.retval(currentHLL, value)),
+        error => newCtx.$$outsideReject(error));
     }
   });
 };
@@ -58,14 +62,16 @@ op.continuationcontrol = function(ctx, currentHLL, protect, tag, closure) {
   return new Promise(function(resolve, reject) {
     const resetCtx = findReset(tag, ctx);
     const cont = new Cont(ctx, resolve, resetCtx);
-    closure.$$call(protect ? resetCtx : resetCtx.$$caller, null, cont).then(value => resetCtx.$$outside(nqp.retval(currentHLL, value)), reject);
+    closure.$$call(protect ? resetCtx : resetCtx.$$caller, null, cont).then(value => resetCtx.$$outsideResolve(nqp.retval(currentHLL, value)), reject);
   });
 };
 
 op.continuationinvoke = function(ctx, currentHLL, cont, inject) {
   return new Promise(function(resolve, reject) {
     cont.resetCtx.$$caller = ctx;
-    cont.resetCtx.$$outside = resolve;
+    cont.resetCtx.$$outsideResolve = resolve;
+    cont.resetCtx.$$outsideReject = reject;
+
     inject.$$call(cont.ctx, null).then(value => {
       cont.inside(nqp.retval(currentHLL, value));
     }, reject);