Fixed 'flatten' to correctly handle lists with non-nil cdr (ie '(1 . 2)).

[clinton/parenscript.git] / src / utils.lisp

diff --git a/src/utils.lisp b/src/utils.lisp
index de77d42..9047abb 100644 (file)
--- a/src/utils.lisp
+++ b/src/utils.lisp
@@ -99,7 +99,7 @@ SOMEGLOBAL."
           ,(let (,@(loop for n in names for g in gensyms collect `(,n ,g)))
                 ,@body)))))
 
-(defun flatten (x)
-  (if (atom x)
-      (list x)
-      (mapcan #'flatten x)))
+(defun flatten (x &optional acc)
+  (cond ((null x) acc)
+        ((atom x) (cons x acc))
+        (t (flatten (car x) (flatten (cdr x) acc)))))