X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fbit-vector.impure-cload.lisp;h=65f075adb361c4291fedcd41d3554449dbc7ddfd;hb=1cba0af01f5107ab384d0d8b94b1f6330b3d0ef4;hp=87a95560e4623a296d98a9aa58327aaaef9c7c48;hpb=079ef9dad558ca07cb8178ef428bf738112174fa;p=sbcl.git

diff --git a/tests/bit-vector.impure-cload.lisp b/tests/bit-vector.impure-cload.lisp
index 87a9556..65f075a 100644
--- a/tests/bit-vector.impure-cload.lisp
+++ b/tests/bit-vector.impure-cload.lisp
@@ -4,7 +4,7 @@
 ;;;; While most of SBCL is derived from the CMU CL system, the test
 ;;;; files (like this one) were written from scratch after the fork
 ;;;; from CMU CL.
-;;;; 
+;;;;
 ;;;; This software is in the public domain and is provided with
 ;;;; absolutely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
@@ -19,13 +19,13 @@
 (defun test-small-bit-vectors ()
   ;; deal with the potential length 0 special case
   (let ((a (make-array 0 :element-type 'bit))
-	(b (make-array 0 :element-type 'bit)))
+        (b (make-array 0 :element-type 'bit)))
     (assert (equal (bit-not a) #*))
     (assert (equal (bit-xor a b a) #*))
     (assert (equal (bit-and a a b) #*)))
   ;; also test some return values for sanity
   (let ((a (make-array 33 :element-type 'bit :initial-element 0))
-	(b (make-array 33 :element-type 'bit :initial-element 0)))
+        (b (make-array 33 :element-type 'bit :initial-element 0)))
     (assert (equal (bit-not a a) #*111111111111111111111111111111111))
     (setf (aref a 0) 0) ; a = #*011..1
     (setf (aref b 1) 1) ; b = #*010..0
@@ -35,8 +35,8 @@
   (locally
       (declare (optimize (speed 3) (space 1)))
     (let ((bv1 (make-array 5 :element-type 'bit))
-	  (bv2 (make-array 0 :element-type 'bit))
-	  (bv3 (make-array 68 :element-type 'bit)))
+          (bv2 (make-array 0 :element-type 'bit))
+          (bv3 (make-array 68 :element-type 'bit)))
       (declare (type simple-bit-vector bv1 bv2 bv3))
       (setf (sbit bv3 42) 1)
       ;; bitvector smaller than the word size
@@ -55,35 +55,55 @@
 
 (defun test-big-bit-vectors ()
   ;; now test the biggy, mostly that it works...
-  (let ((a (progn 
-	     (inform :make-array-1)
-	     (make-array (1- array-dimension-limit) 
-			 :element-type 'bit :initial-element 0)))
-	(b (progn
-	     (inform :make-array-2)
-	     (make-array (1- array-dimension-limit) 
-			 :element-type 'bit :initial-element 0))))
+  (let ((a (progn
+             (inform :make-array-1)
+             (make-array (1- array-dimension-limit)
+                         :element-type 'bit :initial-element 0)))
+        (b (progn
+             (inform :make-array-2)
+             (make-array (1- array-dimension-limit)
+                         :element-type 'bit :initial-element 0))))
     (inform :bit-not)
     (bit-not a a)
     (inform :aref-1)
     (assert (= (aref a 0) 1))
     (inform :aref-2)
     (assert (= (aref a (- array-dimension-limit 2)) 1))
-    #-darwin
-    (progn
-      (inform :bit-and)
-      (bit-and a b a)
-      (inform :aref-3)
-      (assert (= (aref a 0) 0))
-      (inform :aref-4)
-      (assert (= (aref a (- array-dimension-limit 2)) 0)))))
+    (inform :bit-and)
+    (bit-and a b a)
+    (inform :aref-3)
+    (assert (= (aref a 0) 0))
+    (inform :aref-4)
+    (assert (= (aref a (- array-dimension-limit 2)) 0))))
 
 (test-small-bit-vectors)
 
-#-x86-64 
-;; except on machines where addressable space is likely to be
-;; much bigger than physical memory
+;; except on machines where the arrays won't fit into the dynamic space.
+#+#.(cl:if (cl:> (sb-ext:dynamic-space-size)
+                 (cl:truncate (cl:1- cl:array-dimension-limit)
+                              sb-vm:n-word-bits))
+           '(and)
+           '(or))
 (test-big-bit-vectors)
-
-;;; success
-(sb-ext:quit :unix-status 104)
+
+(with-test (:name :find-non-bit-from-bit-vector)
+  (assert (not (find #\a #*0101)))
+  (assert (not (position #\a #*0101)))
+  (let ((f1 (compile nil
+                     `(lambda (b)
+                        (find b #*0101))))
+        (f2 (compile nil
+                     `(lambda (b)
+                        (position b #*0101)))))
+    (assert (not (funcall f1 t)))
+    (assert (not (funcall f2 t))))
+  (let ((f1 (compile nil
+                     `(lambda (b)
+                        (declare (bit-vector b))
+                        (find t b))))
+        (f2 (compile nil
+                     `(lambda (b)
+                        (declare (bit-vector b))
+                        (position t b)))))
+    (assert (not (funcall f1 #*010101)))
+    (assert (not (funcall f2 #*101010)))))