From: Nikodemus S. <de...@us...> - 2007-08-29 15:23:16
|
Update of /cvsroot/sbcl/sbcl/src/pcl In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3902/src/pcl Modified Files: braid.lisp defs.lisp slots-boot.lisp std-class.lisp Log Message: 1.0.9.9: rename CLASS-SLOT-VECTOR to CLASS-SLOT-TABLE * And the corresponding slot from SLOT-VECTOR to SLOT-TABLE. * Avoids confusion with instance slot vectors. Index: braid.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/braid.lisp,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- braid.lisp 27 Aug 2007 15:13:28 -0000 1.66 +++ braid.lisp 29 Aug 2007 15:23:01 -0000 1.67 @@ -310,7 +310,7 @@ slot-class)) (set-slot 'direct-slots direct-slots) (set-slot 'slots slots) - (set-slot 'slot-vector (make-slot-vector class slots))) + (set-slot 'slot-table (make-slot-table class slots))) ;; For all direct superclasses SUPER of CLASS, make sure CLASS is ;; a direct subclass of SUPER. Note that METACLASS-NAME doesn't Index: defs.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/defs.lisp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- defs.lisp 17 Jul 2007 20:50:19 -0000 1.61 +++ defs.lisp 29 Aug 2007 15:23:03 -0000 1.62 @@ -661,9 +661,9 @@ (slots :initform () :reader class-slots) - (slot-vector + (slot-table :initform #(nil) - :reader class-slot-vector))) + :reader class-slot-table))) ;;; The class STD-CLASS is an implementation-specific common ;;; superclass of the classes STANDARD-CLASS and Index: slots-boot.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/slots-boot.lisp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- slots-boot.lisp 27 Aug 2007 15:13:28 -0000 1.36 +++ slots-boot.lisp 29 Aug 2007 15:23:03 -0000 1.37 @@ -566,7 +566,7 @@ (defun find-slot-definition (class slot-name) (declare (symbol slot-name)) - (let* ((vector (class-slot-vector class)) + (let* ((vector (class-slot-table class)) (index (rem (sxhash slot-name) (length vector)))) (declare (simple-vector vector) (index index) (optimize (sb-c::insert-array-bounds-checks 0))) @@ -579,7 +579,7 @@ (defun find-slot-cell (class slot-name) (declare (symbol slot-name)) - (let* ((vector (class-slot-vector class)) + (let* ((vector (class-slot-table class)) (index (rem (sxhash slot-name) (length vector)))) (declare (simple-vector vector) (index index) (optimize (sb-c::insert-array-bounds-checks 0))) @@ -590,7 +590,7 @@ (when (eq key slot-name) (return (car plist))))))) -(defun make-slot-vector (class slots) +(defun make-slot-table (class slots) (let* ((n (+ (length slots) 2)) (vector (make-array n :initial-element nil)) (save-slot-location-p Index: std-class.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/pcl/std-class.lisp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- std-class.lisp 27 Aug 2007 15:13:28 -0000 1.114 +++ std-class.lisp 29 Aug 2007 15:23:03 -0000 1.115 @@ -536,7 +536,7 @@ (add-direct-subclasses class direct-superclasses) (let ((slots (compute-slots class))) (setf (slot-value class 'slots) slots - (slot-value class 'slot-vector) (make-slot-vector class slots))))) + (slot-value class 'slot-table) (make-slot-table class slots))))) ;; Comment from Gerd's PCL, 2003-05-15: ;; ;; We don't ADD-SLOT-ACCESSORS here because we don't want to @@ -718,7 +718,7 @@ (setf (slot-value class 'cpl-available-p) t) (let ((slots (compute-slots class))) (setf (slot-value class 'slots) slots - (slot-value class 'slot-vector) (make-slot-vector class slots))) + (slot-value class 'slot-table) (make-slot-table class slots))) (let ((lclass (find-classoid (class-name class)))) (setf (classoid-pcl-class lclass) class) (setf (slot-value class 'wrapper) (classoid-layout lclass))) @@ -895,7 +895,7 @@ (update-lisp-class-layout class nwrapper) (setf (slot-value class 'slots) eslotds - (slot-value class 'slot-vector) (make-slot-vector class eslotds) + (slot-value class 'slot-table) (make-slot-table class eslotds) (wrapper-instance-slots-layout nwrapper) nlayout (wrapper-class-slots nwrapper) nwrapper-class-slots (layout-length nwrapper) nslots @@ -1557,7 +1557,7 @@ (def class-direct-default-initargs) (def class-default-initargs)) -(defmethod class-slot-vector (class) +(defmethod class-slot-table (class) ;; Default method to cause FIND-SLOT-DEFINITION return NIL for all ;; non SLOT-CLASS classes. #(nil)) |