Changeset 14463
- Timestamp:
- 04/24/13 12:50:30 (10 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/StandardClass.java
r14083 r14463 500 500 public static final StandardClass FORWARD_REFERENCED_CLASS = 501 501 addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list(CLASS)); 502 503 public static final StandardClass STRUCTURE_CLASS =504 addStandardClass(Symbol.STRUCTURE_CLASS, list(CLASS));505 502 506 503 public static final StandardClass FUNCALLABLE_STANDARD_CLASS = … … 762 759 list(new SlotDefinition(Symbol.STREAM, 763 760 list(PACKAGE_CL.intern("STREAM-ERROR-STREAM"))))); 764 STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, SPECIALIZER, METAOBJECT,765 STANDARD_OBJECT, BuiltInClass.CLASS_T);766 761 STYLE_WARNING.setCPL(STYLE_WARNING, WARNING, CONDITION, STANDARD_OBJECT, 767 762 BuiltInClass.CLASS_T); -
trunk/abcl/src/org/armedbear/lisp/StructureClass.java
r13998 r14463 57 57 public LispObject classOf() 58 58 { 59 return StandardClass.STRUCTURE_CLASS;59 return LispClass.findClass(Symbol.STRUCTURE_CLASS); 60 60 } 61 61 … … 65 65 if (type == Symbol.STRUCTURE_CLASS) 66 66 return T; 67 if (type == StandardClass.STRUCTURE_CLASS)67 if (type == LispClass.findClass(Symbol.STRUCTURE_CLASS)) 68 68 return T; 69 69 return super.typep(type); -
trunk/abcl/src/org/armedbear/lisp/clos.lisp
r14454 r14463 115 115 (defconstant +the-funcallable-standard-class+ 116 116 (find-class 'funcallable-standard-class)) 117 (defconstant +the-structure-class+ (find-class 'structure-class))118 117 (defconstant +the-standard-object-class+ (find-class 'standard-object)) 119 118 (defconstant +the-funcallable-standard-object-class+ … … 949 948 (defconstant +the-standard-writer-method-class+ 950 949 (find-class 'standard-writer-method)) 950 951 (define-primordial-class structure-class (class) 952 ()) 953 (defconstant +the-structure-class+ (find-class 'structure-class)) 951 954 952 955
Note: See TracChangeset
for help on using the changeset viewer.