Changeset 12358


Ignore:
Timestamp:
01/10/10 20:43:45 (11 years ago)
Author:
ehuelsmann
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java

    r12357 r12358  
    202202    BIT_VECTOR.setDirectSuperclass(VECTOR);
    203203    BIT_VECTOR.setCPL(BIT_VECTOR, VECTOR, ARRAY, SEQUENCE, CLASS_T);
    204     BROADCAST_STREAM.setCPL(BROADCAST_STREAM, STREAM, CLASS_T);
    205     CASE_FROB_STREAM.setDirectSuperclass(STREAM);
    206     CASE_FROB_STREAM.setCPL(CASE_FROB_STREAM, STREAM, CLASS_T);
     204    BROADCAST_STREAM.setCPL(BROADCAST_STREAM, SYSTEM_STREAM, STREAM,
     205                            STRUCTURE_OBJECT, CLASS_T);
     206    CASE_FROB_STREAM.setCPL(CASE_FROB_STREAM, SYSTEM_STREAM, STREAM,
     207                            STRUCTURE_OBJECT, CLASS_T);
    207208    CHARACTER.setDirectSuperclass(CLASS_T);
    208209    CHARACTER.setCPL(CHARACTER, CLASS_T);
     
    210211    COMPLEX.setDirectSuperclass(NUMBER);
    211212    COMPLEX.setCPL(COMPLEX, NUMBER, CLASS_T);
    212     CONCATENATED_STREAM.setCPL(CONCATENATED_STREAM, STREAM, CLASS_T);
     213    CONCATENATED_STREAM.setCPL(CONCATENATED_STREAM, SYSTEM_STREAM, STREAM,
     214                               STRUCTURE_OBJECT, CLASS_T);
    213215    CONS.setDirectSuperclass(LIST);
    214216    CONS.setCPL(CONS, LIST, SEQUENCE, CLASS_T);
    215217    DOUBLE_FLOAT.setDirectSuperclass(FLOAT);
    216218    DOUBLE_FLOAT.setCPL(DOUBLE_FLOAT, FLOAT, REAL, NUMBER, CLASS_T);
    217     ECHO_STREAM.setCPL(ECHO_STREAM, STREAM, CLASS_T);
     219    ECHO_STREAM.setCPL(ECHO_STREAM, SYSTEM_STREAM, STREAM,
     220                       STRUCTURE_OBJECT, CLASS_T);
    218221    ENVIRONMENT.setDirectSuperclass(CLASS_T);
    219222    ENVIRONMENT.setCPL(ENVIRONMENT, CLASS_T);
    220223    FIXNUM.setDirectSuperclass(INTEGER);
    221224    FIXNUM.setCPL(FIXNUM, INTEGER, RATIONAL, REAL, NUMBER, CLASS_T);
    222     FILE_STREAM.setCPL(FILE_STREAM, STREAM, CLASS_T);
     225    FILE_STREAM.setCPL(FILE_STREAM, SYSTEM_STREAM, STREAM,
     226                       STRUCTURE_OBJECT, CLASS_T);
    223227    FLOAT.setDirectSuperclass(REAL);
    224228    FLOAT.setCPL(FLOAT, REAL, NUMBER, CLASS_T);
     
    282286    SINGLE_FLOAT.setDirectSuperclass(FLOAT);
    283287    SINGLE_FLOAT.setCPL(SINGLE_FLOAT, FLOAT, REAL, NUMBER, CLASS_T);
    284     SLIME_INPUT_STREAM.setCPL(SLIME_INPUT_STREAM, STRING_STREAM, STREAM,
    285                               CLASS_T);
    286     SLIME_OUTPUT_STREAM.setCPL(SLIME_OUTPUT_STREAM, STRING_STREAM, STREAM,
    287                                CLASS_T);
    288     SOCKET_STREAM.setCPL(SOCKET_STREAM, TWO_WAY_STREAM, STREAM, CLASS_T);
    289     STREAM.setCPL(STREAM, CLASS_T);
     288    SLIME_INPUT_STREAM.setCPL(SLIME_INPUT_STREAM, STRING_STREAM, SYSTEM_STREAM,
     289                              STREAM, STRUCTURE_OBJECT, CLASS_T);
     290    SLIME_OUTPUT_STREAM.setCPL(SLIME_OUTPUT_STREAM, STRING_STREAM, SYSTEM_STREAM,
     291                               STREAM, STRUCTURE_OBJECT, CLASS_T);
     292    SOCKET_STREAM.setCPL(SOCKET_STREAM, TWO_WAY_STREAM, SYSTEM_STREAM, STREAM,
     293                         STRUCTURE_OBJECT, CLASS_T);
     294    STREAM.setCPL(STREAM, STRUCTURE_OBJECT, CLASS_T);
    290295    STRING.setDirectSuperclass(VECTOR);
    291296    STRING.setCPL(STRING, VECTOR, ARRAY, SEQUENCE, CLASS_T);
    292     STRING_INPUT_STREAM.setCPL(STRING_INPUT_STREAM, STRING_STREAM, STREAM,
    293                                CLASS_T);
    294     STRING_OUTPUT_STREAM.setCPL(STRING_OUTPUT_STREAM, STRING_STREAM, STREAM,
    295                                 CLASS_T);
    296     STRING_STREAM.setCPL(STRING_STREAM, STREAM, CLASS_T);
     297    STRING_INPUT_STREAM.setCPL(STRING_INPUT_STREAM, STRING_STREAM,
     298                               SYSTEM_STREAM, STREAM, STRUCTURE_OBJECT, CLASS_T);
     299    STRING_OUTPUT_STREAM.setCPL(STRING_OUTPUT_STREAM, STRING_STREAM,
     300                                SYSTEM_STREAM, STREAM, STRUCTURE_OBJECT, CLASS_T);
     301    STRING_STREAM.setCPL(STRING_STREAM, SYSTEM_STREAM, STREAM,
     302                         STRUCTURE_OBJECT, CLASS_T);
    297303    STRUCTURE_OBJECT.setCPL(STRUCTURE_OBJECT, CLASS_T);
    298304    SYMBOL.setDirectSuperclass(CLASS_T);
    299305    SYMBOL.setCPL(SYMBOL, CLASS_T);
    300     SYNONYM_STREAM.setCPL(SYNONYM_STREAM, STREAM, CLASS_T);
     306    SYNONYM_STREAM.setCPL(SYNONYM_STREAM, SYSTEM_STREAM,
     307                          STREAM, STRUCTURE_OBJECT, CLASS_T);
    301308    THREAD.setDirectSuperclass(CLASS_T);
    302309    THREAD.setCPL(THREAD, CLASS_T);
    303     TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, STREAM, CLASS_T);
     310    TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, SYSTEM_STREAM, STREAM,
     311                          STRUCTURE_OBJECT, CLASS_T);
    304312    VECTOR.setDirectSuperclasses(list(ARRAY, SEQUENCE));
    305313    VECTOR.setCPL(VECTOR, ARRAY, SEQUENCE, CLASS_T);
Note: See TracChangeset for help on using the changeset viewer.