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

[Ville Voutilainen]

Author: vvoutilainen
Date: Thu May 13 16:03:06 2010
New Revision: 12678

Log:
Re #96: partial fix for argument lists where &key appears
before &rest. This fix takes care of the defun cases, but
some lambda cases still go unnoticed.


Modified:
   trunk/abcl/src/org/armedbear/lisp/Closure.java

Modified: trunk/abcl/src/org/armedbear/lisp/Closure.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Closure.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Closure.java	Thu May 13 16:03:06 2010
@@ -162,6 +162,11 @@
                   }
                 else if (obj == Symbol.AND_REST || obj == Symbol.AND_BODY)
                   {
+                    if (_andKey)
+                      {
+                        error(new ProgramError(
+                          "&REST/&BODY must precede &KEY."));
+                      }
                     state = STATE_REST;
                     arity = -1;
                     maxArgs = -1;