Changeset 12479

Timestamp:

02/14/10 19:54:17 (13 years ago)

Author:

ehuelsmann

Message:

Slot storage for DIRECT-SLOTS and SLOTS of STANDARD-CLASS.

Location:

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

Files:

• SlotClass.java (modified) (1 diff)
• StandardClass.java (modified) (5 diffs)

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

@@ -91 +91 @@
     }
 
-    public final LispObject getSlotDefinitions()
+    public LispObject getSlotDefinitions()
     {
         return slotDefinitions;

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

@@ -51 +51 @@
   private static Symbol symDocumentation
     = PACKAGE_MOP.intern("DOCUMENTATION");
+  private static Symbol symDirectSlots
+    = PACKAGE_MOP.intern("DIRECT-SLOTS");
+  private static Symbol symSlots
+    = PACKAGE_MOP.intern("SLOTS");
 
   static Layout layoutStandardClass =
@@ -61 +65 @@
                       symDirectMethods,
                       symDocumentation,
-                      PACKAGE_MOP.intern("DIRECT-SLOTS"),
-                      PACKAGE_MOP.intern("SLOTS"),
+                      symDirectSlots,
+                      symSlots,
                       PACKAGE_MOP.intern("DIRECT-DEFAULT-INITARGS"),
                       PACKAGE_MOP.intern("DEFAULT-INITARGS")),
@@ -82 +86 @@
       setDirectMethods(NIL);
       setDocumentation(NIL);
+      setDirectSlotDefinitions(NIL);
+      setSlotDefinitions(NIL);
   }
 
@@ -92 +98 @@
       setDirectMethods(NIL);
       setDocumentation(NIL);
+      setDirectSlotDefinitions(NIL);
+      setSlotDefinitions(NIL);
   }
 
@@ -187 +195 @@
   {
     setInstanceSlotValue(symDocumentation, doc);
+  }
+
+  @Override
+  public LispObject getDirectSlotDefinitions()
+  {
+    return getInstanceSlotValue(symDirectSlots);
+  }
+
+  @Override
+  public void setDirectSlotDefinitions(LispObject directSlotDefinitions)
+  {
+    setInstanceSlotValue(symDirectSlots, directSlotDefinitions);
+  }
+
+  @Override
+  public LispObject getSlotDefinitions()
+  {
+    return getInstanceSlotValue(symSlots);
+  }
+
+  @Override
+  public void setSlotDefinitions(LispObject slotDefinitions)
+  {
+     setInstanceSlotValue(symSlots, slotDefinitions);
   }