diff --git a/ansi-tests/concatenate.lsp b/ansi-tests/concatenate.lsp index 5ae5436b0514bfa578479fd6ac660a9809302159..6f61ee46e73c034f2a1a15f137902d023d6d4e44 100644 --- a/ansi-tests/concatenate.lsp +++ b/ansi-tests/concatenate.lsp @@ -137,7 +137,7 @@ #(a b c d e)) (deftest concatenate.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array '(10) :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'character))) (values (concatenate 'string x '(#\z)) @@ -153,7 +153,7 @@ nil) (deftest concatenate.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array '(10) :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'base-char))) (values (concatenate 'string x '(#\z)) @@ -169,7 +169,7 @@ nil) (deftest concatenate.30 - (let* ((x (make-array '(10) :initial-contents (coerce #*0110010111 'list) + (let* ((x (make-array '(10) :initial-contents #*0110010111 :fill-pointer 5 :element-type 'bit))) (values (concatenate 'bit-vector x '(0)) diff --git a/ansi-tests/count-if-not.lsp b/ansi-tests/count-if-not.lsp index a38b4031722e66b31e85981d6e334cceacd9cc5d..22a36b1454138eeb1d5f7622a8e7693915f23639 100644 --- a/ansi-tests/count-if-not.lsp +++ b/ansi-tests/count-if-not.lsp @@ -408,7 +408,7 @@ (deftest count-if-not-string.17 (flet ((%zerop (c) (eql c #\0)) (%onep (c) (eql c #\1))) - (let ((a (make-array '(10) :initial-contents (coerce "0001110100" 'list) + (let ((a (make-array '(10) :initial-contents "0001110100" :fill-pointer 5 :element-type 'character))) (and (stringp a) diff --git a/ansi-tests/count-if.lsp b/ansi-tests/count-if.lsp index 07b70b5e7d080e796c12c1d52fed1be6032b63ef..a2e48b8863be796c568a038180d1feb96f0b9018 100644 --- a/ansi-tests/count-if.lsp +++ b/ansi-tests/count-if.lsp @@ -407,7 +407,7 @@ (deftest count-if-string.17 (let ((s (make-array '(10) - :initial-contents (coerce "00a0aa0a0a" 'list) + :initial-contents "00a0aa0a0a" :element-type 'character :fill-pointer 6))) (values (count-if #'digit-char-p s) diff --git a/ansi-tests/count.lsp b/ansi-tests/count.lsp index c7250b14185a19db24d694a511619daee0cdb613..5836ecadb2126eeec85133b4164a3b64a269429b 100644 --- a/ansi-tests/count.lsp +++ b/ansi-tests/count.lsp @@ -460,27 +460,27 @@ 5) (deftest count-string.17 - (count #\a (make-array 10 :initial-contents (coerce "abaaacaaaa" 'list) + (count #\a (make-array 10 :initial-contents "abaaacaaaa" :fill-pointer 7 :element-type 'character)) 5) (deftest count-string.18 - (count #\a (make-array 10 :initial-contents (coerce "abaaacaaaa" 'list) + (count #\a (make-array 10 :initial-contents "abaaacaaaa" :fill-pointer 7 :element-type 'character) :start 1) 4) (deftest count-string.19 - (count #\a (make-array 10 :initial-contents (coerce "abaaacaaaa" 'list) + (count #\a (make-array 10 :initial-contents "abaaacaaaa" :fill-pointer 7 :element-type 'character) :end nil) 5) (deftest count-string.20 - (count #\a (make-array 10 :initial-contents (coerce "abaaacaaaa" 'list) + (count #\a (make-array 10 :initial-contents "abaaacaaaa" :fill-pointer 7 :element-type 'character) :start 2 :end 5) diff --git a/ansi-tests/find-if.lsp b/ansi-tests/find-if.lsp index 31dee999a8328389fae8228ebe1fcd40867bd6b9..242111db2742d85e53fae3d53cfc386ea397a197 100644 --- a/ansi-tests/find-if.lsp +++ b/ansi-tests/find-if.lsp @@ -496,7 +496,7 @@ (#\6))) (deftest find-if-string.19 - (let ((a (make-array '(10) :initial-contents (coerce "123456789a" 'list) + (let ((a (make-array '(10) :initial-contents "123456789a" :fill-pointer 5 :element-type 'character))) (values diff --git a/ansi-tests/find.lsp b/ansi-tests/find.lsp index 03a919556ffa995e000fe6f8aa03b7076225d503..a21f4056c83dcb5af08aaa2caddce22320c7be63 100644 --- a/ansi-tests/find.lsp +++ b/ansi-tests/find.lsp @@ -730,7 +730,7 @@ #\c) (deftest find-string.25 - (let ((s (make-array '(10) :initial-contents (coerce "abcdefghij" 'list) + (let ((s (make-array '(10) :initial-contents "abcdefghij" :element-type 'character :fill-pointer 5))) (values diff --git a/ansi-tests/merge.lsp b/ansi-tests/merge.lsp index c285e07ccf65f36450e474be0c0940a86b42d126..4bc33d2aa0468cbe038751308024d39142aad562 100644 --- a/ansi-tests/merge.lsp +++ b/ansi-tests/merge.lsp @@ -294,27 +294,27 @@ "123") (deftest merge-string.15 - (let* ((x (make-array '(10) :initial-contents (coerce "adgkmpruwv" 'list) + (let* ((x (make-array '(10) :initial-contents "adgkmpruwv" :fill-pointer 5 :element-type 'character)) (y (copy-seq "bci"))) (merge 'string x y #'char<)) "abcdgikm") (deftest merge-string.16 - (let* ((x (make-array '(10) :initial-contents (coerce "adgkmpruwv" 'list) + (let* ((x (make-array '(10) :initial-contents "adgkmpruwv" :fill-pointer 5 :element-type 'character)) (y (copy-seq "bci"))) (merge 'string y x #'char<)) "abcdgikm") (deftest merge-string.17 - (let* ((x (make-array '(10) :initial-contents (coerce "adgkmpruwv" 'list) + (let* ((x (make-array '(10) :initial-contents "adgkmpruwv" :fill-pointer 5 :element-type 'character))) (merge 'string nil x #'char<)) "adgkm") (deftest merge-string.18 - (let* ((x (make-array '(10) :initial-contents (coerce "adgkmpruwv" 'list) + (let* ((x (make-array '(10) :initial-contents "adgkmpruwv" :fill-pointer 5 :element-type 'character))) (merge 'string x nil #'char<)) "adgkm") @@ -435,27 +435,27 @@ #*011) (deftest merge-bit-vector.16 - (let* ((x (make-array '(10) :initial-contents (coerce #*0001101010 'list) + (let* ((x (make-array '(10) :initial-contents #*0001101010 :fill-pointer 5 :element-type 'bit)) (y (copy-seq #*001))) (merge 'bit-vector x y #'<)) #*00000111) (deftest merge-bit-vector.17 - (let* ((x (make-array '(10) :initial-contents (coerce #*0001101010 'list) + (let* ((x (make-array '(10) :initial-contents #*0001101010 :fill-pointer 5 :element-type 'bit)) (y (copy-seq #*001))) (merge 'bit-vector y x #'<)) #*00000111) (deftest merge-bit-vector.18 - (let* ((x (make-array '(10) :initial-contents (coerce #*0001101010 'list) + (let* ((x (make-array '(10) :initial-contents #*0001101010 :fill-pointer 5 :element-type 'bit))) (merge 'bit-vector nil x #'<)) #*00011) (deftest merge-bit-vector.19 - (let* ((x (make-array '(10) :initial-contents (coerce #*0001101010 'list) + (let* ((x (make-array '(10) :initial-contents #*0001101010 :fill-pointer 5 :element-type 'bit))) (merge 'bit-vector x nil #'<)) #*00011) diff --git a/ansi-tests/mismatch.lsp b/ansi-tests/mismatch.lsp index 4d61cabd91f1ec18e39ef0c158100cd972c881b0..06b70d1534f0e8cf9160da3cfa365e1eaa7add69 100644 --- a/ansi-tests/mismatch.lsp +++ b/ansi-tests/mismatch.lsp @@ -365,7 +365,7 @@ 5) (deftest mismatch-bit-vector.23 - (let ((a (make-array '(9) :initial-contents (coerce #*001011000 'list) + (let ((a (make-array '(9) :initial-contents #*001011000 :fill-pointer 5 :element-type 'bit))) (values @@ -378,7 +378,7 @@ nil nil 4 5 4 4) (deftest mismatch-bit-vector.24 - (let ((m (make-array '(6) :initial-contents (coerce #*001011 'list) + (let ((m (make-array '(6) :initial-contents #*001011 :fill-pointer 4 :element-type 'bit)) (a #*00101)) @@ -569,7 +569,7 @@ 5) (deftest mismatch-string.23 - (let ((a (make-array '(9) :initial-contents (coerce "123456789" 'list) + (let ((a (make-array '(9) :initial-contents "123456789" :fill-pointer 5 :element-type 'character))) (values @@ -582,7 +582,7 @@ nil nil 4 5 4 0) (deftest mismatch-string.24 - (let ((m (make-array '(6) :initial-contents (coerce "123456" 'list) + (let ((m (make-array '(6) :initial-contents "123456" :fill-pointer 4 :element-type 'character)) (a "12345")) diff --git a/ansi-tests/nreverse.lsp b/ansi-tests/nreverse.lsp index 4251a49c11b0c507c797ae870b75054248b3b140..b33475f5a46fa083b5f66fc2b132cad5f03f3047 100644 --- a/ansi-tests/nreverse.lsp +++ b/ansi-tests/nreverse.lsp @@ -71,7 +71,7 @@ "011011011000") (deftest nreverse-string.3 - (let* ((x (make-array 10 :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array 10 :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'character)) (y (nreverse x))) @@ -79,7 +79,7 @@ "edcba") (deftest nreverse-string.4 - (let* ((x (make-array 10 :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array 10 :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'base-char)) (y (nreverse x))) diff --git a/ansi-tests/nsubstitute-if-not.lsp b/ansi-tests/nsubstitute-if-not.lsp index 2cd632f8a09ac13140a2293a3bc9ec391adafa33..157a1e863837c9de6511fc7fda30be991e6e504f 100644 --- a/ansi-tests/nsubstitute-if-not.lsp +++ b/ansi-tests/nsubstitute-if-not.lsp @@ -353,28 +353,28 @@ t) (deftest nsubstitute-if-not-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if-not #\z (is-not-eql-p #\a) x))) result) "zbzcb") (deftest nsubstitute-if-not-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if-not #\z (is-not-eql-p #\a) x :from-end t))) result) "zbzcb") (deftest nsubstitute-if-not-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if-not #\z (is-not-eql-p #\a) x :count 1))) result) "zbacb") (deftest nsubstitute-if-not-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if-not #\z (is-not-eql-p #\a) x :from-end t :count 1))) diff --git a/ansi-tests/nsubstitute-if.lsp b/ansi-tests/nsubstitute-if.lsp index d77798fe72b23ab88c3387dd1b4080098d900259..c56743da4d5ec6d71d1eb3b3f0822ddfd61e18ad 100644 --- a/ansi-tests/nsubstitute-if.lsp +++ b/ansi-tests/nsubstitute-if.lsp @@ -352,28 +352,28 @@ t) (deftest nsubstitute-if-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if #\z (is-eql-p #\a) x))) result) "zbzcb") (deftest nsubstitute-if-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if #\z (is-eql-p #\a) x :from-end t))) result) "zbzcb") (deftest nsubstitute-if-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if #\z (is-eql-p #\a) x :count 1))) result) "zbacb") (deftest nsubstitute-if-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute-if #\z (is-eql-p #\a) x :from-end t :count 1))) result) diff --git a/ansi-tests/nsubstitute.lsp b/ansi-tests/nsubstitute.lsp index 86bb0a716b9710a3250e6a346f0b6f121878c485..8b9e1ec7a3150982336801cdb6f9a3d80ebdb911 100644 --- a/ansi-tests/nsubstitute.lsp +++ b/ansi-tests/nsubstitute.lsp @@ -495,28 +495,28 @@ "1234567x9") (deftest nsubstitute-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute #\z #\a x))) result) "zbzcb") (deftest nsubstitute-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute #\z #\a x :from-end t))) result) "zbzcb") (deftest nsubstitute-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute #\z #\a x :count 1))) result) "zbacb") (deftest nsubstitute-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (nsubstitute #\z #\a x :from-end t :count 1))) result) diff --git a/ansi-tests/position-if-not.lsp b/ansi-tests/position-if-not.lsp index 3b202216353fc32f83bd843a0d8d8afc485ea951..9fd7e87994131a4334180285aca4f3ee2c6b61e0 100644 --- a/ansi-tests/position-if-not.lsp +++ b/ansi-tests/position-if-not.lsp @@ -433,7 +433,7 @@ (nil))) (deftest position-if-not-string.13 - (let ((a (make-array '(10) :initial-contents (coerce "55555aaaaa" 'list) + (let ((a (make-array '(10) :initial-contents "55555aaaaa" :fill-pointer 5 :element-type 'character))) (and (stringp a) diff --git a/ansi-tests/position-if.lsp b/ansi-tests/position-if.lsp index ad31a94b6f60fa67960f14b4a2b0a92f11020edb..302980ee8802c335844a8f37f6a8fd130e87e158 100644 --- a/ansi-tests/position-if.lsp +++ b/ansi-tests/position-if.lsp @@ -432,8 +432,7 @@ (deftest position-if-string.13 (flet ((%f (c) (eql c #\0)) (%g (c) (eql c #\1))) - (let ((a (make-array '(10) :initial-contents - (coerce "1111100000" 'list) + (let ((a (make-array '(10) :initial-contents "1111100000" :fill-pointer 5 :element-type 'character))) (values (position-if #'%f a) diff --git a/ansi-tests/position.lsp b/ansi-tests/position.lsp index a3bbabd20f8ff0540dbe4a33bd4d5de1b8dfd2cb..ee01feacbcec2e5cc90d726be0bac3837649275a 100644 --- a/ansi-tests/position.lsp +++ b/ansi-tests/position.lsp @@ -613,26 +613,26 @@ 4) (deftest position-string.25 - (position #\a (make-array '(10) :initial-contents (coerce "bbbbbaaaaa" 'list) + (position #\a (make-array '(10) :initial-contents "bbbbbaaaaa" :element-type 'character :fill-pointer 5)) nil) (deftest position-string.26 - (position #\a (make-array '(10) :initial-contents (coerce "bbbbbaaaaa" 'list) + (position #\a (make-array '(10) :initial-contents "bbbbbaaaaa" :element-type 'character :fill-pointer 5) :from-end t) nil) (deftest position-string.27 - (position #\a (make-array '(10) :initial-contents (coerce "bbbbaaaaaa" 'list) + (position #\a (make-array '(10) :initial-contents "bbbbaaaaaa" :element-type 'character :fill-pointer 5)) 4) (deftest position-string.28 - (position #\a (make-array '(10) :initial-contents (coerce "babbaaaaaa" 'list) + (position #\a (make-array '(10) :initial-contents "babbaaaaaa" :element-type 'character :fill-pointer 5) :from-end t) diff --git a/ansi-tests/reduce.lsp b/ansi-tests/reduce.lsp index a04a63ff8e125c549000374ef3cc6b721c132a3f..ad30307885e2dd3696cc87bd5d157aba1ed5e6f4 100644 --- a/ansi-tests/reduce.lsp +++ b/ansi-tests/reduce.lsp @@ -228,7 +228,7 @@ 0) (deftest reduce-string.14 - (let ((s (make-array '(8) :initial-contents (coerce "abcdefgh" 'list) + (let ((s (make-array '(8) :initial-contents "abcdefgh" :fill-pointer 6 :element-type 'character))) (coerce (reduce #'(lambda (x y) (cons y x)) s :initial-value nil) @@ -236,7 +236,7 @@ "fedcba") (deftest reduce-string.15 - (let ((s (make-array '(8) :initial-contents (coerce "abcdefgh" 'list) + (let ((s (make-array '(8) :initial-contents "abcdefgh" :fill-pointer 6 :element-type 'character))) (coerce (reduce #'(lambda (x y) (cons y x)) s :initial-value nil @@ -245,7 +245,7 @@ "fedcb") (deftest reduce-string.16 - (let ((s (make-array '(8) :initial-contents (coerce "abcdefgh" 'list) + (let ((s (make-array '(8) :initial-contents "abcdefgh" :fill-pointer 6 :element-type 'character))) (coerce (reduce #'(lambda (x y) (cons y x)) s :end nil @@ -254,7 +254,7 @@ "fedcba") (deftest reduce-string.17 - (let ((s (make-array '(8) :initial-contents (coerce "abcdefgh" 'list) + (let ((s (make-array '(8) :initial-contents "abcdefgh" :fill-pointer 6 :element-type 'character))) (coerce (reduce #'(lambda (x y) (cons y x)) s :end 4 diff --git a/ansi-tests/replace.lsp b/ansi-tests/replace.lsp index 813d2c5d2eb8c5df09565d5d853531b6f350f878..59a2af7f3c6adc71521d3c5c198a7c79ea54dd7e 100644 --- a/ansi-tests/replace.lsp +++ b/ansi-tests/replace.lsp @@ -564,7 +564,7 @@ (deftest replace-string.18 (let* ((x (copy-seq "abcdef")) - (y (make-array '(6) :initial-contents (coerce "123456" 'list) + (y (make-array '(6) :initial-contents "123456" :fill-pointer 3 :element-type 'character)) (result (replace x y :start1 1))) diff --git a/ansi-tests/reverse.lsp b/ansi-tests/reverse.lsp index 8df96695303b6cf8398026d8e5ee6c7cc52d1fba..05429b6985eed02f9e5f8f73a9aed147b025734a 100644 --- a/ansi-tests/reverse.lsp +++ b/ansi-tests/reverse.lsp @@ -74,7 +74,7 @@ "000110110110") (deftest reverse-string.3 - (let* ((x (make-array 10 :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array 10 :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'character)) (y (reverse x))) @@ -82,7 +82,7 @@ "edcba") (deftest reverse-string.4 - (let* ((x (make-array 10 :initial-contents (coerce "abcdefghij" 'list) + (let* ((x (make-array 10 :initial-contents "abcdefghij" :fill-pointer 5 :element-type 'base-char)) (y (reverse x))) diff --git a/ansi-tests/search-string.lsp b/ansi-tests/search-string.lsp index c39d5d15d4e1c777ebfe8c95aaa53899d0c01334..7a9af742f7d6ba4c96b0a57bfc12a92d31d94533 100644 --- a/ansi-tests/search-string.lsp +++ b/ansi-tests/search-string.lsp @@ -132,7 +132,7 @@ nil) (deftest search-string.15 - (let ((a (make-array '(10) :initial-contents (coerce "abbaaababb" 'list) + (let ((a (make-array '(10) :initial-contents "abbaaababb" :fill-pointer 5 :element-type 'character))) (values diff --git a/ansi-tests/sort.lsp b/ansi-tests/sort.lsp index 62220b2e9668b7590603d615a1207234739d4e06..dd6e922c2454e5e70c88f24148f30cdfd6df8474 100644 --- a/ansi-tests/sort.lsp +++ b/ansi-tests/sort.lsp @@ -74,7 +74,7 @@ "11111000") (deftest sort-string.3 - (let ((a (make-array 10 :initial-contents (coerce "1001111011" 'list) + (let ((a (make-array 10 :initial-contents "1001111011" :element-type 'character :fill-pointer 5))) (sort a #'char<)) diff --git a/ansi-tests/stable-sort.lsp b/ansi-tests/stable-sort.lsp index 720dae30a5f3c654f7fde26ccffa29bc9a08c15b..94057d96d726fbf3ac5b419795def608882a3645 100644 --- a/ansi-tests/stable-sort.lsp +++ b/ansi-tests/stable-sort.lsp @@ -85,7 +85,7 @@ "11111000") (deftest stable-sort-string.3 - (let ((a (make-array 10 :initial-contents (coerce "1001111011" 'list) + (let ((a (make-array 10 :initial-contents "1001111011" :element-type 'character :fill-pointer 5))) (stable-sort a #'char<)) diff --git a/ansi-tests/string-left-trim.lsp b/ansi-tests/string-left-trim.lsp index 90354aef0e662abdd7dafc1e5d2994f7b1e1fb80..189790ea7d81484ffb479d348828d852f1833d40 100644 --- a/ansi-tests/string-left-trim.lsp +++ b/ansi-tests/string-left-trim.lsp @@ -72,7 +72,7 @@ "cdaba") (deftest string-left-trim.9 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'character )) (s2 (string-left-trim "ab" s))) @@ -81,7 +81,7 @@ "cdaba") (deftest string-left-trim.10 - (let* ((s (make-array 9 :initial-contents (coerce "abcdabadd" 'list) + (let* ((s (make-array 9 :initial-contents "abcdabadd" :element-type 'character :fill-pointer 7)) (s2 (string-left-trim "ab" s))) @@ -90,7 +90,7 @@ "cdaba") (deftest string-left-trim.11 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'standard-char )) (s2 (string-left-trim "ab" s))) @@ -99,7 +99,7 @@ "cdaba") (deftest string-left-trim.12 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'base-char )) (s2 (string-left-trim "ab" s))) diff --git a/ansi-tests/string-right-trim.lsp b/ansi-tests/string-right-trim.lsp index 7d2d6075f71962705f220fca1362f54d85914b82..938823c0523841f300fec28a3b73b5667e4115df 100644 --- a/ansi-tests/string-right-trim.lsp +++ b/ansi-tests/string-right-trim.lsp @@ -72,7 +72,7 @@ "abcd") (deftest string-right-trim.9 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'character )) (s2 (string-right-trim "ab" s))) @@ -81,7 +81,7 @@ "abcd") (deftest string-right-trim.10 - (let* ((s (make-array 9 :initial-contents (coerce "abcdabadd" 'list) + (let* ((s (make-array 9 :initial-contents "abcdabadd" :element-type 'character :fill-pointer 7)) (s2 (string-right-trim "ab" s))) @@ -90,7 +90,7 @@ "abcd") (deftest string-right-trim.11 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'standard-char )) (s2 (string-right-trim "ab" s))) @@ -99,7 +99,7 @@ "abcd") (deftest string-right-trim.12 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'base-char )) (s2 (string-right-trim "ab" s))) diff --git a/ansi-tests/string-trim.lsp b/ansi-tests/string-trim.lsp index ae169c7ab1098c27385495f3523935e36b4a1ee2..71dac0db86cf3eb5de4e1d701ca3631ccaf5ecdd 100644 --- a/ansi-tests/string-trim.lsp +++ b/ansi-tests/string-trim.lsp @@ -72,7 +72,7 @@ "cd") (deftest string-trim.9 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'character )) (s2 (string-trim "ab" s))) @@ -81,7 +81,7 @@ "cd") (deftest string-trim.10 - (let* ((s (make-array 9 :initial-contents (coerce "abcdabadd" 'list) + (let* ((s (make-array 9 :initial-contents "abcdabadd" :element-type 'character :fill-pointer 7)) (s2 (string-trim "ab" s))) @@ -90,7 +90,7 @@ "cd") (deftest string-trim.11 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'standard-char )) (s2 (string-trim "ab" s))) @@ -99,7 +99,7 @@ "cd") (deftest string-trim.12 - (let* ((s (make-array 7 :initial-contents (coerce "abcdaba" 'list) + (let* ((s (make-array 7 :initial-contents "abcdaba" :element-type 'base-char )) (s2 (string-trim "ab" s))) diff --git a/ansi-tests/subseq-aux.lsp b/ansi-tests/subseq-aux.lsp index f943ed830748f16e2d5251ab75e64114a31d1cca..55aa421cf95a8299647de62ea7c2066884a6819f 100644 --- a/ansi-tests/subseq-aux.lsp +++ b/ansi-tests/subseq-aux.lsp @@ -174,8 +174,7 @@ 'string)))))) (defun subseq-string-3-body () - (let* ((s1 (make-array '(10) :initial-contents - (coerce "abcdefghij" 'list) + (let* ((s1 (make-array '(10) :initial-contents "abcdefghij" :fill-pointer 8 :element-type 'character)) (len (length s1))) @@ -218,8 +217,7 @@ 'bit-vector)))))) (defun subseq-bit-vector-3-body () - (let* ((s1 (make-array '(10) :initial-contents - (coerce #*1101100110 'list) + (let* ((s1 (make-array '(10) :initial-contents #*1101100110 :fill-pointer 8 :element-type 'bit)) (len (length s1))) diff --git a/ansi-tests/substitute-if-not.lsp b/ansi-tests/substitute-if-not.lsp index 7d12e399224a591ec49fe53ff795b6c106fe6cb9..c3635b8d9daf65f91bacbc492d4a6b4148405c74 100644 --- a/ansi-tests/substitute-if-not.lsp +++ b/ansi-tests/substitute-if-not.lsp @@ -402,28 +402,28 @@ t) (deftest substitute-if-not-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if-not #\z (is-not-eql-p #\a) x))) result) "zbzcb") (deftest substitute-if-not-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if-not #\z (is-not-eql-p #\a) x :from-end t))) result) "zbzcb") (deftest substitute-if-not-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if-not #\z (is-not-eql-p #\a) x :count 1))) result) "zbacb") (deftest substitute-if-not-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if-not #\z (is-not-eql-p #\a) x :from-end t :count 1))) diff --git a/ansi-tests/substitute-if.lsp b/ansi-tests/substitute-if.lsp index 46f2f2a06f8e8c641f60e71ce8cf0728d7c4243e..b8e72b97cfdf1dd4acf08e00c7a41f5d5e092f5a 100644 --- a/ansi-tests/substitute-if.lsp +++ b/ansi-tests/substitute-if.lsp @@ -429,28 +429,28 @@ (deftest substitute-if-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if #\z (is-eql-p #\a) x))) result) "zbzcb") (deftest substitute-if-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if #\z (is-eql-p #\a) x :from-end t))) result) "zbzcb") (deftest substitute-if-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if #\z (is-eql-p #\a) x :count 1))) result) "zbacb") (deftest substitute-if-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute-if #\z (is-eql-p #\a) x :from-end t :count 1))) result) diff --git a/ansi-tests/substitute.lsp b/ansi-tests/substitute.lsp index d344b3878eda04e4609fcf3866118e8398f844af..77923e531e31ddd041faa05e2cd60d49fb06f79a 100644 --- a/ansi-tests/substitute.lsp +++ b/ansi-tests/substitute.lsp @@ -655,28 +655,28 @@ "0a0aaaa0aa") (deftest substitute-string.28 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute #\z #\a x))) result) "zbzcb") (deftest substitute-string.29 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute #\z #\a x :from-end t))) result) "zbzcb") (deftest substitute-string.30 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute #\z #\a x :count 1))) result) "zbacb") (deftest substitute-string.31 - (let* ((x (make-array '(10) :initial-contents (coerce "abacbadeaf" 'list) + (let* ((x (make-array '(10) :initial-contents "abacbadeaf" :fill-pointer 5 :element-type 'character)) (result (substitute #\z #\a x :from-end t :count 1))) result)