From: David Vázquez Date: Fri, 5 Jul 2013 12:24:53 +0000 (+0200) Subject: Secondary value in js macroexpanders to inhibit macroexpansion X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2928172fb84644c51136e78d6c3e037d6e9f961d;p=jscl.git Secondary value in js macroexpanders to inhibit macroexpansion --- diff --git a/src/compiler-codegen.lisp b/src/compiler-codegen.lisp index 87a3740..d624b0e 100644 --- a/src/compiler-codegen.lisp +++ b/src/compiler-codegen.lisp @@ -37,11 +37,11 @@ (defun js-macroexpand (js) (if (and (consp js) (assoc (car js) *js-macros*)) (let ((expander (cdr (assoc (car js) *js-macros*)))) - (multiple-value-bind (expansion expand-more-p) + (multiple-value-bind (expansion stop-expand-p) (funcall expander (cdr js)) - (if expand-more-p - (js-macroexpand expansion) - expansion))) + (if stop-expand-p + expansion + (js-macroexpand expansion)))) js))