From 452123400b2a8123a445ccd274cc99a3fed1eea4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20V=C3=A1zquez?= Date: Fri, 21 Jun 2013 01:30:06 +0200 Subject: [PATCH] Bug generating Javascript code for (PROGN (PROGN)) --- src/compiler-codegen.lisp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler-codegen.lisp b/src/compiler-codegen.lisp index fbb3952..f3b05cc 100644 --- a/src/compiler-codegen.lisp +++ b/src/compiler-codegen.lisp @@ -358,7 +358,7 @@ (destructuring-bind (&body body) (cdr form) (cond ((null body) '(empty)) - ((null (cdr body)) (car body)) + ((null (cdr body)) (js-expand-stmt (car body))) (t `(group ,@(cdr form)))))) (t form))) @@ -415,7 +415,9 @@ (js-format " else ") (js-stmt false)))) (group - (let ((in-group-p (and (consp parent) (eq (car parent) 'group)))) + (let ((in-group-p + (or (null parent) + (and (consp parent) (eq (car parent) 'group))))) (unless in-group-p (js-format "{")) (mapc #'js-stmt (cdr form)) (unless in-group-p (js-format "}")))) -- 1.7.10.4