Changeset 261

Timestamp:

Jan 11, 2004, 5:53:00 PM (21 years ago)

Author:

Gary Byers

Message:

ARRAY-IN-BOUNDS-P allows bignum subscripts (which are never in bounds,
of course.)

File:

• trunk/ccl/lib/arrays-fry.lisp (modified) (2 diffs)

trunk/ccl/lib/arrays-fry.lisp

@@ -397 +397 @@
   (let ((rank  (array-rank array))
         (nsubs (%lexpr-count subscripts)))
-    (declare (fixnum sum rank))    
+    (declare (fixnum nsubs rank))    
     (if (not (eql nsubs rank))
       (%err-disp $xndims array nsubs)
@@ -405 +405 @@
               (dim (array-dimension array i) (array-dimension array i)))
              (nil)
-          (declare (fixnum i))
+          (declare (fixnum i dim))
           (let ((s  (%lexpr-ref subscripts nsubs i)))
-            (require-type s 'fixnum)
-            (if (or (< s 0)(>= s dim)) (return nil))
+            (if (typep s 'fixnum)
+              (locally (declare (fixnum s))
+                (if (or (< s 0)(>= s dim)) (return nil)))
+              (if (typep s 'bignum)
+                (return nil)
+                (report-bad-arg s 'integer)))
             (when (eql i 0) (return t))))))))