Changeset 167

Timestamp:

Dec 31, 2003, 3:09:39 AM (21 years ago)

Author:

Gary Byers

Message:

Use %class-slots instead of %CLASS.SLOTS when CLASS-SLOTS won't do. Move
CONSTANTLY here, remove some outdated comments.

File:

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

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

@@ -34 +34 @@
 
 (defun extract-instance-effective-slotds (class)
-  (extract-slotds-with-allocation :instance (%class.slots class)))
+  (extract-slotds-with-allocation :instance (%class-slots class)))
 
 (defun extract-class-effective-slotds (class)
-  (extract-slotds-with-allocation :class (%class.slots class)))
+  (extract-slotds-with-allocation :class (%class-slots class)))
 
 (defun extract-instance-and-class-slotds (slotds)
@@ -261 +261 @@
           (pushnew i initargs :test #'eq :key #'car))))))
 
-(defun constantly (x)
-  #'(lambda (&rest ignore)
-      (declare (dynamic-extent ignore)
-               (ignore ignore))
-      x))
+
 
 
@@ -295 +291 @@
                    #|(%class.own-wrapper class)|#
                    (%cons-wrapper class)))))
-      ;;; This is a crock: structure-classes should have slots ...
-      (unless (<= (the fixnum (uvsize (instance.slots class))) %class.slots)
-        (setf (%class.slots class) eslotds))
+      (setf (%class.slots class) eslotds)
       (setf (%wrapper-instance-slots new-wrapper) new-ordering
             (%wrapper-class-slots new-wrapper) (%class-get class :class-slots)
@@ -869 +863 @@
                   :initargs (:direct-slots) :readers (class-direct-slots))
                  (:name slots :initform nil :initfunction ,#'false
-                  ;; Defining CLASS-SLOTS naively as a reader method
-                  ;; can cause infinite recursion.
-                  ;; (It'll be especially naive if there's a non-reader
-                  ;; method defined on CLASS-SLOTS.)
-                  ;; The fact that the slot is a primary slot
-                  ;; saves the day (keeping us from trying to call
-                  ;; CLASS-SLOTS inside SLOT-VALUE-USING-CLASS
                    :readers (class-slots))
                  (:name kernel-p :initform nil :initfunction ,#'false)