From 6ee594dcd6ac5e92c6bed1c4068a2ebe97c5676c Mon Sep 17 00:00:00 2001
From: pfdietz <pfdietz@localhost>
Date: Mon, 24 Oct 2005 11:52:21 +0000
Subject: [PATCH] Fixes for ECL

---
 ansi-tests/base-string.lsp        |  3 +--
 ansi-tests/notes.lsp              |  2 +-
 ansi-tests/proclaim.lsp           | 21 ++++++++-------------
 ansi-tests/simple-base-string.lsp |  6 +++---
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/ansi-tests/base-string.lsp b/ansi-tests/base-string.lsp
index e3c2a743..22d30d19 100644
--- a/ansi-tests/base-string.lsp
+++ b/ansi-tests/base-string.lsp
@@ -22,7 +22,7 @@
   t t)
 
 (deftest base-string.5
-  :notes (:allow-nil-arrays)
+  :notes (:allow-nil-arrays :nil-vectors-are-strings)
   (subtypep* '(array nil (*)) 'base-string)
   nil t)
 
@@ -30,4 +30,3 @@
   :notes (:nil-vectors-are-strings)
   (subtypep* 'string 'base-string)
   nil t)
-
diff --git a/ansi-tests/notes.lsp b/ansi-tests/notes.lsp
index 25c226d8..d5e457d6 100644
--- a/ansi-tests/notes.lsp
+++ b/ansi-tests/notes.lsp
@@ -48,5 +48,5 @@ If negative zeros are distinct this is probably not good, since it makes (defcon
 
 ;;; Haible disagrees with :result-type-element-type-by-subtype
 #+clisp (rt::disable-note :result-type-element-type-by-subtype)
-#+(or openmcl gcl) (rt::disable-note :nil-vectors-are-strings)
+#+(or openmcl gcl ecl) (rt::disable-note :nil-vectors-are-strings)
 #+gcl (rt::disable-note :allow-nil-arrays)
diff --git a/ansi-tests/proclaim.lsp b/ansi-tests/proclaim.lsp
index 9b46d0e4..bcd37250 100644
--- a/ansi-tests/proclaim.lsp
+++ b/ansi-tests/proclaim.lsp
@@ -36,19 +36,19 @@
   t)
 
 (deftest proclaim.error.3
-  (signals-error (proclaim `(optimize . foo)) type-error)
+  (signals-error (proclaim `(optimize . foo)) error)
   t)
 
 (deftest proclaim.error.4
-  (signals-error (proclaim `(inline . foo)) type-error)
+  (signals-error (proclaim `(inline . foo)) error)
   t)
 
 (deftest proclaim.error.5
-  (signals-error (proclaim `(notinline . foo)) type-error)
+  (signals-error (proclaim `(notinline . foo)) error)
   t)
 
 (deftest proclaim.error.6
-  (signals-error (proclaim `(type . foo)) type-error)
+  (signals-error (proclaim `(type . foo)) error)
   t)
 
 (deftest proclaim.error.7
@@ -56,22 +56,17 @@
   t)
 
 (deftest proclaim.error.8
-  (signals-error (proclaim '(type integer . foo)) type-error)
+  (signals-error (proclaim '(type integer . foo)) error)
   t)
 
 (deftest proclaim.error.9
-  (signals-error (proclaim '(integer . foo)) type-error)
+  (signals-error (proclaim '(integer . foo)) error)
   t)
 
 (deftest proclaim.error.10
-  (signals-error (proclaim '(declaration . foo)) type-error)
+  (signals-error (proclaim '(declaration . foo)) error)
   t)
 
 (deftest proclaim.error.11
-  (signals-error (proclaim '(ftype (function (t) t) . foo)) type-error)
+  (signals-error (proclaim '(ftype (function (t) t) . foo)) error)
   t)
-
-
-
-
-
diff --git a/ansi-tests/simple-base-string.lsp b/ansi-tests/simple-base-string.lsp
index 41831706..4e579215 100644
--- a/ansi-tests/simple-base-string.lsp
+++ b/ansi-tests/simple-base-string.lsp
@@ -38,16 +38,16 @@
   nil t)
 
 (deftest simple-base-string.9
-  :notes (:allow-nil-arrays)
+  :notes (:allow-nil-arrays :nil-vectors-are-strings)
   (subtypep* '(simple-array nil (*)) 'simple-base-string)
   nil t)
 
 (deftest simple-base-string.10
-  :notes (:allow-nil-arrays)
+  :notes (:allow-nil-arrays :nil-vectors-are-strings)
   (typep* (make-array '(0) :element-type nil) 'simple-base-string)
   nil)
 
 (deftest simple-base-string.11
-  :notes (:allow-nil-arrays)
+  :notes (:allow-nil-arrays :nil-vectors-are-strings)
   (typep* (make-array '(12) :element-type nil) 'simple-base-string)
   nil)
-- 
GitLab