Changeset 411

Timestamp:

Jan 26, 2004, 4:08:21 AM (21 years ago)

Author:

Gary Byers

Message:

INSTANCE-CLASS-WRAPPER (how many versions of this are there ?) looks
at pointer-based classes.

File:

• trunk/ccl/level-1/l1-clos-boot.lisp (modified) (2 diffs)

trunk/ccl/level-1/l1-clos-boot.lisp

@@ -1417 +1417 @@
  ; returns thing's class-wrapper or nil if it isn't a standard-object
   (if (standard-instance-p thing)
-    (let* ((wrapper (instance.class-wrapper thing)))
-      (if (uvectorp wrapper)  ;; ???? - probably ok
-        wrapper))
+    (instance.class-wrapper thing)
     (if (typep thing 'macptr)
       (foreign-instance-class-wrapper thing))))
@@ -3181 +3179 @@
 
 (defmethod instance-class-wrapper ((instance standard-object))
-  (instance.class-wrapper instance))
+  (if (%standard-instance-p instance)
+    (instance.class-wrapper instance)
+    (if (typep instance 'macptr)
+      (foreign-instance-class-wrapper instance))))
 
 (defmethod instance-class-wrapper ((instance standard-generic-function))
   (gf.instance.class-wrapper  instance))
+
+
+                                   
 
 (defun generic-function-wrapper (gf)