[armedbear-cvs] r11433 - trunk/j/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Dec  7 22:12:47 2008
New Revision: 11433

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

Modified:
   trunk/j/src/org/armedbear/lisp/AbstractString.java
   trunk/j/src/org/armedbear/lisp/SimpleString.java

Modified: trunk/j/src/org/armedbear/lisp/AbstractString.java
==============================================================================
--- trunk/j/src/org/armedbear/lisp/AbstractString.java	(original)
+++ trunk/j/src/org/armedbear/lisp/AbstractString.java	Sun Dec  7 22:12:47 2008
@@ -40,9 +40,13 @@
         if (type instanceof Symbol) {
             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);
     }
 

Modified: trunk/j/src/org/armedbear/lisp/SimpleString.java
==============================================================================
--- trunk/j/src/org/armedbear/lisp/SimpleString.java	(original)
+++ trunk/j/src/org/armedbear/lisp/SimpleString.java	Sun Dec  7 22:12:47 2008
@@ -118,10 +118,14 @@
             return T;
         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);
     }