Changeset 13799 for trunk/abcl/src/org/armedbear/lisp/clos.lisp

Timestamp:

01/25/12 08:53:50 (11 years ago)

Author:

rschlatte

Message:

Handle metaclasses given as symbols.

File:

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

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

@@ -2573 +2573 @@
   (setf all-keys (copy-list all-keys))  ; since we modify it
   (remf all-keys :metaclass)
+  (unless (classp metaclass) (setf metaclass (find-class metaclass)))
   (let ((class (apply (if (eq metaclass +the-standard-class+)
                           #'make-instance-standard-class
@@ -2594 +2595 @@
   (setf all-keys (copy-list all-keys))  ; since we modify it
   (remf all-keys :metaclass)
+  (unless (classp metaclass) (setf metaclass (find-class metaclass)))
   (change-class class metaclass)
   (apply #'reinitialize-instance class
@@ -2609 +2611 @@
   (setf all-keys (copy-list all-keys))  ; since we modify it
   (remf all-keys :metaclass)
+  (unless (classp metaclass) (setf metaclass (find-class metaclass)))
   (when (and metaclassp (not (eq (class-of class) metaclass)))
     (error 'program-error