Changeset 14463

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:

• StandardClass.java (modified) (2 diffs)
• StructureClass.java (modified) (2 diffs)
• clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -500 +500 @@
   public static final StandardClass FORWARD_REFERENCED_CLASS =
     addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list(CLASS));
-
-  public static final StandardClass STRUCTURE_CLASS =
-    addStandardClass(Symbol.STRUCTURE_CLASS, list(CLASS));
 
   public static final StandardClass FUNCALLABLE_STANDARD_CLASS =
@@ -762 +759 @@
       list(new SlotDefinition(Symbol.STREAM,
                                list(PACKAGE_CL.intern("STREAM-ERROR-STREAM")))));
-    STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, SPECIALIZER, METAOBJECT,
-                           STANDARD_OBJECT, BuiltInClass.CLASS_T);
     STYLE_WARNING.setCPL(STYLE_WARNING, WARNING, CONDITION, STANDARD_OBJECT,
                          BuiltInClass.CLASS_T);

trunk/abcl/src/org/armedbear/lisp/StructureClass.java

@@ -57 +57 @@
     public LispObject classOf()
     {
-        return StandardClass.STRUCTURE_CLASS;
+      return LispClass.findClass(Symbol.STRUCTURE_CLASS);
     }
 
@@ -65 +65 @@
         if (type == Symbol.STRUCTURE_CLASS)
             return T;
-        if (type == StandardClass.STRUCTURE_CLASS)
+        if (type == LispClass.findClass(Symbol.STRUCTURE_CLASS))
             return T;
         return super.typep(type);

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -115 +115 @@
 (defconstant +the-funcallable-standard-class+
   (find-class 'funcallable-standard-class))
-(defconstant +the-structure-class+ (find-class 'structure-class))
 (defconstant +the-standard-object-class+ (find-class 'standard-object))
 (defconstant +the-funcallable-standard-object-class+
@@ -949 +948 @@
 (defconstant +the-standard-writer-method-class+
   (find-class 'standard-writer-method))
+
+(define-primordial-class structure-class (class)
+  ())
+(defconstant +the-structure-class+ (find-class 'structure-class))