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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Feb 14 03:44:26 2010
New Revision: 12468

Log:
Convert classPrecedenceList, directMethods and documentation
 to java properties.

Modified:
   branches/metaclass/abcl/src/org/armedbear/lisp/LispClass.java
   branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.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 03:44:26 2010
@@ -93,9 +93,9 @@
   private Layout classLayout;
   private LispObject directSuperclasses = NIL;
   private LispObject directSubclasses = NIL;
-  public LispObject classPrecedenceList = NIL; // FIXME! Should be private!
-  public LispObject directMethods = NIL; // FIXME! Should be private!
-  public LispObject documentation = NIL; // FIXME! Should be private!
+  private LispObject classPrecedenceList = NIL;
+  private LispObject directMethods = NIL;
+  private LispObject documentation = NIL;
   private boolean finalized;
 
   protected LispClass(Layout layout)
@@ -247,6 +247,26 @@
       }
   }
 
+  public LispObject getDirectMethods()
+  {
+    return directMethods;
+  }
+
+  public void setDirectMethods(LispObject methods)
+  {
+    directMethods = methods;
+  }
+
+  public LispObject getDocumentation()
+  {
+    return documentation;
+  }
+
+  public void setDocumentation(LispObject doc)
+  {
+    documentation = doc;
+  }
+
   @Override
   public LispObject typeOf()
   {

Modified: branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.java	(original)
+++ branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.java	Sun Feb 14 03:44:26 2010
@@ -5246,7 +5246,7 @@
       public LispObject execute(LispObject first, LispObject second)
 
       {
-          checkClass(first).classPrecedenceList = second;
+          checkClass(first).setCPL(second);
           return second;
       }
     };
@@ -5259,7 +5259,7 @@
       public LispObject execute(LispObject arg)
 
       {
-          return checkClass(arg).directMethods;
+          return checkClass(arg).getDirectMethods();
       }
     };
 
@@ -5271,7 +5271,7 @@
       public LispObject execute(LispObject first, LispObject second)
 
       {
-          checkClass(first).directMethods = second;
+          checkClass(first).setDirectMethods(second);
           return second;
       }
     };
@@ -5284,7 +5284,7 @@
       public LispObject execute(LispObject arg)
 
       {
-          return checkClass(arg).documentation;
+          return checkClass(arg).getDocumentation();
       }
     };
 
@@ -5296,7 +5296,7 @@
       public LispObject execute(LispObject first, LispObject second)
 
       {
-          checkClass(first).documentation = second;
+          checkClass(first).setDocumentation(second);
           return second;
       }
     };