X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=ecmalisp.lisp;h=16f557d3a70b900dee749587b392d81dda5a6733;hb=3a2502768f064d430acbe5ca011045d5368dd7cb;hp=95b3678b401b635d9e8a2d48db58c8f85ac2ed94;hpb=5b789a53608b626f1a7f7a94646695d165c97a07;p=jscl.git

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 95b3678..16f557d 100644
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -1458,31 +1458,36 @@ function mv(){
 (defvar *block-counter* 0)
 
 (define-compilation block (name &rest body)
-  (let ((tr (integer-to-string (incf *block-counter*))))
-    (let ((b (make-binding name 'block tr)))
-      (js!selfcall
-        "try {" *newline*
-        (let ((*environment* (extend-lexenv (list b) *environment* 'block)))
-          (indent "return " (ls-compile `(progn ,@body) *multiple-value-p*) ";" *newline*))
-        "}" *newline*
-        "catch (cf){" *newline*
-        "    if (cf.type == 'block' && cf.id == " tr ")" *newline*
-        "        return cf.value;" *newline*
-        "    else" *newline*
-        "        throw cf;" *newline*
-        "}" *newline*))))
+  (let* ((tr (integer-to-string (incf *block-counter*)))
+         (b (make-binding name 'block tr))
+         (*environment* (extend-lexenv (list b) *environment* 'block))
+         (cbody (ls-compile-block body t)))
+    (if (member 'used (binding-declarations b))
+        (js!selfcall
+          "try {" *newline*
+          (indent cbody)
+          "}" *newline*
+          "catch (cf){" *newline*
+          "    if (cf.type == 'block' && cf.id == " tr ")" *newline*
+          "        return cf.value;" *newline*
+          "    else" *newline*
+          "        throw cf;" *newline*
+          "}" *newline*)
+        (js!selfcall
+          (indent cbody)))))
 
 (define-compilation return-from (name &optional value)
   (let ((b (lookup-in-lexenv name *environment* 'block)))
-    (if b
-        (js!selfcall
-          "throw ({"
-          "type: 'block', "
-          "id: " (binding-value b) ", "
-          "value: " (ls-compile value) ", "
-          "message: 'Return from unknown block " (symbol-name name) ".'"
-          "})")
-        (error (concat "Unknown block `" (symbol-name name) "'.")))))
+    (when (null b)
+      (error (concat "Unknown block `" (symbol-name name) "'.")))
+    (push-binding-declaration 'used b)
+    (js!selfcall
+      "throw ({"
+      "type: 'block', "
+      "id: " (binding-value b) ", "
+      "value: " (ls-compile value) ", "
+      "message: 'Return from unknown block " (symbol-name name) ".'"
+      "})")))
 
 (define-compilation catch (id &rest body)
   (js!selfcall