[armedbear-cvs] r11587 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat Jan 24 20:38:24 2009
New Revision: 11587

Log:
Ofcourse, you need all components for a commit to actually work... (Belongs to last commit.)

Modified:
   trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
   trunk/abcl/src/org/armedbear/lisp/SimpleString.java

Modified: trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java	Sat Jan 24 20:38:24 2009
@@ -236,9 +236,9 @@
     SIMPLE_BIT_VECTOR.setDirectSuperclasses(list2(BIT_VECTOR, SIMPLE_ARRAY));
     SIMPLE_BIT_VECTOR.setCPL(SIMPLE_BIT_VECTOR, BIT_VECTOR, VECTOR,
                              SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T);
-    SIMPLE_STRING.setDirectSuperclasses(list2(STRING, SIMPLE_ARRAY));
-    SIMPLE_STRING.setCPL(SIMPLE_STRING, STRING, VECTOR, SIMPLE_ARRAY, ARRAY,
-                         SEQUENCE, CLASS_T);
+    SIMPLE_STRING.setDirectSuperclasses(list3(BASE_STRING, STRING, SIMPLE_ARRAY));
+    SIMPLE_STRING.setCPL(SIMPLE_STRING, BASE_STRING, STRING, VECTOR,
+                         SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T);
     SIMPLE_VECTOR.setDirectSuperclasses(list2(VECTOR, SIMPLE_ARRAY));
     SIMPLE_VECTOR.setCPL(SIMPLE_VECTOR, VECTOR, SIMPLE_ARRAY, ARRAY, SEQUENCE,
                          CLASS_T);

Modified: trunk/abcl/src/org/armedbear/lisp/SimpleString.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleString.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleString.java	Sat Jan 24 20:38:24 2009
@@ -97,13 +97,13 @@
     @Override
     public LispObject typeOf()
     {
-        return list2(Symbol.SIMPLE_STRING, new Fixnum(capacity));
+        return list2(Symbol.SIMPLE_BASE_STRING, new Fixnum(capacity));
     }
 
     @Override
     public LispObject classOf()
     {
-        return BuiltInClass.SIMPLE_STRING;
+        return BuiltInClass.SIMPLE_BASE_STRING;
     }
 
     @Override