Changeset 5143


Ignore:
Timestamp:
12/15/03 14:10:56 (18 years ago)
Author:
piso
Message:

SIMPLE-CONDITION, SIMPLE-WARNING

File:
1 edited

Legend:

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

    r5086 r5143  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: BuiltInClass.java,v 1.20 2003-12-12 13:40:55 piso Exp $
     5 * $Id: BuiltInClass.java,v 1.21 2003-12-15 14:10:56 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    103103    public static final BuiltInClass RESTART                          = addClass(Symbol.RESTART);
    104104    public static final BuiltInClass SEQUENCE                         = addClass(Symbol.SEQUENCE);
    105     public static final BuiltInClass SIMPLE_CONDITION                 = addClass(Symbol.SIMPLE_CONDITION);
    106105    public static final BuiltInClass SIMPLE_ERROR                     = addClass(Symbol.SIMPLE_ERROR);
    107106    public static final BuiltInClass SIMPLE_TYPE_ERROR                = addClass(Symbol.SIMPLE_TYPE_ERROR);
    108     public static final BuiltInClass SIMPLE_WARNING                   = addClass(Symbol.SIMPLE_WARNING);
    109107    public static final BuiltInClass STORAGE_CONDITION                = addClass(Symbol.STORAGE_CONDITION);
    110108    public static final BuiltInClass STREAM                           = addClass(Symbol.STREAM);
     
    142140    }
    143141
     142    public static final StandardClass SIMPLE_CONDITION =
     143        new StandardClass(Symbol.SIMPLE_CONDITION, list1(CONDITION));
     144    static {
     145        addClass(Symbol.SIMPLE_CONDITION, SIMPLE_CONDITION);
     146    }
     147
    144148    public static final StandardClass SERIOUS_CONDITION =
    145149        new StandardClass(Symbol.SERIOUS_CONDITION, list1(CONDITION));
     
    152156    static {
    153157        addClass(Symbol.WARNING, WARNING);
     158    }
     159
     160    public static final StandardClass SIMPLE_WARNING =
     161        new StandardClass(Symbol.SIMPLE_WARNING, list2(SIMPLE_CONDITION, WARNING));
     162    static {
     163        addClass(Symbol.SIMPLE_WARNING, SIMPLE_WARNING);
    154164    }
    155165
     
    367377        SERIOUS_CONDITION.setCPL(SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT,
    368378                                 CLASS_T);
    369         SIMPLE_CONDITION.setDirectSuperclass(CONDITION);
    370         SIMPLE_CONDITION.setCPL(SIMPLE_CONDITION, CONDITION, CLASS_T);
     379        SIMPLE_CONDITION.setCPL(SIMPLE_CONDITION, CONDITION, STANDARD_OBJECT,
     380                                CLASS_T);
    371381        SIMPLE_ERROR.setDirectSuperclass(ERROR);
    372382        SIMPLE_ERROR.setCPL(SIMPLE_ERROR, SIMPLE_CONDITION, ERROR,
     
    376386                                 TYPE_ERROR, ERROR, SERIOUS_CONDITION,
    377387                                 CONDITION, CLASS_T);
    378         SIMPLE_WARNING.setDirectSuperclasses(list2(SIMPLE_CONDITION, WARNING));
    379388        SIMPLE_WARNING.setCPL(SIMPLE_WARNING, SIMPLE_CONDITION, WARNING,
    380                               CONDITION, CLASS_T);
     389                              CONDITION, STANDARD_OBJECT, CLASS_T);
    381390        STANDARD_CLASS.setDirectSuperclass(CLASS);
    382391        STANDARD_CLASS.setCPL(STANDARD_CLASS, CLASS, STANDARD_OBJECT, CLASS_T);
Note: See TracChangeset for help on using the changeset viewer.