X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fdefclass.lisp;h=2c1dfeddca4803f70627cc70ca7e3e5990ffead8;hb=bd0ba0f214518e8d72ff2d44de5a1e3e4b02af2c;hp=ac41b14bc21109753717dc51a17c90c7307aba99;hpb=6c129930bd75f25a66aa0cbf0e5bc8091401d5ce;p=sbcl.git

diff --git a/src/pcl/defclass.lisp b/src/pcl/defclass.lisp
index ac41b14..2c1dfed 100644
--- a/src/pcl/defclass.lisp
+++ b/src/pcl/defclass.lisp
@@ -72,11 +72,7 @@
 	      (error "The value of the :metaclass option (~S) is not a~%~
 		      legal class name."
 		     (cadr option)))
-	    (setq metaclass
-                    (case (cadr option)
-                      (cl:standard-class 'standard-class)
-                      (cl:structure-class 'structure-class)
-                      (t (cadr option))))
+	    (setq metaclass (cadr option))
 	    (setf options (remove option options))
 	    (return t))))
 
@@ -111,10 +107,10 @@
 			       *writers-for-this-defclass*)
                      ,@(mapcar (lambda (x)
                                  `(declaim (ftype (function (t) t)
-                                                  ,(slot-reader-symbol x)
-                                                  ,(slot-boundp-symbol x))
+                                                  ,(slot-reader-name x)
+                                                  ,(slot-boundp-name x))
                                            (ftype (function (t t) t)
-                                                  ,(slot-writer-symbol x))))
+                                                  ,(slot-writer-name x))))
                                *slot-names-for-this-defclass*)
 		     (let ,(mapcar #'cdr *initfunctions-for-this-defclass*)
 		       (load-defclass ',name
@@ -400,7 +396,7 @@
 	canonical-options (copy-tree canonical-options))
   (let ((ecd
 	  (make-early-class-definition name
-				       *load-truename*
+				       *load-pathname*
 				       metaclass
 				       supers
 				       canonical-slots