Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -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)
(deftest find-string.21 (deftest find-string.21
......
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
2) 2)
(deftest mismatch-list.13 (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) nil)
(deftest mismatch-list.14 (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) nil)
(deftest mismatch-list.15 (deftest mismatch-list.15
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
7) 7)
(deftest mismatch-list.19 (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) 1)
(deftest mismatch-list.20 (deftest mismatch-list.20
...@@ -144,11 +144,11 @@ ...@@ -144,11 +144,11 @@
2) 2)
(deftest mismatch-vector.13 (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) nil)
(deftest mismatch-vector.14 (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) nil)
(deftest mismatch-vector.15 (deftest mismatch-vector.15
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
7) 7)
(deftest mismatch-vector.19 (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) 1)
(deftest mismatch-vector.20 (deftest mismatch-vector.20
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
nil) nil)
(deftest mismatch-bit-vector.11b (deftest mismatch-bit-vector.11b
(mismatch #*0101 #*1010 :key #'evenp :test-not 'eq) (mismatch #*0101 #*1010 :key #'evenp :test-not 'eql)
nil) nil)
(deftest mismatch-bit-vector.11c (deftest mismatch-bit-vector.11c
...@@ -325,11 +325,11 @@ ...@@ -325,11 +325,11 @@
2) 2)
(deftest mismatch-bit-vector.13 (deftest mismatch-bit-vector.13
(mismatch #*0001 #*0001 :test 'eq) (mismatch #*0001 #*0001 :test 'eql)
nil) nil)
(deftest mismatch-bit-vector.14 (deftest mismatch-bit-vector.14
(mismatch '#*10001 #*01110 :test-not 'eq) (mismatch '#*10001 #*01110 :test-not 'eql)
nil) nil)
(deftest mismatch-bit-vector.15 (deftest mismatch-bit-vector.15
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
7) 7)
(deftest mismatch-bit-vector.19 (deftest mismatch-bit-vector.19
(mismatch #*000 #*11111011 :from-end t :test-not 'eq) (mismatch #*000 #*11111011 :from-end t :test-not 'eql)
1) 1)
(deftest mismatch-bit-vector.20 (deftest mismatch-bit-vector.20
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
nil) nil)
(deftest mismatch-string.11b (deftest mismatch-string.11b
(mismatch "0101" "1010" :key #'evendigitp :test-not 'eq) (mismatch "0101" "1010" :key #'evendigitp :test-not 'eql)
nil) nil)
(deftest mismatch-string.11c (deftest mismatch-string.11c
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
4) 4)
(deftest mismatch-string.11e (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) nil)
(deftest mismatch-string.12 (deftest mismatch-string.12
...@@ -525,11 +525,11 @@ ...@@ -525,11 +525,11 @@
2) 2)
(deftest mismatch-string.13 (deftest mismatch-string.13
(mismatch "0001" "0001" :test 'eq) (mismatch "0001" "0001" :test 'eql)
nil) nil)
(deftest mismatch-string.14 (deftest mismatch-string.14
(mismatch "10001" "01110" :test-not 'eq) (mismatch "10001" "01110" :test-not 'eql)
nil) nil)
(deftest mismatch-string.15 (deftest mismatch-string.15
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
7) 7)
(deftest mismatch-string.19 (deftest mismatch-string.19
(mismatch "000" "11111011" :from-end t :test-not 'eq) (mismatch "000" "11111011" :from-end t :test-not 'eql)
1) 1)
(deftest mismatch-string.20 (deftest mismatch-string.20
......
...@@ -741,14 +741,14 @@ ...@@ -741,14 +741,14 @@
(deftest nsubstitute-list.26 (deftest nsubstitute-list.26
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (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) result)
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
(deftest nsubstitute-list.27 (deftest nsubstitute-list.27
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (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) result)
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -769,14 +769,14 @@ ...@@ -769,14 +769,14 @@
(deftest nsubstitute-vector.26 (deftest nsubstitute-vector.26
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (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) result)
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
(deftest nsubstitute-vector.27 (deftest nsubstitute-vector.27
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (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) result)
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -797,14 +797,14 @@ ...@@ -797,14 +797,14 @@
(deftest nsubstitute-string.26 (deftest nsubstitute-string.26
(let* ((orig "0102342015") (let* ((orig "0102342015")
(x (copy-seq orig)) (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) result)
"0a0aaaa0aa") "0a0aaaa0aa")
(deftest nsubstitute-string.27 (deftest nsubstitute-string.27
(let* ((orig "0102342015") (let* ((orig "0102342015")
(x (copy-seq orig)) (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) result)
"0a0aaaa0aa") "0a0aaaa0aa")
......
...@@ -82,53 +82,53 @@ ...@@ -82,53 +82,53 @@
6) 6)
(deftest position-list.14 (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) 2)
(deftest position-list.15 (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) :from-end t)
8) 8)
(deftest position-list.16 (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) 2)
(deftest position-list.17 (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) :from-end t)
8) 8)
(deftest position-list.18 (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) 2)
(deftest position-list.19 (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) :from-end t)
8) 8)
(deftest position-list.20 (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) 2)
(deftest position-list.21 (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) :start 2)
3) 3)
(deftest position-list.22 (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) :start 2 :end nil)
3) 3)
(deftest position-list.23 (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) :start 0 :end 5)
2) 2)
(deftest position-list.24 (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) :start 0 :end 5 :from-end t)
4) 4)
...@@ -229,53 +229,53 @@ ...@@ -229,53 +229,53 @@
6) 6)
(deftest position-vector.14 (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) 2)
(deftest position-vector.15 (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) :from-end t)
8) 8)
(deftest position-vector.16 (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) 2)
(deftest position-vector.17 (deftest position-vector.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) :from-end t)
8) 8)
(deftest position-vector.18 (deftest position-vector.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) 2)
(deftest position-vector.19 (deftest position-vector.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) :from-end t)
8) 8)
(deftest position-vector.20 (deftest position-vector.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) 2)
(deftest position-vector.21 (deftest position-vector.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) :start 2)
3) 3)
(deftest position-vector.22 (deftest position-vector.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) :start 2 :end nil)
3) 3)
(deftest position-vector.23 (deftest position-vector.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) :start 0 :end 5)
2) 2)
(deftest position-vector.24 (deftest position-vector.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) :start 0 :end 5 :from-end t)
4) 4)
...@@ -392,53 +392,53 @@ ...@@ -392,53 +392,53 @@
6) 6)
(deftest position-bit-vector.14 (deftest position-bit-vector.14
(position 0 #*0010111010 :test (complement #'eq)) (position 0 #*0010111010 :test (complement #'eql))
2) 2)
(deftest position-bit-vector.15 (deftest position-bit-vector.15
(position 0 #*0010111010 :test (complement #'eq) (position 0 #*0010111010 :test (complement #'eql)
:from-end t) :from-end t)
8) 8)
(deftest position-bit-vector.16 (deftest position-bit-vector.16
(position 0 #*0010111010 :test-not #'eq) (position 0 #*0010111010 :test-not #'eql)
2) 2)
(deftest position-bit-vector.17 (deftest position-bit-vector.17
(position 0 #*001011101 :test-not 'eq (position 0 #*001011101 :test-not 'eql
:from-end t) :from-end t)
8) 8)
(deftest position-bit-vector.18 (deftest position-bit-vector.18
(position 0 #*00101110 :test-not 'eq) (position 0 #*00101110 :test-not 'eql)
2) 2)
(deftest position-bit-vector.19 (deftest position-bit-vector.19
(position 0 #*00101110 :test-not #'eq (position 0 #*00101110 :test-not #'eql
:from-end t) :from-end t)
6) 6)
(deftest position-bit-vector.20 (deftest position-bit-vector.20
(position 0 #*00101110 :test-not #'eq) (position 0 #*00101110 :test-not #'eql)
2) 2)
(deftest position-bit-vector.21 (deftest position-bit-vector.21
(position 0 #*00101110 :test #'eq (position 0 #*00101110 :test #'eql
:start 2) :start 2)
3) 3)
(deftest position-bit-vector.22 (deftest position-bit-vector.22
(position 0 #*00101110 :test #'eq (position 0 #*00101110 :test #'eql
:start 2 :end nil) :start 2 :end nil)
3) 3)
(deftest position-bit-vector.23 (deftest position-bit-vector.23
(position 0 #*00101110 :test-not #'eq (position 0 #*00101110 :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
2) 2)
(deftest position-bit-vector.24 (deftest position-bit-vector.24
(position 0 #*00101110 :test-not #'eq (position 0 #*00101110 :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
4) 4)
...@@ -562,53 +562,53 @@ ...@@ -562,53 +562,53 @@
6) 6)
(deftest position-string.14 (deftest position-string.14
(position #\a "aabacedafa" :test (complement #'eq)) (position #\a "aabacedafa" :test (complement #'eql))
2) 2)
(deftest position-string.15 (deftest position-string.15
(position #\a "aabacedafa" :test (complement #'eq) (position #\a "aabacedafa" :test (complement #'eql)
:from-end t) :from-end t)
8) 8)
(deftest position-string.16 (deftest position-string.16
(position #\a "aabacedafa" :test-not #'eq) (position #\a "aabacedafa" :test-not #'eql)
2) 2)
(deftest position-string.17 (deftest position-string.17
(position #\a "aabacedafa" :test-not 'eq (position #\a "aabacedafa" :test-not 'eql
:from-end t) :from-end t)
8) 8)
(deftest position-string.18 (deftest position-string.18
(position #\a "aabacedafa" :test-not 'eq) (position #\a "aabacedafa" :test-not 'eql)
2) 2)
(deftest position-string.19 (deftest position-string.19
(position #\a "aabacedafa" :test-not #'eq (position #\a "aabacedafa" :test-not #'eql
:from-end t) :from-end t)
8) 8)
(deftest position-string.20 (deftest position-string.20
(position #\a "aabacedafa" :test-not #'eq) (position #\a "aabacedafa" :test-not #'eql)
2) 2)
(deftest position-string.21 (deftest position-string.21
(position #\a "aabacedafa" :test #'eq (position #\a "aabacedafa" :test #'eql
:start 2) :start 2)
3) 3)
(deftest position-string.22 (deftest position-string.22
(position #\a "aabacedafa" :test #'eq (position #\a "aabacedafa" :test #'eql
:start 2 :end nil) :start 2 :end nil)
3) 3)
(deftest position-string.23 (deftest position-string.23
(position #\a "aabacedafa" :test-not #'eq (position #\a "aabacedafa" :test-not #'eql
:start 0 :end 5) :start 0 :end 5)
2) 2)
(deftest position-string.24 (deftest position-string.24
(position #\a "aabacedafa" :test-not #'eq (position #\a "aabacedafa" :test-not #'eql
:start 0 :end 5 :from-end t) :start 0 :end 5 :from-end t)
4) 4)
......
...@@ -104,18 +104,18 @@ ...@@ -104,18 +104,18 @@
(deftest search-bitvector.11 (deftest search-bitvector.11
(let ((target *searched-bitvector*)) (let ((target *searched-bitvector*))
(loop for pat in *pattern-subbitvectors* (loop for pat in *pattern-subbitvectors*
for pos = (search pat target :start2 20 :test (complement #'eq)) for pos = (search pat target :start2 20 :test (complement #'eql))
unless (search-check pat target pos :start2 20 unless (search-check pat target pos :start2 20
:test (complement #'eq)) :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
(deftest search-bitvector.12 (deftest search-bitvector.12
(let ((target *searched-bitvector*)) (let ((target *searched-bitvector*))
(loop for pat in *pattern-subbitvectors* (loop for pat in *pattern-subbitvectors*
for pos = (search pat target :from-end t :start2 20 :test-not #'eq) for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
unless (search-check pat target pos :from-end t unless (search-check pat target pos :from-end t
:start2 20 :test (complement #'eq)) :start2 20 :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
...@@ -124,10 +124,10 @@ ...@@ -124,10 +124,10 @@
(loop for pat in *pattern-subbitvectors* (loop for pat in *pattern-subbitvectors*
when (and (> (length pat) 0) when (and (> (length pat) 0)
(let ((pos (search pat target :start1 1 (let ((pos (search pat target :start1 1
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:start1 1 :start1 1
:test (complement #'eq))))) :test (complement #'eql)))))
collect pat)) collect pat))
nil) nil)
...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
when (let ((len (length pat))) when (let ((len (length pat)))
(and (> len 0) (and (> len 0)
(let ((pos (search pat target :end1 (1- len) (let ((pos (search pat target :end1 (1- len)
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:end1 (1- len) :end1 (1- len)
:test (complement #'eq)))))) :test (complement #'eql))))))
collect pat)) collect pat))
nil) nil)
......
...@@ -94,18 +94,18 @@ ...@@ -94,18 +94,18 @@
(deftest search-list.11 (deftest search-list.11
(let ((target *searched-list*)) (let ((target *searched-list*))
(loop for pat in *pattern-sublists* (loop for pat in *pattern-sublists*
for pos = (search pat target :start2 20 :test (complement #'eq)) for pos = (search pat target :start2 20 :test (complement #'eql))
unless (search-check pat target pos :start2 20 unless (search-check pat target pos :start2 20
:test (complement #'eq)) :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
(deftest search-list.12 (deftest search-list.12
(let ((target *searched-list*)) (let ((target *searched-list*))
(loop for pat in *pattern-sublists* (loop for pat in *pattern-sublists*
for pos = (search pat target :from-end t :start2 20 :test-not #'eq) for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
unless (search-check pat target pos :from-end t unless (search-check pat target pos :from-end t
:start2 20 :test (complement #'eq)) :start2 20 :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
...@@ -114,10 +114,10 @@ ...@@ -114,10 +114,10 @@
(loop for pat in *pattern-sublists* (loop for pat in *pattern-sublists*
when (and (> (length pat) 0) when (and (> (length pat) 0)
(let ((pos (search pat target :start1 1 (let ((pos (search pat target :start1 1
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:start1 1 :start1 1
:test (complement #'eq))))) :test (complement #'eql)))))
collect pat)) collect pat))
nil) nil)
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
when (let ((len (length pat))) when (let ((len (length pat)))
(and (> len 0) (and (> len 0)
(let ((pos (search pat target :end1 (1- len) (let ((pos (search pat target :end1 (1- len)
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:end1 (1- len) :end1 (1- len)
:test (complement #'eq)))))) :test (complement #'eql))))))
collect pat)) collect pat))
nil) nil)
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
:start2 (progn (setf f (incf i)) 1) :start2 (progn (setf f (incf i)) 1)
:end2 (progn (setf g (incf i)) 8) :end2 (progn (setf g (incf i)) 8)
:key (progn (setf h (incf i)) #'identity) :key (progn (setf h (incf i)) #'identity)
:test (progn (setf j (incf i)) #'eq) :test (progn (setf j (incf i)) #'eql)
) )
i a b c d e f g h j)) i a b c d e f g h j))
4 9 1 2 3 4 5 6 7 8 9) 4 9 1 2 3 4 5 6 7 8 9)
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
(search (search
(progn (setf a (incf i)) '(nil a b nil)) (progn (setf a (incf i)) '(nil a b nil))
(progn (setf b (incf i)) '(z z z a a b b z z z)) (progn (setf b (incf i)) '(z z z a a b b z z z))
:test-not (progn (setf c (incf i)) (complement #'eq)) :test-not (progn (setf c (incf i)) (complement #'eql))
:key (progn (setf d (incf i)) #'identity) :key (progn (setf d (incf i)) #'identity)
:end2 (progn (setf e (incf i)) 8) :end2 (progn (setf e (incf i)) 8)
:start2 (progn (setf f (incf i)) 1) :start2 (progn (setf f (incf i)) 1)
......
...@@ -91,18 +91,18 @@ ...@@ -91,18 +91,18 @@
(deftest search-string.10 (deftest search-string.10
(let ((target *searched-string*)) (let ((target *searched-string*))
(loop for pat in *pattern-substrings* (loop for pat in *pattern-substrings*
for pos = (search pat target :start2 20 :test (complement #'eq)) for pos = (search pat target :start2 20 :test (complement #'eql))
unless (search-check pat target pos :start2 20 unless (search-check pat target pos :start2 20
:test (complement #'eq)) :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
(deftest search-string.11 (deftest search-string.11
(let ((target *searched-string*)) (let ((target *searched-string*))
(loop for pat in *pattern-substrings* (loop for pat in *pattern-substrings*
for pos = (search pat target :from-end t :start2 20 :test-not #'eq) for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
unless (search-check pat target pos :from-end t unless (search-check pat target pos :from-end t
:start2 20 :test (complement #'eq)) :start2 20 :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
...@@ -111,10 +111,10 @@ ...@@ -111,10 +111,10 @@
(loop for pat in *pattern-substrings* (loop for pat in *pattern-substrings*
when (and (> (length pat) 0) when (and (> (length pat) 0)
(let ((pos (search pat target :start1 1 (let ((pos (search pat target :start1 1
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:start1 1 :start1 1
:test (complement #'eq))))) :test (complement #'eql)))))
collect pat)) collect pat))
nil) nil)
...@@ -124,10 +124,10 @@ ...@@ -124,10 +124,10 @@
when (let ((len (length pat))) when (let ((len (length pat)))
(and (> len 0) (and (> len 0)
(let ((pos (search pat target :end1 (1- len) (let ((pos (search pat target :end1 (1- len)
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:end1 (1- len) :end1 (1- len)
:test (complement #'eq)))))) :test (complement #'eql))))))
collect pat)) collect pat))
nil) nil)
......
...@@ -106,18 +106,18 @@ ...@@ -106,18 +106,18 @@
(deftest search-vector.11 (deftest search-vector.11
(let ((target *searched-vector*)) (let ((target *searched-vector*))
(loop for pat in *pattern-subvectors* (loop for pat in *pattern-subvectors*
for pos = (search pat target :start2 20 :test (complement #'eq)) for pos = (search pat target :start2 20 :test (complement #'eql))
unless (search-check pat target pos :start2 20 unless (search-check pat target pos :start2 20
:test (complement #'eq)) :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
(deftest search-vector.12 (deftest search-vector.12
(let ((target *searched-vector*)) (let ((target *searched-vector*))
(loop for pat in *pattern-subvectors* (loop for pat in *pattern-subvectors*
for pos = (search pat target :from-end t :start2 20 :test-not #'eq) for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
unless (search-check pat target pos :from-end t unless (search-check pat target pos :from-end t
:start2 20 :test (complement #'eq)) :start2 20 :test (complement #'eql))
collect pat)) collect pat))
nil) nil)
...@@ -126,10 +126,10 @@ ...@@ -126,10 +126,10 @@
(loop for pat in *pattern-subvectors* (loop for pat in *pattern-subvectors*
when (and (> (length pat) 0) when (and (> (length pat) 0)
(let ((pos (search pat target :start1 1 (let ((pos (search pat target :start1 1
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:start1 1 :start1 1
:test (complement #'eq))))) :test (complement #'eql)))))
collect pat)) collect pat))
nil) nil)
...@@ -139,10 +139,10 @@ ...@@ -139,10 +139,10 @@
when (let ((len (length pat))) when (let ((len (length pat)))
(and (> len 0) (and (> len 0)
(let ((pos (search pat target :end1 (1- len) (let ((pos (search pat target :end1 (1- len)
:test (complement #'eq)))) :test (complement #'eql))))
(not (search-check pat target pos (not (search-check pat target pos
:end1 (1- len) :end1 (1- len)
:test (complement #'eq)))))) :test (complement #'eql))))))
collect pat)) collect pat))
nil) nil)
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
(deftest substitute-list.26 (deftest substitute-list.26
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute '(a 10) 'a x :key #'car :test (complement #'eq)))) (result (substitute '(a 10) 'a x :key #'car :test (complement #'eql))))
(and (equal orig x) (and (equal orig x)
result)) result))
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
(deftest substitute-list.27 (deftest substitute-list.27
(let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute '(a 10) 'a x :key #'car :test-not #'eq))) (result (substitute '(a 10) 'a x :key #'car :test-not #'eql)))
(and (equal orig x) (and (equal orig x)
result)) result))
((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
(deftest substitute-vector.26 (deftest substitute-vector.26
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute '(a 10) 'a x :key #'car :test (complement #'eq)))) (result (substitute '(a 10) 'a x :key #'car :test (complement #'eql))))
(and (equalp orig x) (and (equalp orig x)
result)) result))
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
(deftest substitute-vector.27 (deftest substitute-vector.27
(let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7))) (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute '(a 10) 'a x :key #'car :test-not #'eq))) (result (substitute '(a 10) 'a x :key #'car :test-not #'eql)))
(and (equalp orig x) (and (equalp orig x)
result)) result))
#((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10))) #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
...@@ -641,7 +641,7 @@ ...@@ -641,7 +641,7 @@
(deftest substitute-string.26 (deftest substitute-string.26
(let* ((orig "0102342015") (let* ((orig "0102342015")
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute #\a #\1 x :key #'nextdigit :test (complement #'eq)))) (result (substitute #\a #\1 x :key #'nextdigit :test (complement #'eql))))
(and (equalp orig x) (and (equalp orig x)
result)) result))
"0a0aaaa0aa") "0a0aaaa0aa")
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
(deftest substitute-string.27 (deftest substitute-string.27
(let* ((orig "0102342015") (let* ((orig "0102342015")
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute #\a #\1 x :key #'nextdigit :test-not #'eq))) (result (substitute #\a #\1 x :key #'nextdigit :test-not #'eql)))
(and (equalp orig x) (and (equalp orig x)
result)) result))
"0a0aaaa0aa") "0a0aaaa0aa")
...@@ -925,7 +925,7 @@ ...@@ -925,7 +925,7 @@
(deftest substitute-bit-vector.28 (deftest substitute-bit-vector.28
(let* ((orig #*00111001011010110) (let* ((orig #*00111001011010110)
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute 0 1 x :key #'1+ :test (complement #'eq)))) (result (substitute 0 1 x :key #'1+ :test (complement #'eql))))
(and (equalp orig x) (and (equalp orig x)
result)) result))
#*00000000000000000) #*00000000000000000)
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
(deftest substitute-bit-vector.29 (deftest substitute-bit-vector.29
(let* ((orig #*00111001011010110) (let* ((orig #*00111001011010110)
(x (copy-seq orig)) (x (copy-seq orig))
(result (substitute 0 1 x :key #'1+ :test-not #'eq))) (result (substitute 0 1 x :key #'1+ :test-not #'eql)))
(and (equalp orig x) (and (equalp orig x)
result)) result))
#*00000000000000000) #*00000000000000000)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment