X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Farray.lisp;h=7a8f1b23b2bed8884e30f0f84a8df827917fcdd6;hb=b767eae48831153473226b985511c8f7a3ef98c5;hp=f2b646ab0c15592b942e50b30e8e9fe824722b85;hpb=5384ab22e633886f56e981054bf83580765008ad;p=sbcl.git

diff --git a/src/code/array.lisp b/src/code/array.lisp
index f2b646a..7a8f1b2 100644
--- a/src/code/array.lisp
+++ b/src/code/array.lisp
@@ -19,18 +19,18 @@
 
 ;;; These functions are only needed by the interpreter, 'cause the
 ;;; compiler inlines them.
-(macrolet ((def-frob (name)
+(macrolet ((def (name)
 	     `(progn
 		(defun ,name (array)
 		  (,name array))
 		(defun (setf ,name) (value array)
 		  (setf (,name array) value)))))
-  (def-frob %array-fill-pointer)
-  (def-frob %array-fill-pointer-p)
-  (def-frob %array-available-elements)
-  (def-frob %array-data-vector)
-  (def-frob %array-displacement)
-  (def-frob %array-displaced-p))
+  (def %array-fill-pointer)
+  (def %array-fill-pointer-p)
+  (def %array-available-elements)
+  (def %array-data-vector)
+  (def %array-displacement)
+  (def %array-displaced-p))
 
 (defun %array-rank (array)
   (%array-rank array))
@@ -55,7 +55,7 @@
 (defun failed-%with-array-data (array start end)
   (declare (notinline %with-array-data))
   (%with-array-data array start end)
-  (error "internal error: shouldn't be here with valid parameters"))
+  (bug "called FAILED-%WITH-ARRAY-DATA with valid array parameters?"))
 
 ;;;; MAKE-ARRAY
 
@@ -492,20 +492,20 @@
   "Return the type of the elements of the array"
   (let ((widetag (widetag-of array)))
     (macrolet ((pick-element-type (&rest stuff)
-		 `(cond ,@(mapcar #'(lambda (stuff)
-				      (cons
-				       (let ((item (car stuff)))
-					 (cond ((eq item t)
-						t)
-					       ((listp item)
-						(cons 'or
-						      (mapcar (lambda (x)
-								`(= widetag ,x))
-							      item)))
-					       (t
-						`(= widetag ,item))))
-				       (cdr stuff)))
-						   stuff))))
+		 `(cond ,@(mapcar (lambda (stuff)
+				    (cons
+				     (let ((item (car stuff)))
+				       (cond ((eq item t)
+					      t)
+					     ((listp item)
+					      (cons 'or
+						    (mapcar (lambda (x)
+							      `(= widetag ,x))
+							    item)))
+					     (t
+					      `(= widetag ,item))))
+				     (cdr stuff)))
+				  stuff))))
       ;; FIXME: The data here are redundant with
       ;; *SPECIALIZED-ARRAY-ELEMENT-TYPE-PROPERTIES*.
       (pick-element-type
@@ -539,7 +539,7 @@
 	  (declare (ignore start end))
 	  (array-element-type array)))
        (t
-	(error "~S is not an array." array))))))
+	(error 'type-error :datum array :expected-type 'array))))))
 
 (defun array-rank (array)
   #!+sb-doc
@@ -930,9 +930,9 @@
 
 (defun zap-array-data-aux (old-data old-dims offset new-data new-dims)
   (declare (fixnum offset))
-  (let ((limits (mapcar #'(lambda (x y)
-			    (declare (fixnum x y))
-			    (1- (the fixnum (min x y))))
+  (let ((limits (mapcar (lambda (x y)
+			  (declare (fixnum x y))
+			  (1- (the fixnum (min x y))))
 			old-dims new-dims)))
     (macrolet ((bump-index-list (index limits)
 		 `(do ((subscripts ,index (cdr subscripts))