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

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sat Sep 29 13:23:27 2012
New Revision: 14156

Log:
Fix incorrect lambda list reassembly after parsing a DEFMETHOD lambda list.

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 Sep 29 02:06:25 2012	(r14155)
+++ trunk/abcl/src/org/armedbear/lisp/clos.lisp	Sat Sep 29 13:23:27 2012	(r14156)
@@ -1916,10 +1916,10 @@
          (opts (getf plist :optional-args))
          (auxs (getf plist :auxiliary-args)))
     `(, at requireds
+      ,@(if opts `(&optional , at opts) ())
       ,@(if rv `(&rest ,rv) ())
       ,@(if (or ks keysp aok) `(&key , at ks) ())
       ,@(if aok '(&allow-other-keys) ())
-      ,@(if opts `(&optional , at opts) ())
       ,@(if auxs `(&aux , at auxs) ()))))
 
 (defun extract-specializer-names (specialized-lambda-list)