Changeset 12464

Timestamp:

02/13/10 22:45:56 (13 years ago)

Author:

ehuelsmann

Message:

Convert LAYOUT and DIRECT-SUPERCLASSES of STANDARD-CLASS to slots.

Location:

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

Files:

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

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

@@ -123 +123 @@
     sxhash = hashCode() & 0x7fffffff;
     setName(symbol);
-    this.directSuperclasses = directSuperclasses;
+    setDirectSuperclasses(directSuperclasses);
   }
 
@@ -131 +131 @@
     LispObject result = NIL;
     result = result.push(new Cons("NAME", name != null ? name : NIL));
-    result = result.push(new Cons("LAYOUT", classLayout != null ? classLayout : NIL));
-    result = result.push(new Cons("DIRECT-SUPERCLASSES", directSuperclasses));
+    result = result.push(new Cons("LAYOUT",
+                                  getClassLayout() != null
+                                  ? getClassLayout() : NIL));
+    result = result.push(new Cons("DIRECT-SUPERCLASSES",
+                                  getDirectSuperclasses()));
     result = result.push(new Cons("DIRECT-SUBCLASSES", directSubclasses));
     result = result.push(new Cons("CLASS-PRECEDENCE-LIST", classPrecedenceList));
@@ -172 +175 @@
   }
 
-  public final Layout getClassLayout()
+  public Layout getClassLayout()
   {
     return classLayout;
   }
 
-  public final void setClassLayout(Layout layout)
+  public void setClassLayout(Layout layout)
   {
     classLayout = layout;
@@ -189 +192 @@
   }
 
-  public final LispObject getDirectSuperclasses()
+  public LispObject getDirectSuperclasses()
   {
     return directSuperclasses;
   }
 
-  public final void setDirectSuperclasses(LispObject directSuperclasses)
+  public void setDirectSuperclasses(LispObject directSuperclasses)
   {
     this.directSuperclasses = directSuperclasses;
@@ -212 +215 @@
   public final void setDirectSuperclass(LispObject superclass)
   {
-    directSuperclasses = new Cons(superclass);
+    setDirectSuperclasses(new Cons(superclass));
   }
 

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

@@ -39 +39 @@
 {
 
-  private static Symbol name = PACKAGE_MOP.intern("NAME");
+  private static Symbol symName = PACKAGE_MOP.intern("NAME");
+  private static Symbol symLayout = PACKAGE_MOP.intern("LAYOUT");
+  private static Symbol symDirectSuperclasses
+    = PACKAGE_MOP.intern("DIRECT-SUPERCLASSES");
 
   static Layout layoutStandardClass =
       new Layout(null,
-                 list(name,
-                      PACKAGE_MOP.intern("LAYOUT"),
-                      PACKAGE_MOP.intern("DIRECT-SUPERCLASSES"),
+                 list(symName,
+                      symLayout,
+                      symDirectSuperclasses,
                       PACKAGE_MOP.intern("DIRECT-SUBCLASSES"),
                       PACKAGE_MOP.intern("CLASS-PRECEDENCE-LIST"),
@@ -77 +80 @@
   public LispObject getName()
   {
-    return getInstanceSlotValue(name);
+    return getInstanceSlotValue(symName);
   }
 
@@ -83 +86 @@
   public void setName(LispObject newName)
   {
-    setInstanceSlotValue(name, newName);
-  }
+    setInstanceSlotValue(symName, newName);
+  }
+
+  @Override
+  public Layout getClassLayout()
+  {
+    LispObject layout = getInstanceSlotValue(symLayout);
+    return (layout == UNBOUND_VALUE) ? null : (Layout)layout;
+  }
+
+  @Override
+  public void setClassLayout(Layout newLayout)
+  {
+    setInstanceSlotValue(symLayout, newLayout);
+  }
+
+  @Override
+  public LispObject getDirectSuperclasses()
+  {
+    return getInstanceSlotValue(symDirectSuperclasses);
+  }
+
+  @Override
+  public void setDirectSuperclasses(LispObject directSuperclasses)
+  {
+    setInstanceSlotValue(symDirectSuperclasses, directSuperclasses);
+  }
+
+
 
   @Override