X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=c3b30b2b5ea662fce5600c99406423a540029df5;hb=316eddc9b2b1aa24012ed826ce700105fdbcdfdb;hp=69f7e174c16d7304e11464c1c87d5ea98a82f63e;hpb=c7638557b3c7b34267daba188d345f5d284f4ac3;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 69f7e17..c3b30b2 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -78,15 +78,6 @@ bootstrapping.
 ;;; then things break.)
 (declaim (declaration class))
 
-;;; FIXME: SB-KERNEL::PCL-CHECK-WRAPPER-VALIDITY-HOOK shouldn't be a
-;;; separate function. Instead, we should define a simple placeholder
-;;; version of SB-PCL:CHECK-WRAPPER-VALIDITY where
-;;; SB-KERNEL::PCL-CHECK-WRAPPER-VALIDITY is defined now, then just
-;;; let the later real PCL DEFUN of SB-PCL:CHECK-WRAPPER-VALIDITY
-;;; overwrite it.
-(setf (symbol-function 'sb-kernel::pcl-check-wrapper-validity-hook)
-      #'check-wrapper-validity)
-
 (declaim (notinline make-a-method
 		    add-named-method
 		    ensure-generic-function-using-class
@@ -239,7 +230,11 @@ bootstrapping.
   (flet ((ensure (arg ok)
            (unless ok
 	     (error
-	      "invalid argument ~S in the generic function lambda list ~S"
+	      ;; (s/invalid/non-ANSI-conforming/ because the old PCL
+	      ;; implementation allowed this, so people got used to
+	      ;; it, and maybe this phrasing will help them to guess
+	      ;; why their program which worked under PCL no longer works.)
+	      "~@<non-ANSI-conforming argument ~S ~_in the generic function lambda list ~S~:>"
 	      arg lambda-list))))
     (multiple-value-bind (required optional restp rest keyp keys allowp
                           auxp aux morep more-context more-count)
@@ -968,30 +963,6 @@ bootstrapping.
 		  +slot-unbound+)))))
     (function
      (apply emf args))))
-
-;; KLUDGE: A comment from the original PCL said "This can be improved alot."
-(defun gf-make-function-from-emf (gf emf)
-  (etypecase emf
-    (fast-method-call (let* ((arg-info (gf-arg-info gf))
-			     (nreq (arg-info-number-required arg-info))
-			     (restp (arg-info-applyp arg-info)))
-			(lambda (&rest args)
-			  (trace-emf-call emf t args)
-			  (apply (fast-method-call-function emf)
-				 (fast-method-call-pv-cell emf)
-				 (fast-method-call-next-method-call emf)
-				 (if restp
-				     (let* ((rest-args (nthcdr nreq args))
-					    (req-args (ldiff args
-							     rest-args)))
-				       (nconc req-args rest-args))
-				     args)))))
-    (method-call (lambda (&rest args)
-		   (trace-emf-call emf t args)
-		   (apply (method-call-function emf)
-			  args
-			  (method-call-call-method-args emf))))
-    (function emf)))
 
 (defmacro bind-fast-lexical-method-macros ((args rest-arg next-method-call)
 					   &body body)