X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots.lisp;h=a19070bd352cf556561c751bb2ae45275f673bad;hb=237ecea4a44f33d40440ea40c67c54e9e23358b3;hp=a7bcb6d1b7eea4c5f9122bacec1628ae1b8c9573;hpb=675c5a9f9e3028bc2fd922ed6f570f01cf8c41cf;p=sbcl.git

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index a7bcb6d..a19070b 100644
--- a/src/pcl/slots.lisp
+++ b/src/pcl/slots.lisp
@@ -28,8 +28,8 @@
 (define-condition unbound-slot (cell-error)
   ((instance :reader unbound-slot-instance :initarg :instance)
    (slot :reader unbound-slot-slot :initarg :slot))
-  (:report (lambda(condition stream)
-	     (format stream "The slot ~S is unbound in the object ~S"
+  (:report (lambda (condition stream)
+	     (format stream "The slot ~S is unbound in the object ~S."
 		     (unbound-slot-slot condition)
 		     (unbound-slot-instance condition)))))
 
@@ -58,7 +58,7 @@
 	 (error "unrecognized instance type"))))
 
 (defun swap-wrappers-and-slots (i1 i2)
-  (without-interrupts
+  (sb-sys:without-interrupts
    (cond ((std-instance-p i1)
 	  (let ((w1 (std-instance-wrapper i1))
 		(s1 (std-instance-slots i1)))
@@ -116,33 +116,25 @@
 	(slot-missing class object slot-name 'slot-value)
 	(slot-value-using-class class object slot-definition))))
 
-(setf (gdefinition 'slot-value-normal) #'slot-value)
-
-(define-compiler-macro slot-value (object-form slot-name-form)
-  (if (and (constantp slot-name-form)
-	   (let ((slot-name (eval slot-name-form)))
-	     (and (symbolp slot-name) (symbol-package slot-name))))
-      `(accessor-slot-value ,object-form ,slot-name-form)
-      `(slot-value-normal ,object-form ,slot-name-form)))
+(define-compiler-macro slot-value (&whole form object slot-name)
+  (if (and (constantp slot-name)
+	   (interned-symbol-p (eval slot-name)))
+      `(accessor-slot-value ,object ,slot-name)
+      form))
 
 (defun set-slot-value (object slot-name new-value)
   (let* ((class (class-of object))
 	 (slot-definition (find-slot-definition class slot-name)))
     (if (null slot-definition)
-	(slot-missing class object slot-name 'setf)
+	(slot-missing class object slot-name 'setf new-value)
 	(setf (slot-value-using-class class object slot-definition)
 	      new-value))))
 
-(setf (gdefinition 'set-slot-value-normal) #'set-slot-value)
-
-(define-compiler-macro set-slot-value (object-form slot-name-form new-value-form)
-  (if (and (constantp slot-name-form)
-	   (let ((slot-name (eval slot-name-form)))
-	     (and (symbolp slot-name) (symbol-package slot-name))))
-      `(accessor-set-slot-value ,object-form ,slot-name-form ,new-value-form)
-      `(set-slot-value-normal ,object-form ,slot-name-form ,new-value-form)))
-
-(defconstant +optimize-slot-boundp+ nil)
+(define-compiler-macro set-slot-value (&whole form object slot-name new-value)
+  (if (and (constantp slot-name)
+	   (interned-symbol-p (eval slot-name)))
+      `(accessor-set-slot-value ,object ,slot-name ,new-value)
+      form))
 
 (defun slot-boundp (object slot-name)
   (let* ((class (class-of object))
@@ -153,12 +145,11 @@
 
 (setf (gdefinition 'slot-boundp-normal) #'slot-boundp)
 
-(define-compiler-macro slot-boundp (object-form slot-name-form)
-  (if (and (constantp slot-name-form)
-	   (let ((slot-name (eval slot-name-form)))
-	     (and (symbolp slot-name) (symbol-package slot-name))))
-      `(accessor-slot-boundp ,object-form ,slot-name-form)
-      `(slot-boundp-normal ,object-form ,slot-name-form)))
+(define-compiler-macro slot-boundp (&whole form object slot-name)
+  (if (and (constantp slot-name)
+	   (interned-symbol-p (eval slot-name)))
+      `(accessor-slot-boundp ,object ,slot-name)
+      form))
 
 (defun slot-makunbound (object slot-name)
   (let* ((class (class-of object))
@@ -179,33 +170,31 @@
       default))
 
 (defun standard-instance-access (instance location)
-  (%instance-ref (std-instance-slots instance) location))
+  (clos-slots-ref (std-instance-slots instance) location))
 
 (defun funcallable-standard-instance-access (instance location)
-  (%instance-ref (fsc-instance-slots instance) location))
+  (clos-slots-ref (fsc-instance-slots instance) location))
 
 (defmethod slot-value-using-class ((class std-class)
 				   (object std-object)
 				   (slotd standard-effective-slot-definition))
+  (check-obsolete-instance object)
   (let* ((location (slot-definition-location slotd))
 	 (value (typecase location
 		  (fixnum
 		   (cond ((std-instance-p object)
-			  ;; FIXME: EQ T (WRAPPER-STATE ..) is better done
-			  ;; through INVALID-WRAPPER-P (here and below).
-			  (unless (eq 't (wrapper-state (std-instance-wrapper object)))
-			    (check-wrapper-validity object))
-			  (%instance-ref (std-instance-slots object) location))
+			  (clos-slots-ref (std-instance-slots object)
+					  location))
 			 ((fsc-instance-p object)
-			  (unless (eq 't (wrapper-state (fsc-instance-wrapper object)))
-			    (check-wrapper-validity object))
-			  (%instance-ref (fsc-instance-slots object) location))
+			  (clos-slots-ref (fsc-instance-slots object)
+					  location))
 			 (t (error "unrecognized instance type"))))
 		  (cons
 		   (cdr location))
 		  (t
-		   (error "The slot ~S has neither :INSTANCE nor :CLASS allocation, ~@
-			   so it can't be read by the default ~S method."
+		   (error "~@<The slot ~S has neither :INSTANCE nor :CLASS ~
+                           allocation, so it can't be read by the default ~
+                           ~S method.~@:>"
 			  slotd 'slot-value-using-class)))))
     (if (eq value +slot-unbound+)
 	(slot-unbound class object (slot-definition-name slotd))
@@ -215,46 +204,45 @@
 	   (new-value (class std-class)
 		      (object std-object)
 		      (slotd standard-effective-slot-definition))
+  (check-obsolete-instance object)
   (let ((location (slot-definition-location slotd)))
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-	      (unless (eq 't (wrapper-state (std-instance-wrapper object)))
-		(check-wrapper-validity object))
-	      (setf (%instance-ref (std-instance-slots object) location) new-value))
+	      (setf (clos-slots-ref (std-instance-slots object) location)
+		    new-value))
 	     ((fsc-instance-p object)
-	      (unless (eq 't (wrapper-state (fsc-instance-wrapper object)))
-		(check-wrapper-validity object))
-	      (setf (%instance-ref (fsc-instance-slots object) location) new-value))
+	      (setf (clos-slots-ref (fsc-instance-slots object) location)
+		    new-value))
 	     (t (error "unrecognized instance type"))))
       (cons
        (setf (cdr location) new-value))
       (t
-       (error "The slot ~S has neither :INSTANCE nor :CLASS allocation, ~@
-			   so it can't be written by the default ~S method."
+       (error "~@<The slot ~S has neither :INSTANCE nor :CLASS allocation, ~
+		   so it can't be written by the default ~S method.~:@>"
 	      slotd '(setf slot-value-using-class))))))
 
 (defmethod slot-boundp-using-class
 	   ((class std-class)
 	    (object std-object)
 	    (slotd standard-effective-slot-definition))
+  (check-obsolete-instance object)
   (let* ((location (slot-definition-location slotd))
 	 (value (typecase location
 		  (fixnum
 		   (cond ((std-instance-p object)
-			  (unless (eq 't (wrapper-state (std-instance-wrapper object)))
-			    (check-wrapper-validity object))
-			  (%instance-ref (std-instance-slots object) location))
+			  (clos-slots-ref (std-instance-slots object)
+					  location))
 			 ((fsc-instance-p object)
-			  (unless (eq 't (wrapper-state (fsc-instance-wrapper object)))
-			    (check-wrapper-validity object))
-			  (%instance-ref (fsc-instance-slots object) location))
+			  (clos-slots-ref (fsc-instance-slots object)
+					  location))
 			 (t (error "unrecognized instance type"))))
 		  (cons
 		   (cdr location))
 		  (t
-		   (error "The slot ~S has neither :INSTANCE nor :CLASS allocation, ~@
-			   so it can't be read by the default ~S method."
+		   (error "~@<The slot ~S has neither :INSTANCE nor :CLASS ~
+                           allocation, so it can't be read by the default ~S ~
+                           method.~@:>"
 			  slotd 'slot-boundp-using-class)))))
     (not (eq value +slot-unbound+))))
 
@@ -262,25 +250,22 @@
 	   ((class std-class)
 	    (object std-object)
 	    (slotd standard-effective-slot-definition))
+  (check-obsolete-instance object)
   (let ((location (slot-definition-location slotd)))
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-	      (unless (eq 't (wrapper-state (std-instance-wrapper object)))
-		(check-wrapper-validity object))
-	      (setf (%instance-ref (std-instance-slots object) location)
+	      (setf (clos-slots-ref (std-instance-slots object) location)
 		    +slot-unbound+))
 	     ((fsc-instance-p object)
-	      (unless (eq 't (wrapper-state (fsc-instance-wrapper object)))
-		(check-wrapper-validity object))
-	      (setf (%instance-ref (fsc-instance-slots object) location)
+	      (setf (clos-slots-ref (fsc-instance-slots object) location)
 		    +slot-unbound+))
 	     (t (error "unrecognized instance type"))))
       (cons
        (setf (cdr location) +slot-unbound+))
       (t
-       (error "The slot ~S has neither :INSTANCE nor :CLASS allocation, ~@
-			   so it can't be written by the default ~S method."
+       (error "~@<The slot ~S has neither :INSTANCE nor :CLASS allocation, ~
+	       so it can't be written by the default ~S method.~@:>"
 	      slotd 'slot-makunbound-using-class))))
   nil)
 
@@ -317,7 +302,8 @@
 
 (defmethod slot-missing
 	   ((class t) instance slot-name operation &optional new-value)
-  (error "When attempting to ~A,~%the slot ~S is missing from the object ~S."
+  (error "~@<When attempting to ~A, the slot ~S is missing from the ~
+          object ~S.~@:>"
 	 (ecase operation
 	   (slot-value "read the slot's value (slot-value)")
 	   (setf (format nil