X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fboot.lisp;h=87c30fe284e274dd7f246a5837edcc5d6f387463;hb=f3f677703e37f5a335b3be7fa64f7748ad969517;hp=b08d3a33f09ac590363d7756471b4ea2d90010ac;hpb=70af994bbab490a2547bb61186f370e41332f3e5;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index b08d3a3..87c30fe 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1009,15 +1009,21 @@ bootstrapping.
 	   (cond ((null args)
 		  (if (eql nreq 0)
 		      (invoke-fast-method-call emf)
-		      (error "wrong number of args")))
+		      (error 'simple-program-error
+			     :format-control "invalid number of arguments: 0"
+			     :format-arguments nil)))
 		 ((null (cdr args))
 		  (if (eql nreq 1)
 		      (invoke-fast-method-call emf (car args))
-		      (error "wrong number of args")))
+		      (error 'simple-program-error
+			     :format-control "invalid number of arguments: 1"
+			     :format-arguments nil)))
 		 ((null (cddr args))
 		  (if (eql nreq 2)
 		      (invoke-fast-method-call emf (car args) (cadr args))
-		      (error "wrong number of args")))
+		      (error 'simple-program-error
+			     :format-control "invalid number of arguments: 2"
+			     :format-arguments nil)))
 		 (t
 		  (apply (fast-method-call-function emf)
 			 (fast-method-call-pv-cell emf)
@@ -1028,7 +1034,10 @@ bootstrapping.
 	    args
 	    (method-call-call-method-args emf)))
     (fixnum
-     (cond ((null args) (error "1 or 2 args were expected."))
+     (cond ((null args)
+	    (error 'simple-program-error
+		   :format-control "invalid number of arguments: 0"
+		   :format-arguments nil))
 	   ((null (cdr args))
 	    (let* ((slots (get-slots (car args)))
                    (value (clos-slots-ref slots emf)))
@@ -1036,16 +1045,19 @@ bootstrapping.
 		  (slot-unbound-internal (car args) emf)
 		  value)))
 	   ((null (cddr args))
-             (setf (clos-slots-ref (get-slots (cadr args)) emf)
-		   (car args)))
-	   (t (error "1 or 2 args were expected."))))
+	    (setf (clos-slots-ref (get-slots (cadr args)) emf)
+		  (car args)))
+	   (t (error 'simple-program-error
+		     :format-control "invalid number of arguments"
+		     :format-arguments nil))))
     (fast-instance-boundp
      (if (or (null args) (cdr args))
-	 (error "1 arg was expected.")
-       (let ((slots (get-slots (car args))))
-	 (not (eq (clos-slots-ref slots
-				  (fast-instance-boundp-index emf))
-		  +slot-unbound+)))))
+	 (error 'simple-program-error
+		:format-control "invalid number of arguments"
+		:format-arguments nil)
+	 (let ((slots (get-slots (car args))))
+	   (not (eq (clos-slots-ref slots (fast-instance-boundp-index emf))
+		    +slot-unbound+)))))
     (function
      (apply emf args))))