Commit c5d14dc7 authored by pfdietz's avatar pfdietz
Browse files

Replaced 'EQ with 'EQL in many tests where numbers or characters may be compared.

parent 40310b30
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
(values (values
(rassoc (progn (setf x (incf i)) 'c) (rassoc (progn (setf x (incf i)) 'c)
(progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c))) (progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c)))
:test (progn (setf z (incf i)) #'eq)) :test (progn (setf z (incf i)) #'eql))
i x y z)) i x y z))
(3 . c) 3 1 2 3) (3 . c) 3 1 2 3)
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
(values (values
(rassoc (progn (setf x (incf i)) 'c) (rassoc (progn (setf x (incf i)) 'c)
(progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c))) (progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c)))
:test #'eq) :test #'eql)
i x y)) i x y))
(3 . c) 2 1 2) (3 . c) 2 1 2)
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
2) 2)
(deftest count-list.2 (deftest count-list.2
(count 'a '(a b c d e a e f) :test #'eq) (count 'a '(a b c d e a e f) :test #'eql)
2) 2)
(deftest count-list.3 (deftest count-list.3
(count 'a '(a b c d e a e f) :test 'eq) (count 'a '(a b c d e a e f) :test 'eql)
2) 2)
(deftest count-list.4 (deftest count-list.4
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
7) 7)
(deftest count-list.15 (deftest count-list.15
(count 1 '(1 1 1 1 1 2 1 1) :test-not #'eq) (count 1 '(1 1 1 1 1 2 1 1) :test-not #'eql)
1) 1)
(deftest count-list.16 (deftest count-list.16
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
2) 2)
(deftest count-vector.2 (deftest count-vector.2
(count 'a #(a b c d e a e f) :test #'eq) (count 'a #(a b c d e a e f) :test #'eql)
2) 2)
(deftest count-vector.3 (deftest count-vector.3
(count 'a #(a b c d e a e f) :test 'eq) (count 'a #(a b c d e a e f) :test 'eql)
2) 2)
(deftest count-vector.4 (deftest count-vector.4
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
7) 7)
(deftest count-vector.15 (deftest count-vector.15
(count 1 #(1 1 1 1 1 2 1 1) :test-not #'eq) (count 1 #(1 1 1 1 1 2 1 1) :test-not #'eql)
1) 1)
(deftest count-vector16 (deftest count-vector16
...@@ -165,13 +165,13 @@ ...@@ -165,13 +165,13 @@
(deftest count-filled-vector.2 (deftest count-filled-vector.2
(count 'a (make-array 8 :initial-contents '(a b c d e a e f) (count 'a (make-array 8 :initial-contents '(a b c d e a e f)
:fill-pointer t) :fill-pointer t)
:test #'eq) :test #'eql)
2) 2)
(deftest count-filled-vector.3 (deftest count-filled-vector.3
(count 'a (make-array 8 :initial-contents '(a b c d e a e f) (count 'a (make-array 8 :initial-contents '(a b c d e a e f)
:fill-pointer t) :fill-pointer t)
:test 'eq) :test 'eql)
2) 2)
(deftest count-filled-vector.4 (deftest count-filled-vector.4
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
(deftest count-filled-vector.15 (deftest count-filled-vector.15
(count 1 (make-array 8 :initial-contents '(1 1 1 1 1 2 1 1) (count 1 (make-array 8 :initial-contents '(1 1 1 1 1 2 1 1)
:fill-pointer t) :fill-pointer t)
:test-not #'eq) :test-not #'eql)
1) 1)
(deftest count-filled-vector.16 (deftest count-filled-vector.16
...@@ -291,11 +291,11 @@ ...@@ -291,11 +291,11 @@
7) 7)
(deftest count-bit-vector.2 (deftest count-bit-vector.2
(count 1 #*00101100011011000 :test #'eq) (count 1 #*00101100011011000 :test #'eql)
7) 7)
(deftest count-bit-vector.3 (deftest count-bit-vector.3
(count 1 #*00101100011011000 :test 'eq) (count 1 #*00101100011011000 :test 'eql)
7) 7)
(deftest count-bit-vector.4 (deftest count-bit-vector.4
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
7) 7)
(deftest count-bit-vector.15 (deftest count-bit-vector.15
(count 1 #*11111011 :test-not #'eq) (count 1 #*11111011 :test-not #'eql)
1) 1)
(deftest count-bit-vector.16 (deftest count-bit-vector.16
...@@ -392,11 +392,11 @@ ...@@ -392,11 +392,11 @@
7) 7)
(deftest count-string.2 (deftest count-string.2
(count #\1 "00101100011011000" :test #'eq) (count #\1 "00101100011011000" :test #'eql)
7) 7)
(deftest count-string.3 (deftest count-string.3
(count #\1 "00101100011011000" :test 'eq) (count #\1 "00101100011011000" :test 'eql)
7) 7)
(deftest count-string.4 (deftest count-string.4
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
7) 7)
(deftest count-string.15 (deftest count-string.15
(count #\1 "11111011" :test-not #'eq) (count #\1 "11111011" :test-not #'eql)
1) 1)
(deftest count-string.16 (deftest count-string.16
......
...@@ -82,53 +82,53 @@ ...@@ -82,53 +82,53 @@
4) 4)
(deftest find-list.14 (deftest find-list.14
(find 'a '(a a b a c e d a f a) :test (complement #'eq)) (find 'a '(a a b a c e d a f a) :test (complement #'eql))
b) b)
(deftest find-list.15 (deftest find-list.15
(find 'a '(a a b a c e d a f a) :test (complement #'eq) (find 'a '(a a b a c e d a f a) :test (complement #'eql)
:from-end t) :from-end t)
f) f)
(deftest find-list.16 (deftest find-list.16
(find 'a '(a a b a c e d a f a) :test-not #'eq) (find 'a '(a a b a c e d a f a) :test-not #'eql)
b) b)
(deftest find-list.17 (deftest find-list.17
(find 'a '(a a b a c e d a f a) :test-not 'eq (find 'a '(a a b a c e d a f a) :test-not 'eql
:from-end t) :from-end t)
f) f)
(deftest find-list.18 (deftest find-list.18
(find 'a '(a a b a c e d a f a) :test-not 'eq) (find 'a '(a a b a c e d a f a) :test-not 'eql)
b) b)
(deftest find-list.19 (deftest find-list.19
(find 'a '(a a b a c e d a f a) :test-not #'eq (find 'a '(a a b a c e d a f a) :test-not #'eql
:from-end t) :from-end t)
f) f)
(deftest find-list.20 (deftest find-list.20
(find 'a '(a a b a c e d a f a) :test-not #'eq) (find 'a '(a a b a c e d a f a) :test-not #'eql)
b) b)
(deftest find-list.21 (deftest find-list.21
(find 'a '(a a b a c e d a f a) :test #'eq (find 'a '(a a b a c e d a f a) :test #'eql
:start 2) :start 2)
a) a)
(deftest find-list.22 (deftest find-list.22
(find 'a '(a a b a c e d a f a) :test #'eq (find 'a '(a a b a c e d a f a) :test #'eql
:start 2 :end nil) :start 2 :end nil)
a) a)
(deftest find-list.23 (deftest find-list.23
(find 'a '(a a b a c e d a f a) :test-not #'eq (find 'a '(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
b) b)
(deftest find-list.24 (deftest find-list.24
(find 'a '(a a b a c e d a f a) :test-not #'eq (find 'a '(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
c) c)
...@@ -237,53 +237,53 @@ ...@@ -237,53 +237,53 @@
4) 4)
(deftest find-vector.14 (deftest find-vector.14
(find 'a #(a a b a c e d a f a) :test (complement #'eq)) (find 'a #(a a b a c e d a f a) :test (complement #'eql))
b) b)
(deftest find-vector.15 (deftest find-vector.15
(find 'a #(a a b a c e d a f a) :test (complement #'eq) (find 'a #(a a b a c e d a f a) :test (complement #'eql)
:from-end t) :from-end t)
f) f)
(deftest find-vector.16 (deftest find-vector.16
(find 'a #(a a b a c e d a f a) :test-not #'eq) (find 'a #(a a b a c e d a f a) :test-not #'eql)
b) b)
(deftest find-vector.17 (deftest find-vector.17
(find 'a #(a a b a c e d a f a) :test-not 'eq (find 'a #(a a b a c e d a f a) :test-not 'eql
:from-end t) :from-end t)
f) f)
(deftest find-vector.18 (deftest find-vector.18
(find 'a #(a a b a c e d a f a) :test-not 'eq) (find 'a #(a a b a c e d a f a) :test-not 'eql)
b) b)
(deftest find-vector.19 (deftest find-vector.19
(find 'a #(a a b a c e d a f a) :test-not #'eq (find 'a #(a a b a c e d a f a) :test-not #'eql
:from-end t) :from-end t)
f) f)
(deftest find-vector.20 (deftest find-vector.20
(find 'a #(a a b a c e d a f a) :test-not #'eq) (find 'a #(a a b a c e d a f a) :test-not #'eql)
b) b)
(deftest find-vector.21 (deftest find-vector.21
(find 'a #(a a b a c e d a f a) :test #'eq (find 'a #(a a b a c e d a f a) :test #'eql
:start 2) :start 2)
a) a)
(deftest find-vector.22 (deftest find-vector.22
(find 'a #(a a b a c e d a f a) :test #'eq (find 'a #(a a b a c e d a f a) :test #'eql
:start 2 :end nil) :start 2 :end nil)
a) a)
(deftest find-vector.23 (deftest find-vector.23
(find 'a #(a a b a c e d a f a) :test-not #'eq (find 'a #(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
b) b)
(deftest find-vector.24 (deftest find-vector.24
(find 'a #(a a b a c e d a f a) :test-not #'eq (find 'a #(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
c) c)
...@@ -435,120 +435,120 @@ ...@@ -435,120 +435,120 @@
1) 1)
(deftest find-bit-vector.14 (deftest find-bit-vector.14
(find 0 #*0010111010 :test (complement #'eq)) (find 0 #*0010111010 :test (complement #'eql))
1) 1)
(deftest find-bit-vector.15 (deftest find-bit-vector.15
(find 0 #*0010111010 :test (complement #'eq) (find 0 #*0010111010 :test (complement #'eql)
:from-end t) :from-end t)
1) 1)
(deftest find-bit-vector.16 (deftest find-bit-vector.16
(find 0 #*0010111010 :test-not #'eq) (find 0 #*0010111010 :test-not #'eql)
1) 1)
(deftest find-bit-vector.16a (deftest find-bit-vector.16a
(find 1 #*111111111111 :test-not #'eq) (find 1 #*111111111111 :test-not #'eql)
nil) nil)
(deftest find-bit-vector.16b (deftest find-bit-vector.16b
(find 0 #*0000000 :test-not #'eq) (find 0 #*0000000 :test-not #'eql)
nil) nil)
(deftest find-bit-vector.17 (deftest find-bit-vector.17
(find 0 #*001011101 :test-not 'eq (find 0 #*001011101 :test-not 'eql
:from-end t) :from-end t)
1) 1)
(deftest find-bit-vector.17a (deftest find-bit-vector.17a
(find 0 #*0000000 :test-not 'eq (find 0 #*0000000 :test-not 'eql
:from-end t) :from-end t)
nil) nil)
(deftest find-bit-vector.17b (deftest find-bit-vector.17b
(find 1 #*111111111111 :test-not 'eq (find 1 #*111111111111 :test-not 'eql
:from-end t) :from-end t)
nil) nil)
(deftest find-bit-vector.18 (deftest find-bit-vector.18
(find 0 #*00101110 :test-not 'eq) (find 0 #*00101110 :test-not 'eql)
1) 1)
(deftest find-bit-vector.18a (deftest find-bit-vector.18a
(find 0 #*00000000 :test-not 'eq) (find 0 #*00000000 :test-not 'eql)
nil) nil)
(deftest find-bit-vector.19 (deftest find-bit-vector.19
(find 0 #*00101110 :test-not #'eq (find 0 #*00101110 :test-not #'eql
:from-end t) :from-end t)
1) 1)
(deftest find-bit-vector.19a (deftest find-bit-vector.19a
(find 0 #*00000000 :test-not #'eq (find 0 #*00000000 :test-not #'eql
:from-end t) :from-end t)
nil) nil)
(deftest find-bit-vector.20 (deftest find-bit-vector.20
(find 0 #*00101110 :test-not #'eq) (find 0 #*00101110 :test-not #'eql)
1) 1)
(deftest find-bit-vector.21 (deftest find-bit-vector.21
(find 0 #*00101110 :test #'eq (find 0 #*00101110 :test #'eql
:start 2) :start 2)
0) 0)
(deftest find-bit-vector.21a (deftest find-bit-vector.21a
(find 0 #*00111111 :test #'eq (find 0 #*00111111 :test #'eql
:start 2) :start 2)
nil) nil)
(deftest find-bit-vector.21b (deftest find-bit-vector.21b
(find 1 #*00111111 :test #'eq (find 1 #*00111111 :test #'eql
:start 2) :start 2)
1) 1)
(deftest find-bit-vector.22 (deftest find-bit-vector.22
(find 0 #*00101110 :test #'eq (find 0 #*00101110 :test #'eql
:start 2 :end nil) :start 2 :end nil)
0) 0)
(deftest find-bit-vector.22a (deftest find-bit-vector.22a
(find 0 #*001111111 :test #'eq (find 0 #*001111111 :test #'eql
:start 2 :end nil) :start 2 :end nil)
nil) nil)
(deftest find-bit-vector.22b (deftest find-bit-vector.22b
(find 1 #*001111111 :test #'eq (find 1 #*001111111 :test #'eql
:start 2 :end nil) :start 2 :end nil)
1) 1)
(deftest find-bit-vector.23 (deftest find-bit-vector.23
(find 0 #*00101110 :test-not #'eq (find 0 #*00101110 :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
1) 1)
(deftest find-bit-vector.23a (deftest find-bit-vector.23a
(find 0 #*00000111 :test-not #'eq (find 0 #*00000111 :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
nil) nil)
(deftest find-bit-vector.23b (deftest find-bit-vector.23b
(find 0 #*00001000 :test-not #'eq (find 0 #*00001000 :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
1) 1)
(deftest find-bit-vector.24 (deftest find-bit-vector.24
(find 0 #*00101110 :test-not #'eq (find 0 #*00101110 :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
1) 1)
(deftest find-bit-vector.24a (deftest find-bit-vector.24a
(find 0 #*0000001111 :test-not #'eq (find 0 #*0000001111 :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
nil) nil)
(deftest find-bit-vector.24b (deftest find-bit-vector.24b
(find 0 #*0000100 :test-not #'eq (find 0 #*0000100 :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
1) 1)
...@@ -679,34 +679,34 @@ ...@@ -679,34 +679,34 @@
#\4) #\4)
(deftest find-string.14 (deftest find-string.14
(find #\a "aabacedafa" :test (complement #'eq)) (find #\a "aabacedafa" :test (complement #'eql))
#\b) #\b)
(deftest find-string.15 (deftest find-string.15
(find #\a "aabacedafa" :test (complement #'eq) (find #\a "aabacedafa" :test (complement #'eql)
:from-end t) :from-end t)
#\f) #\f)
(deftest find-string.16 (deftest find-string.16
(find #\a "aabacedafa" :test-not #'eq) (find #\a "aabacedafa" :test-not #'eql)
#\b) #\b)
(deftest find-string.17 (deftest find-string.17
(find #\a "aabacedafa" :test-not 'eq (find #\a "aabacedafa" :test-not 'eql
:from-end t) :from-end t)
#\f) #\f)
(deftest find-string.18 (deftest find-string.18
(find #\a "aabacedafa" :test-not 'eq) (find #\a "aabacedafa" :test-not 'eql)
#\b) #\b)
(deftest find-string.19 (deftest find-string.19
(find #\a "aabacedafa" :test-not #'eq (find #\a "aabacedafa" :test-not #'eql
:from-end t) :from-end t)
#\f) #\f)
(deftest find-string.20 (deftest find-string.20
(find #\a "aabacedafa" :test-not #'eq) (find #\a "aabacedafa" :test-not #'eql)
#\b) #\b)