From b9040086e62495e2189ed8f8e593aaec49040a7a Mon Sep 17 00:00:00 2001
From: Vladimir Sedach <vas@oneofus.la>
Date: Sat, 3 Nov 2018 22:18:51 -0700
Subject: [PATCH] Fix dynamic scope multiple value return

---
 src/special-operators.lisp |  7 ++++---
 tests/output-tests.lisp    | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/special-operators.lisp b/src/special-operators.lisp
index ca480b9..3644eb8 100644
--- a/src/special-operators.lisp
+++ b/src/special-operators.lisp
@@ -175,7 +175,8 @@
                   `((and ,_ps_err (eql ',tag
                                        (getprop ,_ps_err :__ps_block_tag)))
                     (return-from ,tag
-                      (getprop ,_ps_err :__ps_value)))))
+                      (getprop ,_ps_err :__ps_value)
+                      t))))
            `(ps-js:block
                (ps-js:try
                 ,body
@@ -227,7 +228,7 @@
              (ps-compile
               (if (and (not returning-values?) clear-multiple-values?)
                   `(progn
-                     (setf __PS_MV_REG (list))
+                     (setf __PS_MV_REG '())
                      (%simple-lexical-return ,@X))
                   `(%simple-lexical-return ,@X))))))
     (acond
@@ -247,7 +248,7 @@
        (setf (cdr it) t)
        (ps-compile
         `(progn
-           ,@(when (and (not returning-values?) clear-multiple-values?)
+           ,@(unless returning-values?
                '((setf __PS_MV_REG '())))
            (throw (create
                    :__ps_block_tag ',tag
diff --git a/tests/output-tests.lisp b/tests/output-tests.lisp
index 1d39ed7..7604273 100644
--- a/tests/output-tests.lisp
+++ b/tests/output-tests.lisp
@@ -2709,7 +2709,6 @@ if (foowhat(x)) {
         });
     } catch (_ps_err5) {
         if (_ps_err5 && 'baz' === _ps_err5['__ps_block_tag']) {
-            __PS_MV_REG = [];
             return _ps_err5['__ps_value'];
         } else {
             throw _ps_err5;
@@ -3568,11 +3567,11 @@ while (foo()) {
     try {
         __PS_MV_REG = [];
         return (function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'foo', '__ps_value' : 6 };
         })();
     } catch (_ps_err1) {
         if (_ps_err1 && 'foo' === _ps_err1['__ps_block_tag']) {
-            __PS_MV_REG = [];
             return _ps_err1['__ps_value'];
         } else {
             throw _ps_err1;
@@ -3588,11 +3587,11 @@ while (foo()) {
     try {
         __PS_MV_REG = [];
         return (function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'foo', '__ps_value' : null };
         })();
     } catch (_ps_err1) {
         if (_ps_err1 && 'foo' === _ps_err1['__ps_block_tag']) {
-            __PS_MV_REG = [];
             return _ps_err1['__ps_value'];
         } else {
             throw _ps_err1;
@@ -3630,11 +3629,11 @@ while (foo()) {
     try {
         __PS_MV_REG = [];
         return (function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'foo', '__ps_value' : baz ? 6 : 5 };
         })();
     } catch (_ps_err1) {
         if (_ps_err1 && 'foo' === _ps_err1['__ps_block_tag']) {
-            __PS_MV_REG = [];
             return _ps_err1['__ps_value'];
         } else {
             throw _ps_err1;
@@ -3651,13 +3650,13 @@ while (foo()) {
 var foo = (function () {
     try {
         (function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'nilBlock', '__ps_value' : 6 };
         })();
         __PS_MV_REG = [];
         return 1 + 2;
     } catch (_ps_err1) {
         if (_ps_err1 && 'nilBlock' === _ps_err1['__ps_block_tag']) {
-            __PS_MV_REG = [];
             return _ps_err1['__ps_value'];
         } else {
             throw _ps_err1;
@@ -4375,6 +4374,7 @@ x = 2 + sideEffect() + x + 5;")
         try {
             (function () {
                 (function () {
+                    __PS_MV_REG = [];
                     throw { '__ps_block_tag' : 'X', '__ps_value' : 1 };
                 })();
                 __PS_MV_REG = [];
@@ -4382,7 +4382,6 @@ x = 2 + sideEffect() + x + 5;")
             })();
         } catch (_ps_err1) {
             if (_ps_err1 && 'X' === _ps_err1['__ps_block_tag']) {
-                __PS_MV_REG = [];
                 _ps_err1['__ps_value'];
                 break X;
             } else {
@@ -4403,6 +4402,7 @@ x = 2 + sideEffect() + x + 5;")
   "function () {
     try {
         return function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'X', '__ps_value' : 1 };
         };
     } catch (_ps_err1) {
@@ -4451,12 +4451,12 @@ x = 2 + sideEffect() + x + 5;")
     nilBlock: {
     try {
         (function () {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'nilBlock', '__ps_value' : 6 };
         })();
         1 + 2;
     } catch (_ps_err1) {
         if (_ps_err1 && 'nilBlock' === _ps_err1['__ps_block_tag']) {
-            __PS_MV_REG = [];
             _ps_err1['__ps_value'];
             break nilBlock;
         } else {
@@ -4477,6 +4477,7 @@ x = 2 + sideEffect() + x + 5;")
   "(function () {
     bar: {
         try {
+            __PS_MV_REG = [];
             throw { '__ps_block_tag' : 'bar', '__ps_value' : 10 };
         } catch (_ps_err1) {
             if (_ps_err1 && 'bar' === _ps_err1['__ps_block_tag']) {
-- 
2.11.4.GIT