From 5db20042be5acd2d98fc5e5eb642633e42be6914 Mon Sep 17 00:00:00 2001
From: pwerkowski <pwerkowski>
Date: Wed, 13 Apr 2005 11:59:23 +0000
Subject: [PATCH] Back out improper use of condition SIMPLE-TYPE-ERROR in AREF.
 AFAICT, ANSI does not specify any type of exceptional condition for array
 bounds errors, and a type-error doesn't seem appropriate here. Reverting to
 SIMPLE-ERROR.

---
 code/array.lisp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/array.lisp b/code/array.lisp
index 8863d07ec..09077ad84 100644
--- a/code/array.lisp
+++ b/code/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.38 2004/04/06 17:18:03 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.39 2005/04/13 11:59:23 pwerkowski Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -398,8 +398,7 @@
 	    (declare (fixnum index dim))
 	    (unless (< -1 index dim)
 	      (if invalid-index-error-p
-		  (error 'simple-type-error
-			 "Invalid index ~D~[~;~:; on axis ~:*~D~] in ~S"
+		  (error "Invalid index ~D~[~;~:; on axis ~:*~D~] in ~S"
 			 index axis array)
 		  (return-from %array-row-major-index nil)))
 	    (incf result (* chunk-size index))
@@ -407,8 +406,7 @@
 	(let ((index (first subscripts)))
 	  (unless (< -1 index (length (the (simple-array * (*)) array)))
 	    (if invalid-index-error-p
-		(error 'simple-type-error
-		       "Invalid index ~D in ~S" index array)
+		(error "Invalid index ~D in ~S" index array)
 		(return-from %array-row-major-index nil)))
 	  index))))
 
-- 
GitLab