diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp index ffe00ba0f3461207c92cde7af33d01fcb911c41f..c1570d32ecb56dfb467b37ce4da3ff276abf42e3 100644 --- a/ansi-tests/ansi-aux.lsp +++ b/ansi-tests/ansi-aux.lsp @@ -620,15 +620,14 @@ the condition to go uncaught if it cannot be classified." (reader-error parse-error) (reader-error stream-error) ))) - #| (when (subtypep* 'character 'base-char) (setq table (append '((character base-char) - (string base-string) - (simple-string simple-base-string)) + ;; (string base-string) + ;; (simple-string simple-base-string) + ) table))) - |# table)) diff --git a/ansi-tests/subtypep-array.lsp b/ansi-tests/subtypep-array.lsp index 41e528dbbd33622cefde64b8c7ebf4b1778b8a58..49d0d0180239cd6184909fabf5af6f67521e0769 100644 --- a/ansi-tests/subtypep-array.lsp +++ b/ansi-tests/subtypep-array.lsp @@ -106,17 +106,17 @@ (subtypep* '(vector character) 'string) t t) -(deftest string-is-vector-of-character.3 +(deftest string-is-not-vector-of-character.3 (subtypep* '(string *) '(vector character)) - t t) + nil t) (deftest string-is-vector-of-character.4 (subtypep* '(vector character) '(string *)) t t) -(deftest string-is-vector-of-character.5 +(deftest string-is-not-vector-of-character.5 (subtypep* '(string 17) '(vector character 17)) - t t) + nil t) (deftest string-is-vector-of-character.6 (subtypep* '(vector character 17) '(string 17)) @@ -170,23 +170,23 @@ (subtypep* '(simple-array base-char (17)) '(simple-base-string 17)) t t) -(deftest simple-string-is-simple-1d-array-of-character.1 +(deftest simple-string-is-not-simple-1d-array-of-character.1 (subtypep* 'simple-string '(simple-array character (*))) - t t) + nil t) (deftest simple-string-is-simple-1d-array-of-character.2 (subtypep* '(simple-array character (*)) 'simple-string) t t) -(deftest simple-string-is-simple-1d-array-of-character.3 +(deftest simple-string-is-not-simple-1d-array-of-character.3 (subtypep* '(simple-string *) '(simple-array character (*))) - t t) + nil t) (deftest simple-string-is-simple-1d-array-of-character.4 (subtypep* '(simple-array character (*)) '(simple-string *)) t t) -(deftest simple-string-is-simple-1d-array-of-character.5 +(deftest simple-string-is-not-simple-1d-array-of-character.5 (subtypep* '(simple-string 17) '(simple-array character (17))) nil t)