Changeset 5072


Ignore:
Timestamp:
12/11/03 20:01:12 (17 years ago)
Author:
piso
Message:

SERIOUS-CONDITION, ERROR

File:
1 edited

Legend:

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

    r4890 r5072  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: BuiltInClass.java,v 1.15 2003-11-25 00:18:19 piso Exp $
     5 * $Id: BuiltInClass.java,v 1.16 2003-12-11 20:01:12 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7676    public static final BuiltInClass COMPLEX                          = addClass(Symbol.COMPLEX);
    7777    public static final BuiltInClass CONCATENATED_STREAM              = addClass(Symbol.CONCATENATED_STREAM);
    78 //     public static final BuiltInClass CONDITION                        = addClass(Symbol.CONDITION);
    7978    public static final BuiltInClass CONS                             = addClass(Symbol.CONS);
    8079    public static final BuiltInClass CONTROL_ERROR                    = addClass(Symbol.CONTROL_ERROR);
     
    8281    public static final BuiltInClass ECHO_STREAM                      = addClass(Symbol.ECHO_STREAM);
    8382    public static final BuiltInClass END_OF_FILE                      = addClass(Symbol.END_OF_FILE);
    84     public static final BuiltInClass ERROR                            = addClass(Symbol.ERROR);
    8583    public static final BuiltInClass FILE_ERROR                       = addClass(Symbol.FILE_ERROR);
    8684    public static final BuiltInClass FILE_STREAM                      = addClass(Symbol.FILE_STREAM);
     
    9290    public static final BuiltInClass FLOATING_POINT_UNDERFLOW         = addClass(Symbol.FLOATING_POINT_UNDERFLOW);
    9391    public static final BuiltInClass FUNCTION                         = addClass(Symbol.FUNCTION);
    94 //     public static final BuiltInClass GENERIC_FUNCTION                 = addClass(Symbol.GENERIC_FUNCTION);
    9592    public static final BuiltInClass HASH_TABLE                       = addClass(Symbol.HASH_TABLE);
    9693    public static final BuiltInClass INTEGER                          = addClass(Symbol.INTEGER);
    9794    public static final BuiltInClass LIST                             = addClass(Symbol.LIST);
    9895    public static final BuiltInClass LOGICAL_PATHNAME                 = addClass(Symbol.LOGICAL_PATHNAME);
    99 //     public static final BuiltInClass METHOD                           = addClass(Symbol.METHOD);
    10096    public static final BuiltInClass METHOD_COMBINATION               = addClass(Symbol.METHOD_COMBINATION);
    10197    public static final BuiltInClass NULL                             = addClass(Symbol.NULL);
     
    115111    public static final BuiltInClass RESTART                          = addClass(Symbol.RESTART);
    116112    public static final BuiltInClass SEQUENCE                         = addClass(Symbol.SEQUENCE);
    117     public static final BuiltInClass SERIOUS_CONDITION                = addClass(Symbol.SERIOUS_CONDITION);
    118113    public static final BuiltInClass SIMPLE_CONDITION                 = addClass(Symbol.SIMPLE_CONDITION);
    119114    public static final BuiltInClass SIMPLE_ERROR                     = addClass(Symbol.SIMPLE_ERROR);
    120115    public static final BuiltInClass SIMPLE_TYPE_ERROR                = addClass(Symbol.SIMPLE_TYPE_ERROR);
    121116    public static final BuiltInClass SIMPLE_WARNING                   = addClass(Symbol.SIMPLE_WARNING);
    122 //     public static final BuiltInClass STANDARD_CLASS                   = addClass(Symbol.STANDARD_CLASS);
    123 //     public static final BuiltInClass STANDARD_GENERIC_FUNCTION        = addClass(Symbol.STANDARD_GENERIC_FUNCTION);
    124 //     public static final BuiltInClass STANDARD_METHOD                  = addClass(Symbol.STANDARD_METHOD);
    125 //     public static final BuiltInClass STANDARD_OBJECT                  = addClass(Symbol.STANDARD_OBJECT);
    126117    public static final BuiltInClass STORAGE_CONDITION                = addClass(Symbol.STORAGE_CONDITION);
    127118    public static final BuiltInClass STREAM                           = addClass(Symbol.STREAM);
     
    158149    static {
    159150        addClass(Symbol.CONDITION, CONDITION);
     151    }
     152
     153    public static final StandardClass SERIOUS_CONDITION =
     154        new StandardClass(Symbol.SERIOUS_CONDITION, list1(CONDITION));
     155    static {
     156        addClass(Symbol.SERIOUS_CONDITION, SERIOUS_CONDITION);
     157    }
     158
     159    public static final StandardClass ERROR =
     160        new StandardClass(Symbol.ERROR, list1(SERIOUS_CONDITION));
     161    static {
     162        addClass(Symbol.ERROR, ERROR);
    160163    }
    161164
     
    198201        CONCATENATED_STREAM.setDirectSuperclass(STREAM);
    199202        CONCATENATED_STREAM.setCPL(CONCATENATED_STREAM, STREAM, CLASS_T);
    200         CONDITION.setDirectSuperclass(STANDARD_OBJECT);
    201203        CONDITION.setCPL(CONDITION, STANDARD_OBJECT, CLASS_T);
    202204        CONS.setDirectSuperclass(LIST);
     
    213215        END_OF_FILE.setCPL(END_OF_FILE, STREAM_ERROR, ERROR, SERIOUS_CONDITION,
    214216                           CONDITION, CLASS_T);
    215         ERROR.setDirectSuperclass(SERIOUS_CONDITION);
    216         ERROR.setCPL(ERROR, SERIOUS_CONDITION, CONDITION, CLASS_T);
     217        ERROR.setCPL(ERROR, SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT, CLASS_T);
    217218        FIXNUM.setDirectSuperclass(INTEGER);
    218219        FIXNUM.setCPL(FIXNUM, INTEGER, RATIONAL, REAL, NUMBER, CLASS_T);
     
    295296        SEQUENCE.setCPL(SEQUENCE, CLASS_T);
    296297        SERIOUS_CONDITION.setDirectSuperclass(CONDITION);
    297         SERIOUS_CONDITION.setCPL(SERIOUS_CONDITION, CONDITION, CLASS_T);
     298        SERIOUS_CONDITION.setCPL(SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT,
     299                                 CLASS_T);
    298300        SIMPLE_CONDITION.setDirectSuperclass(CONDITION);
    299301        SIMPLE_CONDITION.setCPL(SIMPLE_CONDITION, CONDITION, CLASS_T);
     
    310312        STANDARD_CLASS.setDirectSuperclass(CLASS);
    311313        STANDARD_CLASS.setCPL(STANDARD_CLASS, CLASS, STANDARD_OBJECT, CLASS_T);
    312 //         STANDARD_GENERIC_FUNCTION.setDirectSuperclass(GENERIC_FUNCTION);
    313 //         STANDARD_GENERIC_FUNCTION.setCPL(STANDARD_GENERIC_FUNCTION,
    314 //                                          GENERIC_FUNCTION, FUNCTION, CLASS_T);
    315 //         STANDARD_METHOD.setDirectSuperclass(list2(METHOD, STANDARD_OBJECT));
    316 //         STANDARD_METHOD.setCPL(STANDARD_METHOD, METHOD, STANDARD_OBJECT,
    317 //                                CLASS_T);
    318 //         STANDARD_OBJECT.setDirectSuperclass(CLASS_T);
    319314        STANDARD_OBJECT.setCPL(STANDARD_OBJECT, CLASS_T);
    320315        STORAGE_CONDITION.setDirectSuperclass(SERIOUS_CONDITION);
Note: See TracChangeset for help on using the changeset viewer.