X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots.lisp;h=e726ba4a8723eee37f9f64b64d9f81c437d7a406;hb=dea9bd5c1afe23d9e061c60db654b88187ba9a5e;hp=40360b75b8f6ddca1d714c3d6446e770c314795f;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index 40360b7..e726ba4 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)))
@@ -80,7 +80,7 @@
   (let ((entry (assoc slot-name (wrapper-class-slots wrapper))))
     (if (null entry)
 	(slot-missing (wrapper-class wrapper) object slot-name 'slot-value)
-	(if (eq (cdr entry) *slot-unbound*)
+	(if (eq (cdr entry) +slot-unbound+)
 	    (slot-unbound (wrapper-class wrapper) object slot-name)
 	    (cdr entry)))))
 
@@ -129,21 +129,21 @@
   (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)
+(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)
-
 (defun slot-boundp (object slot-name)
   (let* ((class (class-of object))
 	 (slot-definition (find-slot-definition class slot-name)))
@@ -179,10 +179,10 @@
       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)
@@ -191,23 +191,26 @@
 	 (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)))
+			  (when (invalid-wrapper-p (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)))
+			  (when (invalid-wrapper-p (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*)
+    (if (eq value +slot-unbound+)
 	(slot-unbound class object (slot-definition-name slotd))
 	value)))
 
@@ -219,19 +222,21 @@
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-	      (unless (eq 't (wrapper-state (std-instance-wrapper object)))
+	      (when (invalid-wrapper-p (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)))
+	      (when (invalid-wrapper-p (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
@@ -242,21 +247,26 @@
 	 (value (typecase location
 		  (fixnum
 		   (cond ((std-instance-p object)
-			  (unless (eq 't (wrapper-state (std-instance-wrapper object)))
+			  (when (invalid-wrapper-p (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)))
+			  (when (invalid-wrapper-p (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*))))
+    (not (eq value +slot-unbound+))))
 
 (defmethod slot-makunbound-using-class
 	   ((class std-class)
@@ -266,19 +276,21 @@
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-	      (unless (eq 't (wrapper-state (std-instance-wrapper object)))
+	      (when (invalid-wrapper-p (std-instance-wrapper object))
 		(check-wrapper-validity object))
-	      (setf (%instance-ref (std-instance-slots object) location) *slot-unbound*))
+               (setf (clos-slots-ref (std-instance-slots object) location)
+		     +slot-unbound+))
 	     ((fsc-instance-p object)
-	      (unless (eq 't (wrapper-state (fsc-instance-wrapper object)))
+	      (when (invalid-wrapper-p (fsc-instance-wrapper object))
 		(check-wrapper-validity object))
-	      (setf (%instance-ref (fsc-instance-slots object) location) *slot-unbound*))
+               (setf (clos-slots-ref (fsc-instance-slots object) location)
+		     +slot-unbound+))
 	     (t (error "unrecognized instance type"))))
       (cons
-       (setf (cdr location) *slot-unbound*))
+       (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)
 
@@ -289,7 +301,7 @@
   (let* ((function (slot-definition-internal-reader-function slotd))
 	 (value (funcall function object)))
     (declare (type function function))
-    (if (eq value *slot-unbound*)
+    (if (eq value +slot-unbound+)
 	(slot-unbound class object (slot-definition-name slotd))
 	value)))
 
@@ -315,14 +327,15 @@
 
 (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
-			 "set the slot's value to ~S (setf of slot-value)"
+			 "set the slot's value to ~S (SETF of SLOT-VALUE)"
 			 new-value))
-	   (slot-boundp "test to see whether slot is bound (slot-boundp)")
-	   (slot-makunbound "make the slot unbound (slot-makunbound)"))
+	   (slot-boundp "test to see whether slot is bound (SLOT-BOUNDP)")
+	   (slot-makunbound "make the slot unbound (SLOT-MAKUNBOUND)"))
 	 slot-name
 	 instance))