X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcode%2Ftarget-defstruct.lisp;h=9af080e3a51f8ce8b58ca6cdd05221517203f629;hb=e27303999070c06c788a0e1359ee4b0900186aa1;hp=4df84792685a41efead2ae89b0ff5d34d8bd720f;hpb=0dcc957ae6bf24809fda82fd59c134e70058c42a;p=sbcl.git

diff --git a/src/code/target-defstruct.lisp b/src/code/target-defstruct.lisp
index 4df8479..9af080e 100644
--- a/src/code/target-defstruct.lisp
+++ b/src/code/target-defstruct.lisp
@@ -197,9 +197,10 @@
 		      (output-symbol-name (dsd-%name slot) stream)
 		      (write-char #\space stream)
 		      (pprint-newline :miser stream)
-		      (output-object (funcall (fdefinition (dsd-accessor slot))
-					      structure)
-				     stream)
+		      (output-object
+		       (funcall (fdefinition (dsd-accessor-name slot))
+				structure)
+		       stream)
 		      (when (null slots)
 			(return))
 		      (write-char #\space stream)
@@ -222,9 +223,10 @@
 		(let ((slot (first slots)))
 		  (output-symbol-name (dsd-%name slot) stream)
 		  (write-char #\space stream)
-		  (output-object (funcall (fdefinition (dsd-accessor slot))
-					  structure)
-				 stream))))))))
+		  (output-object
+		   (funcall (fdefinition (dsd-accessor-name slot))
+			    structure)
+		   stream))))))))
 (def!method print-object ((x structure-object) stream)
   (default-structure-print x stream *current-level*))
 
@@ -307,7 +309,7 @@
 		       :format-control
 		       "Structure for accessor ~S is not a ~S:~% ~S"
 		       :format-arguments
-		       (list (dsd-accessor dsd)
+		       (list (dsd-accessor-name dsd)
 			     (sb!xc:class-name (layout-class layout))
 			     structure))))
 	    (%instance-ref structure (dsd-index dsd)))
@@ -320,7 +322,7 @@
 		     :format-control
 		     "The structure for accessor ~S is not a ~S:~% ~S"
 		     :format-arguments
-		     (list (dsd-accessor dsd) class
+		     (list (dsd-accessor-name dsd) class
 			   structure)))
 	    (%instance-ref structure (dsd-index dsd))))))
 (defun structure-slot-setter (layout dsd)
@@ -339,7 +341,7 @@
 		       :format-control
 		       "The structure for setter ~S is not a ~S:~% ~S"
 		       :format-arguments
-		       (list `(setf ,(dsd-accessor dsd))
+		       (list `(setf ,(dsd-accessor-name dsd))
 			     (sb!xc:class-name (layout-class layout))
 			     structure)))
 	      (unless  (typep-test new-value)
@@ -349,7 +351,7 @@
 		       :format-control
 		       "The new value for setter ~S is not a ~S:~% ~S"
 		       :format-arguments
-		       (list `(setf ,(dsd-accessor dsd))
+		       (list `(setf ,(dsd-accessor-name dsd))
 			      (dsd-type dsd)
 			      new-value))))
 	    (setf (%instance-ref structure (dsd-index dsd)) new-value))
@@ -366,7 +368,7 @@
 		       :format-control
 		       "The structure for setter ~S is not a ~S:~% ~S"
 		       :format-arguments
-		       (list `(setf ,(dsd-accessor dsd))
+		       (list `(setf ,(dsd-accessor-name dsd))
 			     (sb!xc:class-name class)
 			     structure)))
 	      (unless  (typep-test new-value)
@@ -376,7 +378,7 @@
 		       :format-control
 		       "The new value for setter ~S is not a ~S:~% ~S"
 		       :format-arguments
-		       (list `(setf ,(dsd-accessor dsd))
+		       (list `(setf ,(dsd-accessor-name dsd))
 			     (dsd-type dsd)
 			     new-value))))
 	    (setf (%instance-ref structure (dsd-index dsd)) new-value)))))