Changeset 5077


Ignore:
Timestamp:
12/11/03 21:06:34 (17 years ago)
Author:
piso
Message:

WARNING, UNBOUND-SLOT, UNBOUND-VARIABLE, UNDEFINED-FUNCTION

File:
1 edited

Legend:

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

    r5076 r5077  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: BuiltInClass.java,v 1.18 2003-12-11 20:40:34 piso Exp $
     5 * $Id: BuiltInClass.java,v 1.19 2003-12-11 21:06:34 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    117117    public static final BuiltInClass SYNONYM_STREAM                   = addClass(Symbol.SYNONYM_STREAM);
    118118    public static final BuiltInClass TWO_WAY_STREAM                   = addClass(Symbol.TWO_WAY_STREAM);
    119     public static final BuiltInClass UNBOUND_SLOT                     = addClass(Symbol.UNBOUND_SLOT);
    120     public static final BuiltInClass UNBOUND_VARIABLE                 = addClass(Symbol.UNBOUND_VARIABLE);
    121     public static final BuiltInClass UNDEFINED_FUNCTION               = addClass(Symbol.UNDEFINED_FUNCTION);
    122119    public static final BuiltInClass VECTOR                           = addClass(Symbol.VECTOR);
    123     public static final BuiltInClass WARNING                          = addClass(Symbol.WARNING);
    124120
    125121    public static final StandardClass STANDARD_CLASS =
     
    147143    }
    148144
     145    public static final StandardClass WARNING =
     146        new StandardClass(Symbol.WARNING, list1(CONDITION));
     147    static {
     148        addClass(Symbol.WARNING, WARNING);
     149    }
     150
    149151    public static final StandardClass ERROR =
    150152        new StandardClass(Symbol.ERROR, list1(SERIOUS_CONDITION));
     
    163165    static {
    164166        addClass(Symbol.CELL_ERROR, CELL_ERROR);
     167    }
     168
     169    public static final StandardClass UNBOUND_SLOT =
     170        new StandardClass(Symbol.UNBOUND_SLOT, list1(CELL_ERROR));
     171    static {
     172        addClass(Symbol.UNBOUND_SLOT, UNBOUND_SLOT);
     173    }
     174
     175    public static final StandardClass UNBOUND_VARIABLE =
     176        new StandardClass(Symbol.UNBOUND_VARIABLE, list1(CELL_ERROR));
     177    static {
     178        addClass(Symbol.UNBOUND_VARIABLE, UNBOUND_VARIABLE);
     179    }
     180
     181    public static final StandardClass UNDEFINED_FUNCTION =
     182        new StandardClass(Symbol.UNDEFINED_FUNCTION, list1(CELL_ERROR));
     183    static {
     184        addClass(Symbol.UNDEFINED_FUNCTION, UNDEFINED_FUNCTION);
    165185    }
    166186
     
    383403        TYPE_ERROR.setCPL(TYPE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
    384404                          STANDARD_OBJECT, CLASS_T);
    385         UNBOUND_SLOT.setDirectSuperclass(CELL_ERROR);
    386405        UNBOUND_SLOT.setCPL(UNBOUND_SLOT, CELL_ERROR, ERROR, SERIOUS_CONDITION,
    387                             CONDITION, CLASS_T);
    388         UNBOUND_VARIABLE.setDirectSuperclass(CELL_ERROR);
     406                            CONDITION, STANDARD_OBJECT, CLASS_T);
    389407        UNBOUND_VARIABLE.setCPL(UNBOUND_VARIABLE, CELL_ERROR, ERROR,
    390                                 SERIOUS_CONDITION, CONDITION, CLASS_T);
    391         UNDEFINED_FUNCTION.setDirectSuperclass(CELL_ERROR);
     408                                SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT,
     409                                CLASS_T);
    392410        UNDEFINED_FUNCTION.setCPL(UNDEFINED_FUNCTION, CELL_ERROR, ERROR,
    393                                   SERIOUS_CONDITION, CONDITION, CLASS_T);
     411                                  SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT,
     412                                  CLASS_T);
    394413        VECTOR.setDirectSuperclasses(list2(ARRAY, SEQUENCE));
    395414        VECTOR.setCPL(VECTOR, ARRAY, SEQUENCE, CLASS_T);
    396         WARNING.setDirectSuperclass(CONDITION);
    397         WARNING.setCPL(WARNING, CONDITION, CLASS_T);
     415        WARNING.setCPL(WARNING, CONDITION, STANDARD_OBJECT, CLASS_T);
    398416    }
    399417}
Note: See TracChangeset for help on using the changeset viewer.