Changeset 12084

Timestamp:

08/08/09 14:15:32 (14 years ago)

Author:

ehuelsmann

Message:

Declaration (processing) fixes.

jvm.lisp (process-ignore/ignorable): Don't process function-binding

declarations as if they were variables.

clos.lisp: declare CALL-NEXT-METHOD and NEXT-METHOD-P as ignorable

function bindings (instead of variables).

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• clos.lisp (modified) (1 diff)
• jvm.lisp (modified) (1 diff)

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

@@ -1587 +1587 @@
                        (next-method-p ()
                          (not (null next-emfun))))
-                  (declare (ignorable call-next-method next-method-p))
+                  (declare (ignorable (function call-next-method)
+                                      (function next-method-p)))
                   (apply #'(lambda ,lambda-list ,@declarations ,@body) args))))
             ((null (intersection lambda-list '(&rest &optional &key &allow-other-keys &aux)))

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

@@ -480 +480 @@
     (let ((what (if (eq declaration 'IGNORE) "ignored" "ignorable")))
       (dolist (name names)
-        (let ((variable (find-variable name variables)))
-          (cond ((null variable)
-                 (compiler-style-warn "Declaring unknown variable ~S to be ~A."
-                                      name what))
-                ((variable-special-p variable)
-                 (compiler-style-warn "Declaring special variable ~S to be ~A."
-                                      name what))
-                ((eq declaration 'IGNORE)
-                 (setf (variable-ignore-p variable) t))
-                (t
-                 (setf (variable-ignorable-p variable) t))))))))
+        (unless (and (consp name) (eq (car name) 'FUNCTION))
+          (let ((variable (find-variable name variables)))
+            (cond ((null variable)
+                   (compiler-style-warn "Declaring unknown variable ~S to be ~A."
+                                        name what))
+                  ((variable-special-p variable)
+                   (compiler-style-warn "Declaring special variable ~S to be ~A."
+                                        name what))
+                  ((eq declaration 'IGNORE)
+                   (setf (variable-ignore-p variable) t))
+                  (t
+                   (setf (variable-ignorable-p variable) t)))))))))
 
 (defun finalize-generic-functions ()