[Sbcl-commits] CVS: sbcl/src/code array.lisp,1.36,1.37

[Alexey D. <ade...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv1592/src/code

Modified Files:
	array.lisp 
Log Message:
0.8.1.1:
        * Fix bug 148: clean new blocks after failed inline expanding.


Index: array.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/array.lisp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- array.lisp	6 Jun 2003 09:09:14 -0000	1.36
+++ array.lisp	24 Jun 2003 04:36:38 -0000	1.37
@@ -388,7 +388,7 @@
 	  (let ((index (car subs))
 		(dim (%array-dimension array axis)))
 	    (declare (fixnum dim))
-	    (unless (< -1 index dim)
+	    (unless (and (fixnump index) (< -1 index dim))
 	      (if invalid-index-error-p
 		  (error 'simple-type-error
 			 :format-control "invalid index ~W~[~;~:; on axis ~:*~W~] in ~S"
@@ -400,7 +400,7 @@
 	    (setf chunk-size (* chunk-size dim))))
 	(let ((index (first subscripts))
 	      (length (length (the (simple-array * (*)) array))))
-	  (unless (< -1 index length)
+	  (unless (and (fixnump index) (< -1 index length))
 	    (if invalid-index-error-p
 		;; FIXME: perhaps this should share a format-string
 		;; with INVALID-ARRAY-INDEX-ERROR or
@@ -415,7 +415,7 @@
 
 (defun array-in-bounds-p (array &rest subscripts)
   #!+sb-doc
-  "Return T if the Subscipts are in bounds for the Array, Nil otherwise."
+  "Return T if the SUBSCIPTS are in bounds for the ARRAY, NIL otherwise."
   (if (%array-row-major-index array subscripts nil)
       t))
 
@@ -424,7 +424,7 @@
 
 (defun aref (array &rest subscripts)
   #!+sb-doc
-  "Return the element of the Array specified by the Subscripts."
+  "Return the element of the ARRAY specified by the SUBSCRIPTS."
   (row-major-aref array (%array-row-major-index array subscripts)))
 
 (defun %aset (array &rest stuff)