Changeset 13713

Timestamp:

01/04/12 13:44:27 (11 years ago)

Author:

Mark Evenson

Message:

[PATCH 1/2] add class METAOBJECT, splice it into mop class

From 0d36155221ec6ac028cde6ba3741253e618773e9 Mon Sep 17 00:00:00 2001

hierarchy.

... see AMOP table 5.1
---

src/org/armedbear/lisp/GenericFunction.java | 2 +-
src/org/armedbear/lisp/Metaobject.java | 52 +++++++++++++++++++++++++++
src/org/armedbear/lisp/StandardClass.java | 40 ++++++++++++---------
src/org/armedbear/lisp/Symbol.java | 2 +
4 files changed, 78 insertions(+), 18 deletions(-)
create mode 100644 src/org/armedbear/lisp/Metaobject.java

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• GenericFunction.java (modified) (1 diff)
• Metaobject.java (added)
• StandardClass.java (modified) (12 diffs)
• Symbol.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/GenericFunction.java

@@ -36 +36 @@
 import static org.armedbear.lisp.Lisp.*;
 
-public abstract class GenericFunction extends StandardObject
+public abstract class GenericFunction extends Metaobject
 {
     protected GenericFunction(LispClass cls, int length)

trunk/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -386 +386 @@
   public static final StandardClass STANDARD_OBJECT =
     addStandardClass(Symbol.STANDARD_OBJECT, list(BuiltInClass.CLASS_T));
+  public static final StandardClass METAOBJECT =
+    addStandardClass(Symbol.METAOBJECT, list(STANDARD_OBJECT));
 
     public static final StandardClass SLOT_DEFINITION =
-        addStandardClass(Symbol.SLOT_DEFINITION, list(STANDARD_OBJECT));
+        addStandardClass(Symbol.SLOT_DEFINITION, list(METAOBJECT));
     public static final StandardClass STANDARD_SLOT_DEFINITION =
         addClass(Symbol.STANDARD_SLOT_DEFINITION, new SlotDefinitionClass(Symbol.STANDARD_SLOT_DEFINITION, list(SLOT_DEFINITION)));
@@ -417 +419 @@
   // BuiltInClass.FUNCTION is also null here (see previous comment).
   public static final StandardClass GENERIC_FUNCTION =
-    addStandardClass(Symbol.GENERIC_FUNCTION, list(BuiltInClass.FUNCTION,
-                                                    STANDARD_OBJECT));
+    addStandardClass(Symbol.GENERIC_FUNCTION, list(METAOBJECT,
+                                                   BuiltInClass.FUNCTION));
 
   public static final StandardClass CLASS =
@@ -537 +539 @@
 
   public static final StandardClass METHOD =
-    addStandardClass(Symbol.METHOD, list(STANDARD_OBJECT));
+    addStandardClass(Symbol.METHOD, list(METAOBJECT));
 
   public static final StandardClass STANDARD_METHOD =
@@ -567 +569 @@
     STANDARD_CLASS.setDirectSuperclass(CLASS);
     STANDARD_OBJECT.setDirectSuperclass(BuiltInClass.CLASS_T);
-    GENERIC_FUNCTION.setDirectSuperclasses(list(BuiltInClass.FUNCTION,
-                                                 STANDARD_OBJECT));
+    GENERIC_FUNCTION.setDirectSuperclasses(list(METAOBJECT,
+                                                BuiltInClass.FUNCTION));
 
     ARITHMETIC_ERROR.setCPL(ARITHMETIC_ERROR, ERROR, SERIOUS_CONDITION,
@@ -632 +634 @@
     FORWARD_REFERENCED_CLASS.setCPL(FORWARD_REFERENCED_CLASS, CLASS,
                                     BuiltInClass.CLASS_T);
-    GENERIC_FUNCTION.setCPL(GENERIC_FUNCTION, STANDARD_OBJECT,
+    GENERIC_FUNCTION.setCPL(GENERIC_FUNCTION, METAOBJECT, STANDARD_OBJECT,
                             BuiltInClass.FUNCTION,
                             BuiltInClass.CLASS_T);
@@ -639 +641 @@
     JAVA_EXCEPTION.setDirectSlotDefinitions(
       list(new SlotDefinition(Symbol.CAUSE, list(Symbol.JAVA_EXCEPTION_CAUSE))));
-    METHOD.setCPL(METHOD, STANDARD_OBJECT, BuiltInClass.CLASS_T);
+    METAOBJECT.setCPL(METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
+    METHOD.setCPL(METHOD, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
     PACKAGE_ERROR.setCPL(PACKAGE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION,
                          STANDARD_OBJECT, BuiltInClass.CLASS_T);
@@ -726 +729 @@
     FLOATING_POINT_UNDERFLOW.finalizeClass();
     JAVA_EXCEPTION.finalizeClass();
+    METAOBJECT.finalizeClass();
     PACKAGE_ERROR.finalizeClass();
     PARSE_ERROR.finalizeClass();
@@ -748 +752 @@
     // SlotDefinitionClass.java, but we need to fill in a few things here.
     Debug.assertTrue(SLOT_DEFINITION.isFinalized());
-    SLOT_DEFINITION.setCPL(SLOT_DEFINITION, STANDARD_OBJECT,
+    SLOT_DEFINITION.setCPL(SLOT_DEFINITION, METAOBJECT, STANDARD_OBJECT,
                            BuiltInClass.CLASS_T);
     SLOT_DEFINITION.setDirectSlotDefinitions(SLOT_DEFINITION.getClassLayout().generateSlotDefinitions());
@@ -755 +759 @@
 
     DIRECT_SLOT_DEFINITION.setCPL(DIRECT_SLOT_DEFINITION, SLOT_DEFINITION,
-                                  STANDARD_OBJECT, BuiltInClass.CLASS_T);
+                                  METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
     DIRECT_SLOT_DEFINITION.finalizeClass();
     EFFECTIVE_SLOT_DEFINITION.setCPL(EFFECTIVE_SLOT_DEFINITION, SLOT_DEFINITION,
-                                     STANDARD_OBJECT, BuiltInClass.CLASS_T);
+                                     METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
     EFFECTIVE_SLOT_DEFINITION.finalizeClass();
     STANDARD_SLOT_DEFINITION.setCPL(STANDARD_SLOT_DEFINITION, SLOT_DEFINITION,
-                                    STANDARD_OBJECT, BuiltInClass.CLASS_T);
+                                    METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
     STANDARD_SLOT_DEFINITION.finalizeClass();
     STANDARD_DIRECT_SLOT_DEFINITION.setCPL(STANDARD_DIRECT_SLOT_DEFINITION, STANDARD_SLOT_DEFINITION,
-                                           DIRECT_SLOT_DEFINITION, SLOT_DEFINITION, STANDARD_OBJECT,
+                                           DIRECT_SLOT_DEFINITION, SLOT_DEFINITION, METAOBJECT, STANDARD_OBJECT,
                                            BuiltInClass.CLASS_T);
     STANDARD_DIRECT_SLOT_DEFINITION.finalizeClass();
     STANDARD_EFFECTIVE_SLOT_DEFINITION.setCPL(STANDARD_EFFECTIVE_SLOT_DEFINITION, STANDARD_SLOT_DEFINITION,
-                                              EFFECTIVE_SLOT_DEFINITION, SLOT_DEFINITION, STANDARD_OBJECT,
+                                              EFFECTIVE_SLOT_DEFINITION, SLOT_DEFINITION, METAOBJECT, STANDARD_OBJECT,
                                               BuiltInClass.CLASS_T);
     STANDARD_EFFECTIVE_SLOT_DEFINITION.finalizeClass();
@@ -774 +778 @@
     // STANDARD-METHOD
     Debug.assertTrue(STANDARD_METHOD.isFinalized());
-    STANDARD_METHOD.setCPL(STANDARD_METHOD, METHOD, STANDARD_OBJECT,
+    STANDARD_METHOD.setCPL(STANDARD_METHOD, METHOD, METAOBJECT, STANDARD_OBJECT,
                            BuiltInClass.CLASS_T);
     STANDARD_METHOD.setDirectSlotDefinitions(STANDARD_METHOD.getClassLayout().generateSlotDefinitions());
@@ -783 +787 @@
     Debug.assertTrue(STANDARD_READER_METHOD.isFinalized());
     STANDARD_READER_METHOD.setCPL(STANDARD_READER_METHOD, STANDARD_METHOD,
-                                  METHOD, STANDARD_OBJECT, BuiltInClass.CLASS_T);
+                                  METHOD, METAOBJECT, STANDARD_OBJECT,
+                                  BuiltInClass.CLASS_T);
     STANDARD_READER_METHOD.setSlotDefinitions(STANDARD_READER_METHOD.getClassLayout().generateSlotDefinitions());
     // All but the last slot are inherited.
@@ -791 +796 @@
     Debug.assertTrue(STANDARD_GENERIC_FUNCTION.isFinalized());
     STANDARD_GENERIC_FUNCTION.setCPL(STANDARD_GENERIC_FUNCTION,
-                                     GENERIC_FUNCTION, STANDARD_OBJECT,
+                                     GENERIC_FUNCTION, METAOBJECT,
+                                     STANDARD_OBJECT,
                                      BuiltInClass.FUNCTION,
                                      BuiltInClass.CLASS_T);

trunk/abcl/src/org/armedbear/lisp/Symbol.java

@@ -2968 +2968 @@
   public static final Symbol CLASS_PRECEDENCE_LIST =
     PACKAGE_MOP.addInternalSymbol("CLASS-PRECEDENCE-LIST");
+  public static final Symbol METAOBJECT =
+    PACKAGE_MOP.addExternalSymbol("METAOBJECT");
   public static final Symbol STANDARD_READER_METHOD =
     PACKAGE_MOP.addExternalSymbol("STANDARD-READER-METHOD");