Commit c5d14dc7 authored by pfdietz's avatar pfdietz

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

parent 40310b30
......@@ -206,7 +206,7 @@
(values
(rassoc (progn (setf x (incf i)) '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))
(3 . c) 3 1 2 3)
......@@ -215,7 +215,7 @@
(values
(rassoc (progn (setf x (incf i)) 'c)
(progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c)))
:test #'eq)
:test #'eql)
i x y))
(3 . c) 2 1 2)
......
......@@ -10,11 +10,11 @@
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)
(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)
(deftest count-list.4
......@@ -71,7 +71,7 @@
7)
(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)
(deftest count-list.16
......@@ -86,11 +86,11 @@
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)
(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)
(deftest count-vector.4
......@@ -147,7 +147,7 @@
7)
(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)
(deftest count-vector16
......@@ -165,13 +165,13 @@
(deftest count-filled-vector.2
(count 'a (make-array 8 :initial-contents '(a b c d e a e f)
:fill-pointer t)
:test #'eq)
:test #'eql)
2)
(deftest count-filled-vector.3
(count 'a (make-array 8 :initial-contents '(a b c d e a e f)
:fill-pointer t)
:test 'eq)
:test 'eql)
2)
(deftest count-filled-vector.4
......@@ -250,7 +250,7 @@
(deftest count-filled-vector.15
(count 1 (make-array 8 :initial-contents '(1 1 1 1 1 2 1 1)
:fill-pointer t)
:test-not #'eq)
:test-not #'eql)
1)
(deftest count-filled-vector.16
......@@ -291,11 +291,11 @@
7)
(deftest count-bit-vector.2
(count 1 #*00101100011011000 :test #'eq)
(count 1 #*00101100011011000 :test #'eql)
7)
(deftest count-bit-vector.3
(count 1 #*00101100011011000 :test 'eq)
(count 1 #*00101100011011000 :test 'eql)
7)
(deftest count-bit-vector.4
......@@ -348,7 +348,7 @@
7)
(deftest count-bit-vector.15
(count 1 #*11111011 :test-not #'eq)
(count 1 #*11111011 :test-not #'eql)
1)
(deftest count-bit-vector.16
......@@ -392,11 +392,11 @@
7)
(deftest count-string.2
(count #\1 "00101100011011000" :test #'eq)
(count #\1 "00101100011011000" :test #'eql)
7)
(deftest count-string.3
(count #\1 "00101100011011000" :test 'eq)
(count #\1 "00101100011011000" :test 'eql)
7)
(deftest count-string.4
......@@ -451,7 +451,7 @@
7)
(deftest count-string.15
(count #\1 "11111011" :test-not #'eq)
(count #\1 "11111011" :test-not #'eql)
1)
(deftest count-string.16
......
......@@ -82,53 +82,53 @@
4)
(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)
(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)
f)
(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)
(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)
f)
(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)
(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)
f)
(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)
(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)
a)
(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)
a)
(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)
b)
(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)
c)
......@@ -237,53 +237,53 @@
4)
(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)
(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)
f)
(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)
(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)
f)
(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)
(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)
f)
(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)
(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)
a)
(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)
a)
(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)
b)
(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)
c)
......@@ -435,120 +435,120 @@
1)
(deftest find-bit-vector.14
(find 0 #*0010111010 :test (complement #'eq))
(find 0 #*0010111010 :test (complement #'eql))
1)
(deftest find-bit-vector.15
(find 0 #*0010111010 :test (complement #'eq)
(find 0 #*0010111010 :test (complement #'eql)
:from-end t)
1)
(deftest find-bit-vector.16
(find 0 #*0010111010 :test-not #'eq)
(find 0 #*0010111010 :test-not #'eql)
1)
(deftest find-bit-vector.16a
(find 1 #*111111111111 :test-not #'eq)
(find 1 #*111111111111 :test-not #'eql)
nil)
(deftest find-bit-vector.16b
(find 0 #*0000000 :test-not #'eq)
(find 0 #*0000000 :test-not #'eql)
nil)
(deftest find-bit-vector.17
(find 0 #*001011101 :test-not 'eq
(find 0 #*001011101 :test-not 'eql
:from-end t)
1)
(deftest find-bit-vector.17a
(find 0 #*0000000 :test-not 'eq
(find 0 #*0000000 :test-not 'eql
:from-end t)
nil)
(deftest find-bit-vector.17b
(find 1 #*111111111111 :test-not 'eq
(find 1 #*111111111111 :test-not 'eql
:from-end t)
nil)
(deftest find-bit-vector.18
(find 0 #*00101110 :test-not 'eq)
(find 0 #*00101110 :test-not 'eql)
1)
(deftest find-bit-vector.18a
(find 0 #*00000000 :test-not 'eq)
(find 0 #*00000000 :test-not 'eql)
nil)
(deftest find-bit-vector.19
(find 0 #*00101110 :test-not #'eq
(find 0 #*00101110 :test-not #'eql
:from-end t)
1)
(deftest find-bit-vector.19a
(find 0 #*00000000 :test-not #'eq
(find 0 #*00000000 :test-not #'eql
:from-end t)
nil)
(deftest find-bit-vector.20
(find 0 #*00101110 :test-not #'eq)
(find 0 #*00101110 :test-not #'eql)
1)
(deftest find-bit-vector.21
(find 0 #*00101110 :test #'eq
(find 0 #*00101110 :test #'eql
:start 2)
0)
(deftest find-bit-vector.21a
(find 0 #*00111111 :test #'eq
(find 0 #*00111111 :test #'eql
:start 2)
nil)
(deftest find-bit-vector.21b
(find 1 #*00111111 :test #'eq
(find 1 #*00111111 :test #'eql
:start 2)
1)
(deftest find-bit-vector.22
(find 0 #*00101110 :test #'eq
(find 0 #*00101110 :test #'eql
:start 2 :end nil)
0)
(deftest find-bit-vector.22a
(find 0 #*001111111 :test #'eq
(find 0 #*001111111 :test #'eql
:start 2 :end nil)
nil)
(deftest find-bit-vector.22b
(find 1 #*001111111 :test #'eq
(find 1 #*001111111 :test #'eql
:start 2 :end nil)
1)
(deftest find-bit-vector.23
(find 0 #*00101110 :test-not #'eq
(find 0 #*00101110 :test-not #'eql
:start 0 :end 5)
1)
(deftest find-bit-vector.23a
(find 0 #*00000111 :test-not #'eq
(find 0 #*00000111 :test-not #'eql
:start 0 :end 5)
nil)
(deftest find-bit-vector.23b
(find 0 #*00001000 :test-not #'eq
(find 0 #*00001000 :test-not #'eql
:start 0 :end 5)
1)
(deftest find-bit-vector.24
(find 0 #*00101110 :test-not #'eq
(find 0 #*00101110 :test-not #'eql
:start 0 :end 5 :from-end t)
1)
(deftest find-bit-vector.24a
(find 0 #*0000001111 :test-not #'eq
(find 0 #*0000001111 :test-not #'eql
:start 0 :end 5 :from-end t)
nil)
(deftest find-bit-vector.24b
(find 0 #*0000100 :test-not #'eq
(find 0 #*0000100 :test-not #'eql
:start 0 :end 5 :from-end t)
1)
......@@ -679,34 +679,34 @@
#\4)
(deftest find-string.14
(find #\a "aabacedafa" :test (complement #'eq))
(find #\a "aabacedafa" :test (complement #'eql))
#\b)
(deftest find-string.15
(find #\a "aabacedafa" :test (complement #'eq)
(find #\a "aabacedafa" :test (complement #'eql)
:from-end t)
#\f)
(deftest find-string.16
(find #\a "aabacedafa" :test-not #'eq)
(find #\a "aabacedafa" :test-not #'eql)
#\b)
(deftest find-string.17
(find #\a "aabacedafa" :test-not 'eq
(find #\a "aabacedafa" :test-not 'eql
:from-end t)
#\f)
(deftest find-string.18
(find #\a "aabacedafa" :test-not 'eq)
(find #\a "aabacedafa" :test-not 'eql)
#\b)
(deftest find-string.19
(find #\a "aabacedafa" :test-not #'eq
(find #\a "aabacedafa" :test-not #'eql
:from-end t)
#\f)
(deftest find-string.20
(find #\a "aabacedafa" :test-not #'eq)
(find #\a "aabacedafa" :test-not #'eql)
#\b)
(deftest find-string.21
......
......@@ -54,11 +54,11 @@
2)
(deftest mismatch-list.13
(mismatch '(1 2 3 4) '(1 2 3 4) :test 'eq)
(mismatch '(1 2 3 4) '(1 2 3 4) :test 'eql)
nil)
(deftest mismatch-list.14
(mismatch '(1 2 3 4) '(5 6 7 8) :test-not 'eq)
(mismatch '(1 2 3 4) '(5 6 7 8) :test-not 'eql)
nil)
(deftest mismatch-list.15
......@@ -78,7 +78,7 @@
7)
(deftest mismatch-list.19
(mismatch '(1 1 1) '(2 2 2 2 2 1 2 2) :from-end t :test-not 'eq)
(mismatch '(1 1 1) '(2 2 2 2 2 1 2 2) :from-end t :test-not 'eql)
1)
(deftest mismatch-list.20
......@@ -144,11 +144,11 @@
2)
(deftest mismatch-vector.13
(mismatch #(1 2 3 4) #(1 2 3 4) :test 'eq)
(mismatch #(1 2 3 4) #(1 2 3 4) :test 'eql)
nil)
(deftest mismatch-vector.14
(mismatch #(1 2 3 4) #(5 6 7 8) :test-not 'eq)
(mismatch #(1 2 3 4) #(5 6 7 8) :test-not 'eql)
nil)
(deftest mismatch-vector.15
......@@ -168,7 +168,7 @@
7)
(deftest mismatch-vector.19
(mismatch #(1 1 1) #(2 2 2 2 2 1 2 2) :from-end t :test-not 'eq)
(mismatch #(1 1 1) #(2 2 2 2 2 1 2 2) :from-end t :test-not 'eql)
1)
(deftest mismatch-vector.20
......@@ -301,7 +301,7 @@
nil)
(deftest mismatch-bit-vector.11b
(mismatch #*0101 #*1010 :key #'evenp :test-not 'eq)
(mismatch #*0101 #*1010 :key #'evenp :test-not 'eql)
nil)
(deftest mismatch-bit-vector.11c
......@@ -325,11 +325,11 @@
2)
(deftest mismatch-bit-vector.13
(mismatch #*0001 #*0001 :test 'eq)
(mismatch #*0001 #*0001 :test 'eql)
nil)
(deftest mismatch-bit-vector.14
(mismatch '#*10001 #*01110 :test-not 'eq)
(mismatch '#*10001 #*01110 :test-not 'eql)
nil)
(deftest mismatch-bit-vector.15
......@@ -349,7 +349,7 @@
7)
(deftest mismatch-bit-vector.19
(mismatch #*000 #*11111011 :from-end t :test-not 'eq)
(mismatch #*000 #*11111011 :from-end t :test-not 'eql)
1)
(deftest mismatch-bit-vector.20
......@@ -497,7 +497,7 @@
nil)
(deftest mismatch-string.11b
(mismatch "0101" "1010" :key #'evendigitp :test-not 'eq)
(mismatch "0101" "1010" :key #'evendigitp :test-not 'eql)
nil)
(deftest mismatch-string.11c
......@@ -509,7 +509,7 @@
4)
(deftest mismatch-string.11e
(mismatch "0101" '(#\1 #\0 #\1 #\0) :key #'evendigitp :test-not 'eq)
(mismatch "0101" '(#\1 #\0 #\1 #\0) :key #'evendigitp :test-not 'eql)
nil)
(deftest mismatch-string.12
......@@ -525,11 +525,11 @@
2)
(deftest mismatch-string.13
(mismatch "0001" "0001" :test 'eq)
(mismatch "0001" "0001" :test 'eql)
nil)
(deftest mismatch-string.14
(mismatch "10001" "01110" :test-not 'eq)
(mismatch "10001" "01110" :test-not 'eql)
nil)
(deftest mismatch-string.15
......@@ -549,7 +549,7 @@
7)
(deftest mismatch-string.19
(mismatch "000" "11111011" :from-end t :test-not 'eq)
(mismatch "000" "11111011" :from-end t :test-not 'eql)
1)
(deftest mismatch-string.20
......
......@@ -741,14 +741,14 @@
(deftest nsubstitute-list.26
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig))
(result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eq))))
(result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eql))))
result)
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
(deftest nsubstitute-list.27
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig))
(result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eq)))
(result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eql)))
result)
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
......@@ -769,14 +769,14 @@
(deftest nsubstitute-vector.26
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig))
(result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eq))))
(result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eql))))
result)
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
(deftest nsubstitute-vector.27
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig))
(result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eq)))
(result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eql)))
result)
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
......@@ -797,14 +797,14 @@
(deftest nsubstitute-string.26
(let* ((orig "0102342015")
(x (copy-seq orig))
(result (nsubstitute #\a #\1 x :key #'nextdigit :test (complement #'eq))))
(result (nsubstitute #\a #\1 x :key #'nextdigit :test (complement #'eql))))
result)
"0a0aaaa0aa")
(deftest nsubstitute-string.27
(let* ((orig "0102342015")
(x (copy-seq orig))
(result (nsubstitute #\a #\1 x :key #'nextdigit :test-not #'eq)))
(result (nsubstitute #\a #\1 x :key #'nextdigit :test-not #'eql)))
result)
"0a0aaaa0aa")
......
......@@ -82,53 +82,53 @@
6)
(deftest position-list.14
(position 'a '(a a b a c e d a f a) :test (complement #'eq))
(position 'a '(a a b a c e d a f a) :test (complement #'eql))
2)
(deftest position-list.15
(position 'a '(a a b a c e d a f a) :test (complement #'eq)
(position 'a '(a a b a c e d a f a) :test (complement #'eql)
:from-end t)
8)
(deftest position-list.16
(position 'a '(a a b a c e d a f a) :test-not #'eq)
(position 'a '(a a b a c e d a f a) :test-not #'eql)
2)
(deftest position-list.17
(position 'a '(a a b a c e d a f a) :test-not 'eq
(position 'a '(a a b a c e d a f a) :test-not 'eql
:from-end t)
8)
(deftest position-list.18
(position 'a '(a a b a c e d a f a) :test-not 'eq)
(position 'a '(a a b a c e d a f a) :test-not 'eql)
2)
(deftest position-list.19
(position 'a '(a a b a c e d a f a) :test-not #'eq
(position 'a '(a a b a c e d a f a) :test-not #'eql
:from-end t)
8)
(deftest position-list.20
(position 'a '(a a b a c e d a f a) :test-not #'eq)
(position 'a '(a a b a c e d a f a) :test-not #'eql)
2)
(deftest position-list.21
(position 'a '(a a b a c e d a f a) :test #'eq
(position 'a '(a a b a c e d a f a) :test #'eql
:start 2)
3)
(deftest position-list.22
(position 'a '(a a b a c e d a f a) :test #'eq
(position 'a '(a a b a c e d a f a) :test #'eql
:start 2 :end nil)
3)
(deftest position-list.23
(position 'a '(a a b a c e d a f a) :test-not #'eq
(position 'a '(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5)
2)
(deftest position-list.24
(position 'a '(a a b a c e d a f a) :test-not #'eq
(position 'a '(a a b a c e d a f a) :test-not #'eql
:start 0 :end 5 :from-end t)
4)
......@@ -229,53 +229,53 @@
6)
(deftest position-vector.14
(position 'a #(a a b a c e d a f a) :test (complement #'eq))
(position 'a #(a a b a c e d a f a) :test (complement #'eql))
2)
(deftest position-vector.15
(position 'a #(a a b a c e d a f a) :test (complement #'eq)
(position 'a #(a a b a c e d a f a) :test (complement #'eql)
:from-end t)
8)
(deftest position-vector.16
(position 'a #(a a b a c e d a f a) :test-not #'eq)
(position 'a #(a a b a c e d a f a) :test-not #'eql)
2)
(deftest position-vector.17