Changeset 13761

Timestamp:

01/11/12 16:28:53 (11 years ago)

Author:

ehuelsmann

Message:

Better context reporting during initarg checking.

File:

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

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

@@ -697 +697 @@
                     (list* class initargs)
                     class t initargs
-                    *make-instance-initargs-cache*)
+                    *make-instance-initargs-cache* 'make-instance)
     (%set-class-name name class)
     (%set-class-layout nil class)
@@ -2765 +2765 @@
 (defun check-initargs (gf-list args instance
                        shared-initialize-param initargs
-                       cache)
+                       cache call-site)
   "Checks the validity of `initargs' for the generic functions in `gf-list'
 when called with `args' by calculating the applicable methods for each gf.
@@ -2791 +2791 @@
               (unless (memq initarg allowable-initargs)
                 (error 'program-error
-                       :format-control "Invalid initarg ~S."
-                       :format-arguments (list initarg))))))))
+                       :format-control "Invalid initarg ~S in call to ~S ~
+with arglist ~S."
+                       :format-arguments (list initarg call-site args))))))))
 
 (defun merge-initargs-sets (list1 list2)
@@ -2838 +2839 @@
                     (list* instance initargs)
                     instance t initargs
-                    *make-instance-initargs-cache*)
+                    *make-instance-initargs-cache* 'make-instance)
     (apply #'initialize-instance instance initargs)
     instance))
@@ -2861 +2862 @@
   (check-initargs (list #'reinitialize-instance) (list* instance initargs)
                   instance () initargs
-                  *reinitialize-instance-initargs-cache*)
+                  *reinitialize-instance-initargs-cache* 'reinitialize-instance)
   (apply #'shared-initialize instance () initargs))
 
@@ -2875 +2876 @@
     (unless (symbolp initarg)
       (error 'program-error
-             :format-control "Invalid initarg ~S."
+             :format-control "Initarg ~S not a symbol."
              :format-arguments (list initarg))))
   (dolist (slot (class-slots (class-of instance)))
@@ -2953 +2954 @@
                     (list old new initargs)
                     new added-slots initargs
-                    nil)
+                    nil 'update-instance-for-different-class)
     (apply #'shared-initialize new added-slots initargs)))
 
@@ -2986 +2987 @@
                          property-list initargs)
                   instance added-slots initargs
-                  nil)
+                  nil 'update-instance-for-redefined-class)
   (apply #'shared-initialize instance added-slots initargs))
 
@@ -3003 +3004 @@
                   (list* class all-keys)
                   class t all-keys
-                  nil)
+                  nil 'reinitialize-instance)
   (apply #'std-after-initialization-for-classes class all-keys))