Changeset 5073


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

ARITHMETIC_ERROR, CELL_ERROR, CONTROL_ERROR, PACKAGE_ERROR, PROGRAM_ERROR

File:
1 edited

Legend:

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

    r5072 r5073  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: BuiltInClass.java,v 1.16 2003-12-11 20:01:12 piso Exp $
     5 * $Id: BuiltInClass.java,v 1.17 2003-12-11 20:18:18 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    6565    public static final BuiltInClass CLASS_T                          = addClass(T);
    6666
    67     public static final BuiltInClass ARITHMETIC_ERROR                 = addClass(Symbol.ARITHMETIC_ERROR);
    6867    public static final BuiltInClass ARRAY                            = addClass(Symbol.ARRAY);
    6968    public static final BuiltInClass BIGNUM                           = addClass(Symbol.BIGNUM);
     
    7170    public static final BuiltInClass BROADCAST_STREAM                 = addClass(Symbol.BROADCAST_STREAM);
    7271    public static final BuiltInClass BUILT_IN_CLASS                   = addClass(Symbol.BUILT_IN_CLASS);
    73     public static final BuiltInClass CELL_ERROR                       = addClass(Symbol.CELL_ERROR);
    7472    public static final BuiltInClass CHARACTER                        = addClass(Symbol.CHARACTER);
    7573    public static final BuiltInClass CLASS                            = addClass(Symbol.CLASS);
     
    7775    public static final BuiltInClass CONCATENATED_STREAM              = addClass(Symbol.CONCATENATED_STREAM);
    7876    public static final BuiltInClass CONS                             = addClass(Symbol.CONS);
    79     public static final BuiltInClass CONTROL_ERROR                    = addClass(Symbol.CONTROL_ERROR);
    8077    public static final BuiltInClass DIVISION_BY_ZERO                 = addClass(Symbol.DIVISION_BY_ZERO);
    8178    public static final BuiltInClass ECHO_STREAM                      = addClass(Symbol.ECHO_STREAM);
     
    9895    public static final BuiltInClass NUMBER                           = addClass(Symbol.NUMBER);
    9996    public static final BuiltInClass PACKAGE                          = addClass(Symbol.PACKAGE);
    100     public static final BuiltInClass PACKAGE_ERROR                    = addClass(Symbol.PACKAGE_ERROR);
    10197    public static final BuiltInClass PARSE_ERROR                      = addClass(Symbol.PARSE_ERROR);
    10298    public static final BuiltInClass PATHNAME                         = addClass(Symbol.PATHNAME);
    10399    public static final BuiltInClass PRINT_NOT_READABLE               = addClass(Symbol.PRINT_NOT_READABLE);
    104     public static final BuiltInClass PROGRAM_ERROR                    = addClass(Symbol.PROGRAM_ERROR);
    105100    public static final BuiltInClass RANDOM_STATE                     = addClass(Symbol.RANDOM_STATE);
    106101    public static final BuiltInClass RATIO                            = addClass(Symbol.RATIO);
     
    126121    public static final BuiltInClass SYNONYM_STREAM                   = addClass(Symbol.SYNONYM_STREAM);
    127122    public static final BuiltInClass TWO_WAY_STREAM                   = addClass(Symbol.TWO_WAY_STREAM);
    128     public static final BuiltInClass TYPE_ERROR                       = addClass(Symbol.TYPE_ERROR);
    129123    public static final BuiltInClass UNBOUND_SLOT                     = addClass(Symbol.UNBOUND_SLOT);
    130124    public static final BuiltInClass UNBOUND_VARIABLE                 = addClass(Symbol.UNBOUND_VARIABLE);
     
    163157    }
    164158
     159    public static final StandardClass ARITHMETIC_ERROR =
     160        new StandardClass(Symbol.ARITHMETIC_ERROR, list1(ERROR));
     161    static {
     162        addClass(Symbol.ARITHMETIC_ERROR, ARITHMETIC_ERROR);
     163    }
     164
     165    public static final StandardClass CELL_ERROR =
     166        new StandardClass(Symbol.CELL_ERROR, list1(ERROR));
     167    static {
     168        addClass(Symbol.CELL_ERROR, CELL_ERROR);
     169    }
     170
     171    public static final StandardClass CONTROL_ERROR =
     172        new StandardClass(Symbol.CONTROL_ERROR, list1(ERROR));
     173    static {
     174        addClass(Symbol.CONTROL_ERROR, CONTROL_ERROR);
     175    }
     176
     177    public static final StandardClass PACKAGE_ERROR =
     178        new StandardClass(Symbol.PACKAGE_ERROR, list1(ERROR));
     179    static {
     180        addClass(Symbol.PACKAGE_ERROR, PACKAGE_ERROR);
     181    }
     182
     183    public static final StandardClass PROGRAM_ERROR =
     184        new StandardClass(Symbol.PROGRAM_ERROR, list1(ERROR));
     185    static {
     186        addClass(Symbol.PROGRAM_ERROR, PROGRAM_ERROR);
     187    }
     188
     189    public static final StandardClass TYPE_ERROR =
     190        new StandardClass(Symbol.TYPE_ERROR, list1(ERROR));
     191    static {
     192        addClass(Symbol.TYPE_ERROR, TYPE_ERROR);
     193    }
     194
    165195    public static final StandardClass GENERIC_FUNCTION =
    166196        new StandardClass(Symbol.GENERIC_FUNCTION, list1(FUNCTION));
     
    176206
    177207    static {
    178         ARITHMETIC_ERROR.setDirectSuperclass(ERROR);
    179208        ARITHMETIC_ERROR.setCPL(ARITHMETIC_ERROR, ERROR, SERIOUS_CONDITION,
    180                                 CONDITION, CLASS_T);
     209                                CONDITION, STANDARD_OBJECT, CLASS_T);
    181210        ARRAY.setDirectSuperclass(CLASS_T);
    182211        ARRAY.setCPL(ARRAY, CLASS_T);
     
    189218        BUILT_IN_CLASS.setDirectSuperclass(CLASS);
    190219        BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, STANDARD_OBJECT, CLASS_T);
    191         CELL_ERROR.setDirectSuperclass(ERROR);
    192220        CELL_ERROR.setCPL(CELL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    193                           CLASS_T);
     221                          STANDARD_OBJECT, CLASS_T);
    194222        CHARACTER.setDirectSuperclass(CLASS_T);
    195223        CHARACTER.setCPL(CHARACTER, CLASS_T);
     
    204232        CONS.setDirectSuperclass(LIST);
    205233        CONS.setCPL(CONS, LIST, SEQUENCE, CLASS_T);
    206         CONTROL_ERROR.setDirectSuperclass(ERROR);
    207234        CONTROL_ERROR.setCPL(CONTROL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    208                              CLASS_T);
     235                             STANDARD_OBJECT, CLASS_T);
    209236        DIVISION_BY_ZERO.setDirectSuperclass(ARITHMETIC_ERROR);
    210237        DIVISION_BY_ZERO.setCPL(DIVISION_BY_ZERO, ARITHMETIC_ERROR, ERROR,
     
    215242        END_OF_FILE.setCPL(END_OF_FILE, STREAM_ERROR, ERROR, SERIOUS_CONDITION,
    216243                           CONDITION, CLASS_T);
    217         ERROR.setCPL(ERROR, SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT, CLASS_T);
     244        ERROR.setCPL(ERROR, SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT,
     245                     CLASS_T);
    218246        FIXNUM.setDirectSuperclass(INTEGER);
    219247        FIXNUM.setCPL(FIXNUM, INTEGER, RATIONAL, REAL, NUMBER, CLASS_T);
     
    264292        PACKAGE.setDirectSuperclass(CLASS_T);
    265293        PACKAGE.setCPL(PACKAGE, CLASS_T);
    266         PACKAGE_ERROR.setDirectSuperclass(ERROR);
    267294        PACKAGE_ERROR.setCPL(PACKAGE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    268                              CLASS_T);
     295                             STANDARD_OBJECT, CLASS_T);
    269296        PARSE_ERROR.setDirectSuperclass(ERROR);
    270297        PARSE_ERROR.setCPL(PARSE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
     
    275302        PRINT_NOT_READABLE.setCPL(PRINT_NOT_READABLE, ERROR, SERIOUS_CONDITION,
    276303                                  CONDITION, CLASS_T);
    277         PROGRAM_ERROR.setDirectSuperclass(ERROR);
    278304        PROGRAM_ERROR.setCPL(PROGRAM_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    279                              CLASS_T);
     305                             STANDARD_OBJECT, CLASS_T);
    280306        RANDOM_STATE.setDirectSuperclass(CLASS_T);
    281307        RANDOM_STATE.setCPL(RANDOM_STATE, CLASS_T);
     
    338364        TWO_WAY_STREAM.setDirectSuperclass(STREAM);
    339365        TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, STREAM, CLASS_T);
    340         TYPE_ERROR.setDirectSuperclass(ERROR);
    341366        TYPE_ERROR.setCPL(TYPE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    342                           CLASS_T);
     367                          STANDARD_OBJECT, CLASS_T);
    343368        UNBOUND_SLOT.setDirectSuperclass(CELL_ERROR);
    344369        UNBOUND_SLOT.setCPL(UNBOUND_SLOT, CELL_ERROR, ERROR, SERIOUS_CONDITION,
Note: See TracChangeset for help on using the changeset viewer.