Changeset 14055

Timestamp:

08/04/12 21:57:45 (8 years ago)

Author:

ehuelsmann

Message:

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

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (3 diffs)

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

@@ -1262 +1262 @@
            (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))
@@ -1281 +1281 @@
                         ,@(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
@@ -1294 +1293 @@
                              ;;
                              ;; Also, if specified, bind "supplied-p"
-                             if supplied-binding
                              collect `(,supplied-binding
                                        (when (< ,i nopt)