From 0e7a9105ae992fc4befa37846c42f298e12918c0 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Wed, 29 Aug 2007 15:23:01 +0000 Subject: [PATCH] 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. --- src/pcl/braid.lisp | 2 +- src/pcl/defs.lisp | 4 ++-- src/pcl/slots-boot.lisp | 6 +++--- src/pcl/std-class.lisp | 8 ++++---- version.lisp-expr | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp index 3ae9be4..46b7a6c 100644 --- a/src/pcl/braid.lisp +++ b/src/pcl/braid.lisp @@ -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 diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp index e01064e..dff7856 100644 --- a/src/pcl/defs.lisp +++ b/src/pcl/defs.lisp @@ -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 diff --git a/src/pcl/slots-boot.lisp b/src/pcl/slots-boot.lisp index 36b70d9..5e181fd 100644 --- a/src/pcl/slots-boot.lisp +++ b/src/pcl/slots-boot.lisp @@ -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 diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp index fcb86c1..de6b643 100644 --- a/src/pcl/std-class.lisp +++ b/src/pcl/std-class.lisp @@ -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)) diff --git a/version.lisp-expr b/version.lisp-expr index 025cef0..0cee396 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.9.8" +"1.0.9.9" -- 1.7.10.4