Changeset 12465

Timestamp:

02/13/10 22:59:05 (13 years ago)

Author:

ehuelsmann

Message:

Convert DIRECT-SUBCLASSES of STANDARD-CLASS to a slot.

Location:

branches/metaclass/abcl/src/org/armedbear/lisp

Files:

• LispClass.java (modified) (2 diffs)
• StandardClass.java (modified) (5 diffs)

branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java

@@ -136 +136 @@
     result = result.push(new Cons("DIRECT-SUPERCLASSES",
                                   getDirectSuperclasses()));
-    result = result.push(new Cons("DIRECT-SUBCLASSES", directSubclasses));
+    result = result.push(new Cons("DIRECT-SUBCLASSES", getDirectSubclasses()));
     result = result.push(new Cons("CLASS-PRECEDENCE-LIST", classPrecedenceList));
     result = result.push(new Cons("DIRECT-METHODS", directMethods));
@@ -218 +218 @@
   }
 
-  public final LispObject getDirectSubclasses()
+  public LispObject getDirectSubclasses()
   {
     return directSubclasses;
   }
 
-  public final void setDirectSubclasses(LispObject directSubclasses)
+  public void setDirectSubclasses(LispObject directSubclasses)
   {
     this.directSubclasses = directSubclasses;

branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -43 +43 @@
   private static Symbol symDirectSuperclasses
     = PACKAGE_MOP.intern("DIRECT-SUPERCLASSES");
+  private static Symbol symDirectSubclasses
+    = PACKAGE_MOP.intern("DIRECT-SUBCLASSES");
+
 
   static Layout layoutStandardClass =
@@ -49 +52 @@
                       symLayout,
                       symDirectSuperclasses,
-                      PACKAGE_MOP.intern("DIRECT-SUBCLASSES"),
+                      symDirectSubclasses,
                       PACKAGE_MOP.intern("CLASS-PRECEDENCE-LIST"),
                       PACKAGE_MOP.intern("DIRECT-METHODS"),
@@ -69 +72 @@
   {
       super(layoutStandardClass);
+      setDirectSuperclasses(NIL);
+      setDirectSubclasses(NIL);
   }
 
@@ -75 +80 @@
       super(layoutStandardClass,
             symbol, directSuperclasses);
+      setDirectSubclasses(NIL);
   }
 
@@ -112 +118 @@
   {
     setInstanceSlotValue(symDirectSuperclasses, directSuperclasses);
+  }
+
+  @Override
+  public LispObject getDirectSubclasses()
+  {
+    return getInstanceSlotValue(symDirectSubclasses);
+  }
+
+  @Override
+  public void setDirectSubclasses(LispObject directSubclasses)
+  {
+    setInstanceSlotValue(symDirectSubclasses, directSubclasses);
   }