[armedbear-cvs] r12476 - branches/metaclass/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Feb 14 13:46:09 2010
New Revision: 12476

Log:
Make DOCUMENTATION and DIRECT-METHODS STANDARD-CLASS slots.

Modified:
   branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java
   branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java

Modified: branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java
==============================================================================
--- branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java	(original)
+++ branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java	Sun Feb 14 13:46:09 2010
@@ -137,8 +137,8 @@
                                   getDirectSuperclasses()));
     result = result.push(new Cons("DIRECT-SUBCLASSES", getDirectSubclasses()));
     result = result.push(new Cons("CLASS-PRECEDENCE-LIST", getCPL()));
-    result = result.push(new Cons("DIRECT-METHODS", directMethods));
-    result = result.push(new Cons("DOCUMENTATION", documentation));
+    result = result.push(new Cons("DIRECT-METHODS", getDirectMethods()));
+    result = result.push(new Cons("DOCUMENTATION", getDocumentation()));
     return result.nreverse();
   }
 

Modified: branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java
==============================================================================
--- branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java	(original)
+++ branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java	Sun Feb 14 13:46:09 2010
@@ -46,6 +46,10 @@
     = PACKAGE_MOP.intern("DIRECT-SUBCLASSES");
   private static Symbol symClassPrecedenceList
     = PACKAGE_MOP.intern("CLASS-PRECEDENCE-LIST");
+  private static Symbol symDirectMethods
+    = PACKAGE_MOP.intern("DIRECT-METHODS");
+  private static Symbol symDocumentation
+    = PACKAGE_MOP.intern("DOCUMENTATION");
 
   static Layout layoutStandardClass =
       new Layout(null,
@@ -54,8 +58,8 @@
                       symDirectSuperclasses,
                       symDirectSubclasses,
                       symClassPrecedenceList,
-                      PACKAGE_MOP.intern("DIRECT-METHODS"),
-                      PACKAGE_MOP.intern("DOCUMENTATION"),
+                      symDirectMethods,
+                      symDocumentation,
                       PACKAGE_MOP.intern("DIRECT-SLOTS"),
                       PACKAGE_MOP.intern("SLOTS"),
                       PACKAGE_MOP.intern("DIRECT-DEFAULT-INITARGS"),
@@ -75,6 +79,8 @@
       setDirectSuperclasses(NIL);
       setDirectSubclasses(NIL);
       setCPL(NIL);
+      setDirectMethods(NIL);
+      setDocumentation(NIL);
   }
 
   public StandardClass(Symbol symbol, LispObject directSuperclasses)
@@ -83,6 +89,8 @@
             symbol, directSuperclasses);
       setDirectSubclasses(NIL);
       setCPL(NIL);
+      setDirectMethods(NIL);
+      setDocumentation(NIL);
   }
 
   @Override
@@ -156,6 +164,30 @@
       }
   }
 
+  @Override
+  public LispObject getDirectMethods()
+  {
+    return getInstanceSlotValue(symDirectMethods);
+  }
+
+  @Override
+  public void setDirectMethods(LispObject methods)
+  {
+    setInstanceSlotValue(symDirectMethods, methods);
+  }
+
+  @Override
+  public LispObject getDocumentation()
+  {
+    return getInstanceSlotValue(symDocumentation);
+  }
+
+  @Override
+  public void setDocumentation(LispObject doc)
+  {
+    setInstanceSlotValue(symDocumentation, doc);
+  }
+
 
 
   @Override