0.9.1.38:

[sbcl.git] / src / pcl / dlisp.lisp

diff --git a/src/pcl/dlisp.lisp b/src/pcl/dlisp.lisp
index c4c7115..6b388e4 100644 (file)
--- a/src/pcl/dlisp.lisp
+++ b/src/pcl/dlisp.lisp
@@ -61,7 +61,7 @@
 (defun emit-n-n-readers ()
   (emit-one-or-n-index-reader/writer :reader t nil))
 
-(defun emit-n-n-boundp ()
+(defun emit-n-n-boundps ()
   (emit-one-or-n-index-reader/writer :boundp t nil))
 
 (defun emit-n-n-writers ()
@@ -123,7 +123,7 @@
         (lambda `(lambda ,closure-variables
                    ,@(when (member 'miss-fn closure-variables)
                        `((declare (type function miss-fn))))
-                   #'(sb-kernel:instance-lambda ,args
+                   #'(instance-lambda ,args
                        (let ()
                          (declare #.*optimize-speed*)
                          ,form)))))
@@ -296,10 +296,9 @@
         (wrapper-bindings (mapcan (lambda (arg mt)
                                     (unless (eq mt t)
                                       (incf index)
-                                      `((,(intern (format nil
-                                                          "WRAPPER-~D"
-                                                          index)
-                                                  *pcl-package*)
+                                      `((,(format-symbol *pcl-package*
+                                                         "WRAPPER-~D"
+                                                         index)
                                          ,(emit-fetch-wrapper
                                            mt arg 'miss (pop slot-regs))))))
                                   args metatypes))