[armedbear-cvs] r14055 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sat Aug  4 14:57:45 2012
New Revision: 14055

Log:
Follow up to r14054: fix the case where initform is NIL.

Modified:
   trunk/abcl/src/org/armedbear/lisp/clos.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/clos.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/clos.lisp	Sat Aug  4 14:18:00 2012	(r14054)
+++ trunk/abcl/src/org/armedbear/lisp/clos.lisp	Sat Aug  4 14:57:45 2012	(r14055)
@@ -1261,7 +1261,7 @@
                            (gensym)))
            (binding-forms (gensym))
            (needs-args-len-var (gensym))
-          (emf-form (gensym)))
+           (emf-form (gensym)))
       `(let* ((,gf-lambda-list (slot-value ,generic-function-symbol
                                            'sys::lambda-list))
               (nreq (length (extract-required-part ,gf-lambda-list)))
@@ -1280,8 +1280,7 @@
                                               `(nth ,,i ,',args-var))))
                         ,@(loop for (var initform supplied-var) in optional
                              and i upfrom 0
-                             for supplied-binding = (or supplied-var
-                                                        (when initform (gensym)))
+                             for supplied-binding = (or supplied-var (gensym))
                              for var-binding = (gensym)
                              ;; check for excess parameters
                              ;; only assign initform if the parameter
@@ -1293,7 +1292,6 @@
                              ;; not available in the arguments list
                              ;;
                              ;; Also, if specified, bind "supplied-p"
-                             if supplied-binding
                              collect `(,supplied-binding
                                        (when (< ,i nopt)
                                          (setq ,needs-args-len-var t)