Changeset 14463


Ignore:
Timestamp:
04/24/13 12:50:30 (9 years ago)
Author:
rschlatte
Message:

move structure-class metaclass definition into Lisp

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

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

    r14083 r14463  
    500500  public static final StandardClass FORWARD_REFERENCED_CLASS =
    501501    addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list(CLASS));
    502 
    503   public static final StandardClass STRUCTURE_CLASS =
    504     addStandardClass(Symbol.STRUCTURE_CLASS, list(CLASS));
    505502
    506503  public static final StandardClass FUNCALLABLE_STANDARD_CLASS =
     
    762759      list(new SlotDefinition(Symbol.STREAM,
    763760                               list(PACKAGE_CL.intern("STREAM-ERROR-STREAM")))));
    764     STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, SPECIALIZER, METAOBJECT,
    765                            STANDARD_OBJECT, BuiltInClass.CLASS_T);
    766761    STYLE_WARNING.setCPL(STYLE_WARNING, WARNING, CONDITION, STANDARD_OBJECT,
    767762                         BuiltInClass.CLASS_T);
  • trunk/abcl/src/org/armedbear/lisp/StructureClass.java

    r13998 r14463  
    5757    public LispObject classOf()
    5858    {
    59         return StandardClass.STRUCTURE_CLASS;
     59      return LispClass.findClass(Symbol.STRUCTURE_CLASS);
    6060    }
    6161
     
    6565        if (type == Symbol.STRUCTURE_CLASS)
    6666            return T;
    67         if (type == StandardClass.STRUCTURE_CLASS)
     67        if (type == LispClass.findClass(Symbol.STRUCTURE_CLASS))
    6868            return T;
    6969        return super.typep(type);
  • trunk/abcl/src/org/armedbear/lisp/clos.lisp

    r14454 r14463  
    115115(defconstant +the-funcallable-standard-class+
    116116  (find-class 'funcallable-standard-class))
    117 (defconstant +the-structure-class+ (find-class 'structure-class))
    118117(defconstant +the-standard-object-class+ (find-class 'standard-object))
    119118(defconstant +the-funcallable-standard-object-class+
     
    949948(defconstant +the-standard-writer-method-class+
    950949  (find-class 'standard-writer-method))
     950
     951(define-primordial-class structure-class (class)
     952  ())
     953(defconstant +the-structure-class+ (find-class 'structure-class))
    951954
    952955
Note: See TracChangeset for help on using the changeset viewer.