X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=eb4be3d0881f47861684b7416effb130c3783e75;hb=672ac5849b408281b5ca0dfc3fd58d418de2b272;hp=8271e4c60345d3312f149d10485b425a8dccd4e7;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 8271e4c..eb4be3d 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -40,7 +40,6 @@
 	 ;; where his error was detected instead of telling him where
 	 ;; he ended up inside the system error-handling logic.
 	 (declare (ignorable name ,fp ,context ,sc-offsets))
-	 (/show0 "about to do outer LETs in DEFERR macroexpanded DEFUN")
 	 (let (,@(let ((offset -1))
 		   (mapcar #'(lambda (var)
 			       `(,var (sb!di::sub-access-debug-var-slot
@@ -68,397 +67,341 @@
 
 (deferr object-not-function-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'function))
 
 (deferr object-not-list-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'list))
 
 (deferr object-not-bignum-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'bignum))
 
 (deferr object-not-ratio-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'ratio))
 
 (deferr object-not-single-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'single-float))
 
 (deferr object-not-double-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'double-float))
 
 #!+long-float
 (deferr object-not-long-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'long-float))
 
 (deferr object-not-simple-string-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'simple-string))
 
 (deferr object-not-simple-bit-vector-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'simple-bit-vector))
 
 (deferr object-not-simple-vector-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'simple-vector))
 
 (deferr object-not-fixnum-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'fixnum))
 
 (deferr object-not-function-or-symbol-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(or function symbol)))
 
 (deferr object-not-vector-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'vector))
 
 (deferr object-not-string-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'string))
 
 (deferr object-not-bit-vector-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'bit-vector))
 
 (deferr object-not-array-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'array))
 
 (deferr object-not-number-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'number))
 
 (deferr object-not-rational-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'rational))
 
 (deferr object-not-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'float))
 
 (deferr object-not-real-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'real))
 
 (deferr object-not-integer-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'integer))
 
 (deferr object-not-cons-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'cons))
 
 (deferr object-not-symbol-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'symbol))
 
 (deferr undefined-symbol-error (fdefn-or-symbol)
   (error 'undefined-function
-	 :function-name name
 	 :name (etypecase fdefn-or-symbol
 		 (symbol fdefn-or-symbol)
 		 (fdefn (fdefn-name fdefn-or-symbol)))))
 
 (deferr object-not-coerceable-to-function-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'coerceable-to-function))
 
 (deferr invalid-argument-count-error (nargs)
   (error 'simple-program-error
-	 :function-name name
 	 :format-control "invalid number of arguments: ~S"
 	 :format-arguments (list nargs)))
 
 (deferr bogus-argument-to-values-list-error (list)
-  (error 'type-error
-	 :function-name name
-	 :format-control "attempt to use VALUES-LIST on a dotted-list:~%  ~S"
+  (error 'simple-type-error
+	 :datum list
+	 :expected-type 'list
+	 :format-control
+	 "~@<attempt to use VALUES-LIST on a dotted list: ~2I~_~S~:>"
 	 :format-arguments (list list)))
 
 (deferr unbound-symbol-error (symbol)
-  (error 'unbound-variable :function-name name :name symbol))
+  (error 'unbound-variable :name symbol))
 
 (deferr object-not-base-char-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'base-char))
 
 (deferr object-not-sap-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'system-area-pointer))
 
 (deferr invalid-unwind-error ()
   (error 'simple-control-error
-	 :function-name name
 	 :format-control
-	 "attempt to RETURN-FROM a block or GO to a tag that no longer exists"))
+	 "attempt to RETURN-FROM a block or GO to a tag that no longer exists"
+	 ))
 
 (deferr unseen-throw-tag-error (tag)
   (error 'simple-control-error
-	 :function-name name
 	 :format-control "attempt to THROW to a tag that does not exist: ~S"
 	 :format-arguments (list tag)))
 
 (deferr nil-function-returned-error (function)
   (error 'simple-control-error
-	 :function-name name
 	 :format-control
 	 "A function with declared result type NIL returned:~%  ~S"
 	 :format-arguments (list function)))
 
 (deferr division-by-zero-error (this that)
   (error 'division-by-zero
-	 :function-name name
 	 :operation 'division
 	 :operands (list this that)))
 
 (deferr object-not-type-error (object type)
-  (/show0 "entering body of DEFERR OBJECT-NOT-TYPE-ERROR, OBJECT,TYPE=..")
-  #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr object))
-  #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr type))
   (error (if (and (typep object 'instance)
 		  (layout-invalid (%instance-layout object)))
 	     'layout-invalid
 	     'type-error)
-	 :function-name name
 	 :datum object
 	 :expected-type type))
 
 (deferr layout-invalid-error (object layout)
   (error 'layout-invalid
-	 :function-name name
 	 :datum object
 	 :expected-type (layout-class layout)))
 
-(deferr odd-keyword-arguments-error ()
+(deferr odd-key-arguments-error ()
   (error 'simple-program-error
-	 :function-name name
-	 :format-control "odd number of keyword arguments"))
+	 :format-control "odd number of &KEY arguments"))
 
-(deferr unknown-keyword-argument-error (key)
+(deferr unknown-key-argument-error (key-name)
   (error 'simple-program-error
-	 :function-name name
-	 :format-control "unknown keyword: ~S"
-	 :format-arguments (list key)))
+	 :format-control "unknown &KEY argument: ~S"
+	 :format-arguments (list key-name)))
 
 (deferr invalid-array-index-error (array bound index)
   (error 'simple-error
-	 :function-name name
 	 :format-control
-	 "invalid array index, ~D for ~S (should have been less than ~D)"
+	 "invalid array index ~D for ~S (should be nonnegative and <~D)"
 	 :format-arguments (list index array bound)))
 
 (deferr object-not-simple-array-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'simple-array))
 
 (deferr object-not-signed-byte-32-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(signed-byte 32)))
 
 (deferr object-not-unsigned-byte-32-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(unsigned-byte 32)))
 
 (deferr object-not-simple-array-unsigned-byte-2-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 2) (*))))
 
 (deferr object-not-simple-array-unsigned-byte-4-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 4) (*))))
 
 (deferr object-not-simple-array-unsigned-byte-8-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 8) (*))))
 
 (deferr object-not-simple-array-unsigned-byte-16-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 16) (*))))
 
 (deferr object-not-simple-array-unsigned-byte-32-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 32) (*))))
 
 (deferr object-not-simple-array-signed-byte-8-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 8) (*))))
 
 (deferr object-not-simple-array-signed-byte-16-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 16) (*))))
 
 (deferr object-not-simple-array-signed-byte-30-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 30) (*))))
 
 (deferr object-not-simple-array-signed-byte-32-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 32) (*))))
 
 (deferr object-not-simple-array-single-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array single-float (*))))
 
 (deferr object-not-simple-array-double-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array double-float (*))))
 
 (deferr object-not-simple-array-complex-single-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (complex single-float) (*))))
 
 (deferr object-not-simple-array-complex-double-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (complex double-float) (*))))
 
 #!+long-float
 (deferr object-not-simple-array-complex-long-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (complex long-float) (*))))
 
 (deferr object-not-complex-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'complex))
 
 (deferr object-not-complex-rational-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(complex rational)))
 
 (deferr object-not-complex-single-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(complex single-float)))
 
 (deferr object-not-complex-double-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(complex double-float)))
 
 #!+long-float
 (deferr object-not-complex-long-float-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type '(complex long-float)))
 
 (deferr object-not-weak-pointer-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'weak-pointer))
 
 (deferr object-not-instance-error (object)
   (error 'type-error
-	 :function-name name
 	 :datum object
 	 :expected-type 'instance))
+
+(deferr object-not-complex-vector-error (object)
+  (error 'type-error
+	 :datum object
+	 :expected-type '(and vector (not simple-array))))
 
 ;;;; fetching errorful function name
 
-;;; This variable is used to prevent infinite recursive lossage when
+;;; This flag is used to prevent infinite recursive lossage when
 ;;; we can't find the caller for some reason.
 (defvar *finding-name* nil)
 
-(defun find-caller-name ()
+(defun find-caller-name-and-frame ()
   (if *finding-name*
       (values "<error finding caller name -- already finding name>" nil)
       (handler-case
@@ -499,7 +442,7 @@
 (defun internal-error (context continuable)
   (declare (type system-area-pointer context) (ignore continuable))
   (/show0 "entering INTERNAL-ERROR, CONTEXT=..")
-  #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr context))
+  (/hexstr context)
   (infinite-error-protect
    (let ((context (locally
 		    (declare (optimize (inhibit-warnings 3)))
@@ -514,7 +457,6 @@
 			     (svref *internal-errors* error-number))))
 	   (cond ((null handler)
 		  (error 'simple-error
-			 :function-name name
 			 :format-control
 			 "unknown internal error, ~D? args=~S"
 			 :format-arguments
@@ -525,7 +467,6 @@
 				       arguments))))
 		 ((not (functionp handler))
 		  (error 'simple-error
-			 :function-name name
 			 :format-control "internal error ~D: ~A; args=~S"
 			 :format-arguments
 			 (list error-number