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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Jan 10 15:43:45 2010
New Revision: 12358

Log:
Fix the stream Class Precedence Lists (CPLs) to include STRUCTURE_OBJECT and SYSTEM_STREAM.

Modified:
   trunk/abcl/src/org/armedbear/lisp/BuiltInClass.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	Sun Jan 10 15:43:45 2010
@@ -201,25 +201,29 @@
     BIGNUM.setCPL(BIGNUM, INTEGER, RATIONAL, REAL, NUMBER, CLASS_T);
     BIT_VECTOR.setDirectSuperclass(VECTOR);
     BIT_VECTOR.setCPL(BIT_VECTOR, VECTOR, ARRAY, SEQUENCE, CLASS_T);
-    BROADCAST_STREAM.setCPL(BROADCAST_STREAM, STREAM, CLASS_T);
-    CASE_FROB_STREAM.setDirectSuperclass(STREAM);
-    CASE_FROB_STREAM.setCPL(CASE_FROB_STREAM, STREAM, CLASS_T);
+    BROADCAST_STREAM.setCPL(BROADCAST_STREAM, SYSTEM_STREAM, STREAM,
+                            STRUCTURE_OBJECT, CLASS_T);
+    CASE_FROB_STREAM.setCPL(CASE_FROB_STREAM, SYSTEM_STREAM, STREAM,
+                            STRUCTURE_OBJECT, CLASS_T);
     CHARACTER.setDirectSuperclass(CLASS_T);
     CHARACTER.setCPL(CHARACTER, CLASS_T);
     CLASS_T.setCPL(CLASS_T);
     COMPLEX.setDirectSuperclass(NUMBER);
     COMPLEX.setCPL(COMPLEX, NUMBER, CLASS_T);
-    CONCATENATED_STREAM.setCPL(CONCATENATED_STREAM, STREAM, CLASS_T);
+    CONCATENATED_STREAM.setCPL(CONCATENATED_STREAM, SYSTEM_STREAM, STREAM,
+                               STRUCTURE_OBJECT, CLASS_T);
     CONS.setDirectSuperclass(LIST);
     CONS.setCPL(CONS, LIST, SEQUENCE, CLASS_T);
     DOUBLE_FLOAT.setDirectSuperclass(FLOAT);
     DOUBLE_FLOAT.setCPL(DOUBLE_FLOAT, FLOAT, REAL, NUMBER, CLASS_T);
-    ECHO_STREAM.setCPL(ECHO_STREAM, STREAM, CLASS_T);
+    ECHO_STREAM.setCPL(ECHO_STREAM, SYSTEM_STREAM, STREAM,
+                       STRUCTURE_OBJECT, CLASS_T);
     ENVIRONMENT.setDirectSuperclass(CLASS_T);
     ENVIRONMENT.setCPL(ENVIRONMENT, CLASS_T);
     FIXNUM.setDirectSuperclass(INTEGER);
     FIXNUM.setCPL(FIXNUM, INTEGER, RATIONAL, REAL, NUMBER, CLASS_T);
-    FILE_STREAM.setCPL(FILE_STREAM, STREAM, CLASS_T);
+    FILE_STREAM.setCPL(FILE_STREAM, SYSTEM_STREAM, STREAM,
+                       STRUCTURE_OBJECT, CLASS_T);
     FLOAT.setDirectSuperclass(REAL);
     FLOAT.setCPL(FLOAT, REAL, NUMBER, CLASS_T);
     FUNCTION.setDirectSuperclass(CLASS_T);
@@ -281,26 +285,30 @@
                          CLASS_T);
     SINGLE_FLOAT.setDirectSuperclass(FLOAT);
     SINGLE_FLOAT.setCPL(SINGLE_FLOAT, FLOAT, REAL, NUMBER, CLASS_T);
-    SLIME_INPUT_STREAM.setCPL(SLIME_INPUT_STREAM, STRING_STREAM, STREAM,
-                              CLASS_T);
-    SLIME_OUTPUT_STREAM.setCPL(SLIME_OUTPUT_STREAM, STRING_STREAM, STREAM,
-                               CLASS_T);
-    SOCKET_STREAM.setCPL(SOCKET_STREAM, TWO_WAY_STREAM, STREAM, CLASS_T);
-    STREAM.setCPL(STREAM, CLASS_T);
+    SLIME_INPUT_STREAM.setCPL(SLIME_INPUT_STREAM, STRING_STREAM, SYSTEM_STREAM,
+                              STREAM, STRUCTURE_OBJECT, CLASS_T);
+    SLIME_OUTPUT_STREAM.setCPL(SLIME_OUTPUT_STREAM, STRING_STREAM, SYSTEM_STREAM,
+                               STREAM, STRUCTURE_OBJECT, CLASS_T);
+    SOCKET_STREAM.setCPL(SOCKET_STREAM, TWO_WAY_STREAM, SYSTEM_STREAM, STREAM,
+                         STRUCTURE_OBJECT, CLASS_T);
+    STREAM.setCPL(STREAM, STRUCTURE_OBJECT, CLASS_T);
     STRING.setDirectSuperclass(VECTOR);
     STRING.setCPL(STRING, VECTOR, ARRAY, SEQUENCE, CLASS_T);
-    STRING_INPUT_STREAM.setCPL(STRING_INPUT_STREAM, STRING_STREAM, STREAM,
-                               CLASS_T);
-    STRING_OUTPUT_STREAM.setCPL(STRING_OUTPUT_STREAM, STRING_STREAM, STREAM,
-                                CLASS_T);
-    STRING_STREAM.setCPL(STRING_STREAM, STREAM, CLASS_T);
+    STRING_INPUT_STREAM.setCPL(STRING_INPUT_STREAM, STRING_STREAM,
+                               SYSTEM_STREAM, STREAM, STRUCTURE_OBJECT, CLASS_T);
+    STRING_OUTPUT_STREAM.setCPL(STRING_OUTPUT_STREAM, STRING_STREAM,
+                                SYSTEM_STREAM, STREAM, STRUCTURE_OBJECT, CLASS_T);
+    STRING_STREAM.setCPL(STRING_STREAM, SYSTEM_STREAM, STREAM,
+                         STRUCTURE_OBJECT, CLASS_T);
     STRUCTURE_OBJECT.setCPL(STRUCTURE_OBJECT, CLASS_T);
     SYMBOL.setDirectSuperclass(CLASS_T);
     SYMBOL.setCPL(SYMBOL, CLASS_T);
-    SYNONYM_STREAM.setCPL(SYNONYM_STREAM, STREAM, CLASS_T);
+    SYNONYM_STREAM.setCPL(SYNONYM_STREAM, SYSTEM_STREAM,
+                          STREAM, STRUCTURE_OBJECT, CLASS_T);
     THREAD.setDirectSuperclass(CLASS_T);
     THREAD.setCPL(THREAD, CLASS_T);
-    TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, STREAM, CLASS_T);
+    TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, SYSTEM_STREAM, STREAM,
+                          STRUCTURE_OBJECT, CLASS_T);
     VECTOR.setDirectSuperclasses(list(ARRAY, SEQUENCE));
     VECTOR.setCPL(VECTOR, ARRAY, SEQUENCE, CLASS_T);
     STACK_FRAME.setDirectSuperclasses(CLASS_T);