Changeset 11433

Timestamp:

12/07/08 22:12:47 (14 years ago)

Author:

ehuelsmann

Message:

Strings are also BASE-STRING; SIMPLE-STRINGs are also SIMPLE-BASE-STRINGs.

Found by: Douglas Miles

Location:

trunk/j/src/org/armedbear/lisp

Files:

• AbstractString.java (modified) (1 diff)
• SimpleString.java (modified) (1 diff)

trunk/j/src/org/armedbear/lisp/AbstractString.java

@@ -41 +41 @@
             if (type == Symbol.STRING)
                 return T;
+            if (type == Symbol.BASE_STRING)
+                return T;
         }
         if (type == BuiltInClass.STRING)
+            return T;
+        if (type == BuiltInClass.BASE_STRING)
             return T;
         return super.typep(type);

trunk/j/src/org/armedbear/lisp/SimpleString.java

@@ -119 +119 @@
         if (type == Symbol.SIMPLE_ARRAY)
             return T;
+        if (type == Symbol.SIMPLE_BASE_STRING)
+            return T;
         if (type == BuiltInClass.SIMPLE_STRING)
             return T;
         if (type == BuiltInClass.SIMPLE_ARRAY)
+            return T;
+        if (type == BuiltInClass.SIMPLE_BASE_STRING)
             return T;
         return super.typep(type);