X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots-boot.lisp;h=9fc23ba78fba06ebbb862ced7d63cca871491ddb;hb=510a9c48b7a80bf89ee54bdbd92519e76e8e178d;hp=59908e9f60b4a355977caefa3332a7b1c7b12ba7;hpb=0a82f2db352cc348d2107a882e50af222ff97ed3;p=sbcl.git

diff --git a/src/pcl/slots-boot.lisp b/src/pcl/slots-boot.lisp
index 59908e9..9fc23ba 100644
--- a/src/pcl/slots-boot.lisp
+++ b/src/pcl/slots-boot.lisp
@@ -97,8 +97,8 @@
 
 (defun make-structure-slot-boundp-function (slotd)
   (let* ((reader (slot-definition-internal-reader-function slotd))
-	 (fun #'(lambda (object)
-		  (not (eq (funcall reader object) +slot-unbound+)))))
+	 (fun (lambda (object)
+		(not (eq (funcall reader object) +slot-unbound+)))))
     (declare (type function reader))
     fun))
 
@@ -172,17 +172,17 @@
   (set-fun-name
    (etypecase index
      (fixnum (if fsc-p
-		 #'(lambda (instance)
-		     (not (eq (clos-slots-ref (fsc-instance-slots instance)
-					     index)
-			      +slot-unbound+)))
-		 #'(lambda (instance)
-		     (not (eq (clos-slots-ref (std-instance-slots instance)
-					     index)
-			      +slot-unbound+)))))
-     (cons   #'(lambda (instance)
-		 (declare (ignore instance))
-		 (not (eq (cdr index) +slot-unbound+)))))
+		 (lambda (instance)
+		   (not (eq (clos-slots-ref (fsc-instance-slots instance)
+					    index)
+			    +slot-unbound+)))
+		 (lambda (instance)
+		   (not (eq (clos-slots-ref (std-instance-slots instance)
+					    index)
+			    +slot-unbound+)))))
+     (cons (lambda (instance)
+	     (declare (ignore instance))
+	     (not (eq (cdr index) +slot-unbound+)))))
    `(boundp ,slot-name)))
 
 (defun make-optimized-structure-slot-value-using-class-method-function (function)
@@ -195,15 +195,15 @@
 
 (defun make-optimized-structure-setf-slot-value-using-class-method-function (function)
   (declare (type function function))
-  #'(lambda (nv class object slotd)
-      (declare (ignore class slotd))
-      (funcall function nv object)))
+  (lambda (nv class object slotd)
+    (declare (ignore class slotd))
+    (funcall function nv object)))
 
 (defun make-optimized-structure-slot-boundp-using-class-method-function (function)
   (declare (type function function))
-  #'(lambda (class object slotd)
-      (declare (ignore class slotd))
-      (not (eq (funcall function object) +slot-unbound+))))
+  (lambda (class object slotd)
+    (declare (ignore class slotd))
+    (not (eq (funcall function object) +slot-unbound+))))
 
 (defun get-optimized-std-slot-value-using-class-method-function (class
 								 slotd
@@ -310,7 +310,7 @@
      `(,name ,(class-name class) ,(slot-definition-name slotd)))))
 
 (defun make-internal-reader-method-function (class-name slot-name)
-  (list* ':method-spec `(internal-reader-method ,class-name ,slot-name)
+  (list* :method-spec `(internal-reader-method ,class-name ,slot-name)
 	 (make-method-function
 	  (lambda (instance)
 	    (let ((wrapper (get-instance-wrapper-or-nil instance)))
@@ -352,10 +352,10 @@
 			 (instance-read-internal
 			  .pv. instance-slots 1
 			  (slot-value instance slot-name))))))))
-    (setf (getf (getf initargs ':plist) ':slot-name-lists)
+    (setf (getf (getf initargs :plist) :slot-name-lists)
 	  (list (list nil slot-name)))
-    (setf (getf (getf initargs ':plist) ':pv-table-symbol) pv-table-symbol)
-    (list* ':method-spec `(reader-method ,class-name ,slot-name)
+    (setf (getf (getf initargs :plist) :pv-table-symbol) pv-table-symbol)
+    (list* :method-spec `(reader-method ,class-name ,slot-name)
 	   initargs)))
 
 (defun make-std-writer-method-function (class-name slot-name)
@@ -369,10 +369,10 @@
 			 (instance-write-internal
 			  .pv. instance-slots 1 nv
 			  (setf (slot-value instance slot-name) nv))))))))
-    (setf (getf (getf initargs ':plist) ':slot-name-lists)
+    (setf (getf (getf initargs :plist) :slot-name-lists)
 	  (list nil (list nil slot-name)))
-    (setf (getf (getf initargs ':plist) ':pv-table-symbol) pv-table-symbol)
-    (list* ':method-spec `(writer-method ,class-name ,slot-name)
+    (setf (getf (getf initargs :plist) :pv-table-symbol) pv-table-symbol)
+    (list* :method-spec `(writer-method ,class-name ,slot-name)
 	   initargs)))
 
 (defun make-std-boundp-method-function (class-name slot-name)
@@ -386,10 +386,10 @@
 			  (instance-boundp-internal
 			   .pv. instance-slots 1
 			   (slot-boundp instance slot-name))))))))
-    (setf (getf (getf initargs ':plist) ':slot-name-lists)
+    (setf (getf (getf initargs :plist) :slot-name-lists)
 	  (list (list nil slot-name)))
-    (setf (getf (getf initargs ':plist) ':pv-table-symbol) pv-table-symbol)
-    (list* ':method-spec `(boundp-method ,class-name ,slot-name)
+    (setf (getf (getf initargs :plist) :pv-table-symbol) pv-table-symbol)
+    (list* :method-spec `(boundp-method ,class-name ,slot-name)
 	   initargs)))
 
 (defun initialize-internal-slot-gfs (slot-name &optional type)