X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Ffast-init.lisp;h=39740442a20883aa76d7b6d4b18493c3c0059e8f;hb=aebbc5aad31f7e55930c996a8c54f0a135e00894;hp=b5cb581b89c84543d0e5e0cbb7b566da38962ab3;hpb=a8f0175b16a00f5fc83eb8d8a718ae7fc5497514;p=sbcl.git

diff --git a/src/pcl/fast-init.lisp b/src/pcl/fast-init.lisp
index b5cb581..3974044 100644
--- a/src/pcl/fast-init.lisp
+++ b/src/pcl/fast-init.lisp
@@ -64,14 +64,14 @@
 	  ;;   1. Don't worry, I know what I'm doing.
 	  ;;   2. You and what army?
 	  ;;   3. If you were as smart as you think you are, you
-	  ;;      wouldn't be a copy.
+	  ;;      wouldn't be a cop.
 	  ;; This is case #1.:-) Even if SYM hasn't been defined yet,
 	  ;; it must be an implementation function, or we we wouldn't
 	  ;; have expanded into it. So declare SYM as defined, so that
 	  ;; even if it hasn't been defined yet, the user doesn't get
 	  ;; obscure warnings about undefined internal implementation
 	  ;; functions like HAIRY-MAKE-instance-name.
-	  (sb-kernel:become-defined-fun-name sym)
+	  (become-defined-fun-name sym)
 	  `(,sym ',class (list ,@initargs)))))))
 
 (defmacro expanding-make-instance-toplevel (&rest forms &environment env)
@@ -128,8 +128,9 @@
 		(*print-case* :upcase)
 		(*print-pretty* nil))
 	    (intern (format nil
-			    "MAKE-INSTANCE ~S ~S ~S"
-			    class-name
+			    "MAKE-INSTANCE ~A::~A ~S ~S"
+			    (package-name (symbol-package class-name))
+			    (symbol-name class-name)
 			    keys
 			    allow-other-keys-p))))))))
 
@@ -491,7 +492,7 @@
 				      initialize-instance-methods)))))
       (lambda (class1 initargs)
 	(if (not (eq wrapper (class-wrapper class)))
-	    (let* ((info (initialize-info class1 initargs))
+	    (let* ((info (initialize-info (coerce-to-class class1) initargs))
 		   (fn (initialize-info-make-instance-function info)))
 	      (declare (type function fn))
 	      (funcall fn class1 initargs))
@@ -534,7 +535,7 @@
 	     (list wrapper *the-wrapper-of-t*))))
       (lambda (class1 initargs)
 	(if (not (eq wrapper (class-wrapper class)))
-	    (let* ((info (initialize-info class1 initargs))
+	    (let* ((info (initialize-info (coerce-to-class class1) initargs))
 		   (fn (initialize-info-make-instance-function info)))
 	      (declare (type function fn))
 	      (funcall fn class1 initargs))