Changeset 14473

Timestamp:

04/24/13 12:51:00 (10 years ago)

Author:

rschlatte

Message:

Unify slot names for metaobjects

• move all slot names into SYS, define them in Symbol.java

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (2 diffs)
• Symbol.java (modified) (6 diffs)
• clos.lisp (modified) (1 diff)

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

@@ -38 +38 @@
 public class StandardClass extends SlotClass
 {
-
-  public static Symbol symName = PACKAGE_MOP.intern("NAME");
-  public static Symbol symLayout = PACKAGE_MOP.intern("LAYOUT");
-  public static Symbol symDirectSuperclasses
-    = PACKAGE_MOP.intern("DIRECT-SUPERCLASSES");
-  public static Symbol symDirectSubclasses
-    = PACKAGE_MOP.intern("DIRECT-SUBCLASSES");
-  public static Symbol symPrecedenceList
-    = PACKAGE_MOP.intern("PRECEDENCE-LIST");
-  public static Symbol symDirectMethods
-    = PACKAGE_MOP.intern("DIRECT-METHODS");
-  public static Symbol symDirectSlots
-    = PACKAGE_MOP.intern("DIRECT-SLOTS");
-  public static Symbol symSlots
-    = PACKAGE_MOP.intern("SLOTS");
+  // Slot names for standard-class.  Must agree with
+  // redefine-class-forwarder calls in clos.lisp.
+  public static Symbol symName = Symbol.NAME;
+  public static Symbol symLayout = Symbol.LAYOUT;
+  public static Symbol symDirectSuperclasses = Symbol.DIRECT_SUPERCLASSES;
+  public static Symbol symDirectSubclasses = Symbol.DIRECT_SUBCLASSES;
+  public static Symbol symPrecedenceList = Symbol.PRECEDENCE_LIST;
+  public static Symbol symDirectMethods = Symbol.DIRECT_METHODS;
+  public static Symbol symDirectSlots = Symbol.DIRECT_SLOTS; 
+  public static Symbol symSlots = Symbol.SLOTS;
   public static Symbol symDirectDefaultInitargs
-    = PACKAGE_MOP.intern("DIRECT-DEFAULT-INITARGS");
-  public static Symbol symDefaultInitargs
-    = PACKAGE_MOP.intern("DEFAULT-INITARGS");
-  public static Symbol symFinalizedP
-    = PACKAGE_MOP.intern("FINALIZED-P");
+    = Symbol.DIRECT_DEFAULT_INITARGS;
+  public static Symbol symDefaultInitargs = Symbol.DEFAULT_INITARGS;
+  public static Symbol symFinalizedP = Symbol.FINALIZED_P;
 
   // used as init-function for slots in this file.
@@ -390 +383 @@
   {
     return
-        list(helperMakeSlotDefinition("NAME", constantlyNil),
-             helperMakeSlotDefinition("LAYOUT", constantlyNil),
-             helperMakeSlotDefinition("DIRECT-SUPERCLASSES", constantlyNil),
-             helperMakeSlotDefinition("DIRECT-SUBCLASSES", constantlyNil),
-             helperMakeSlotDefinition("PRECEDENCE-LIST", constantlyNil),
-             helperMakeSlotDefinition("DIRECT-METHODS", constantlyNil),
-             helperMakeSlotDefinition("DIRECT-SLOTS", constantlyNil),
-             helperMakeSlotDefinition("SLOTS", constantlyNil),
-             helperMakeSlotDefinition("DIRECT-DEFAULT-INITARGS", constantlyNil),
-             helperMakeSlotDefinition("DEFAULT-INITARGS", constantlyNil),
-             helperMakeSlotDefinition("FINALIZED-P", constantlyNil),
-             new SlotDefinition(Symbol._DOCUMENTATION,
-                                list(PACKAGE_MOP.intern("CLASS-DOCUMENTATION")),
-                                constantlyNil, list(internKeyword("DOCUMENTATION"))));
-  }
-
-
-
-  private static final SlotDefinition helperMakeSlotDefinition(String name,
-                                                               Function init)
-  {
-    return
-        new SlotDefinition(PACKAGE_MOP.intern(name),   // name
-             list(PACKAGE_MOP.intern("CLASS-" + name)), // readers
-             init);
+      list(new SlotDefinition(symName, list(Symbol.CLASS_NAME), constantlyNil),
+           new SlotDefinition(symLayout, list(Symbol.CLASS_LAYOUT), constantlyNil),
+           new SlotDefinition(symDirectSuperclasses, list(Symbol.CLASS_DIRECT_SUPERCLASSES), constantlyNil),
+           new SlotDefinition(symDirectSubclasses, list(Symbol.CLASS_DIRECT_SUBCLASSES), constantlyNil),
+           new SlotDefinition(symPrecedenceList, list(Symbol.CLASS_PRECEDENCE_LIST), constantlyNil),
+           new SlotDefinition(symDirectMethods, list(Symbol.CLASS_DIRECT_METHODS), constantlyNil),
+           new SlotDefinition(symDirectSlots, list(Symbol.CLASS_DIRECT_SLOTS), constantlyNil),
+           new SlotDefinition(symSlots, list(Symbol.CLASS_SLOTS), constantlyNil),
+           new SlotDefinition(symDirectDefaultInitargs, list(Symbol.CLASS_DIRECT_DEFAULT_INITARGS), constantlyNil),
+           new SlotDefinition(symDefaultInitargs, list(Symbol.CLASS_DEFAULT_INITARGS), constantlyNil),
+           new SlotDefinition(symFinalizedP, list(Symbol.CLASS_FINALIZED_P), constantlyNil),
+           new SlotDefinition(Symbol._DOCUMENTATION,
+                              list(PACKAGE_MOP.intern("CLASS-DOCUMENTATION")),
+                              constantlyNil, list(internKeyword("DOCUMENTATION"))));
   }
 

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

@@ -2976 +2976 @@
   public static final Symbol CLASS_LAYOUT =
     PACKAGE_MOP.addInternalSymbol("CLASS-LAYOUT");
+  public static final Symbol CLASS_DEFAULT_INITARGS =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DEFAULT_INITARGS");
+  public static final Symbol CLASS_DIRECT_METHODS =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DIRECT-METHODS");
+  public static final Symbol CLASS_DIRECT_DEFAULT_INITARGS =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DIRECT-DEFAULT_INITARGS");
+  public static final Symbol CLASS_DIRECT_SLOTS =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DIRECT-SLOTS");
+  public static final Symbol CLASS_DIRECT_SUBCLASSES =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DIRECT-SUBCLASSES");
+  public static final Symbol CLASS_DIRECT_SUPERCLASSES =
+    PACKAGE_MOP.addExternalSymbol("CLASS-DIRECT-SUPERCLASSES");
+  public static final Symbol CLASS_FINALIZED_P =
+    PACKAGE_MOP.addExternalSymbol("CLASS-FINALIZED-P");
   public static final Symbol CLASS_PRECEDENCE_LIST =
-    PACKAGE_MOP.addInternalSymbol("CLASS-PRECEDENCE-LIST");
+    PACKAGE_MOP.addExternalSymbol("CLASS-PRECEDENCE-LIST");
+  public static final Symbol CLASS_SLOTS =
+    PACKAGE_MOP.addExternalSymbol("CLASS-SLOTS");
   public static final Symbol EQL_SPECIALIZER =
     PACKAGE_MOP.addExternalSymbol("EQL-SPECIALIZER");
@@ -3053 +3069 @@
   public static final Symbol COMPILED_LISP_FUNCTION_P =
     PACKAGE_SYS.addExternalSymbol("COMPILED-LISP-FUNCTION-P");
+  public static final Symbol DEFAULT_INITARGS =
+    PACKAGE_SYS.addExternalSymbol("DEFAULT-INITARGS");
+  public static final Symbol DIRECT_METHODS =
+    PACKAGE_SYS.addExternalSymbol("DIRECT-METHODS");
+  public static final Symbol DIRECT_SLOTS =
+    PACKAGE_SYS.addExternalSymbol("DIRECT-SLOTS");
+  public static final Symbol DIRECT_SUBCLASSES =
+    PACKAGE_SYS.addExternalSymbol("DIRECT-SUBCLASSES");
+  public static final Symbol DIRECT_DEFAULT_INITARGS =
+    PACKAGE_SYS.addExternalSymbol("DIRECT-DEFAULT-INITARGS");
+  public static final Symbol DIRECT_SUPERCLASSES =
+    PACKAGE_SYS.addExternalSymbol("DIRECT-SUPERCLASSES");
   public static final Symbol _DOCUMENTATION =
     PACKAGE_SYS.addExternalSymbol("%DOCUMENTATION");
@@ -3061 +3089 @@
   public static final Symbol ENVIRONMENT =
     PACKAGE_SYS.addExternalSymbol("ENVIRONMENT");
+  public static final Symbol FINALIZED_P =
+    PACKAGE_SYS.addExternalSymbol("FINALIZED-P");
   public static final Symbol FLOAT_UNDERFLOW_MODE =
     PACKAGE_SYS.addExternalSymbol("FLOAT-UNDERFLOW-MODE");
@@ -3075 +3105 @@
   public static final Symbol LAYOUT =
     PACKAGE_SYS.addExternalSymbol("LAYOUT");
+  public static final Symbol NAME =
+    PACKAGE_SYS.addExternalSymbol("NAME");
   public static final Symbol NAMED_LAMBDA =
     PACKAGE_SYS.addExternalSymbol("NAMED-LAMBDA");
   public static final Symbol OUTPUT_OBJECT =
     PACKAGE_SYS.addExternalSymbol("OUTPUT-OBJECT");
+  public static final Symbol PRECEDENCE_LIST =
+    PACKAGE_SYS.addExternalSymbol("PRECEDENCE-LIST");
   public static final Symbol PUTHASH =
     PACKAGE_SYS.addExternalSymbol("PUTHASH");
@@ -3093 +3127 @@
   public static final Symbol SETF_INVERSE =
     PACKAGE_SYS.addExternalSymbol("SETF-INVERSE");
+  public static final Symbol SLOTS = PACKAGE_SYS.addExternalSymbol("SLOTS");
   public static final Symbol SLOT_DEFINITION =
     PACKAGE_SYS.addExternalSymbol("SLOT-DEFINITION");
@@ -3182 +3217 @@
     PACKAGE_SYS.addInternalSymbol("%METHOD-COMBINATION");
   public static final Symbol METHODS = PACKAGE_SYS.addInternalSymbol("METHODS");
-  public static final Symbol NAME = PACKAGE_SYS.addInternalSymbol("NAME");
   public static final Symbol OBJECT = PACKAGE_SYS.addInternalSymbol("OBJECT");
   public static final Symbol OPERANDS =

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -3054 +3054 @@
                     standard-class funcallable-standard-class)))))
 
-
-(redefine-class-forwarder class-name name)
+;;; The slot names here must agree with the ones defined in
+;;; StandardClass.java:layoutStandardClass.
+(redefine-class-forwarder class-name sys:name)
 ;;; AMOP pg. 230
-(redefine-class-forwarder (setf class-name) name
+(redefine-class-forwarder (setf class-name) sys:name
    ((standard-class . (progn (reinitialize-instance class :name new-value) new-value))
     (funcallable-standard-class . (progn (reinitialize-instance class :name new-value) new-value))))
-(redefine-class-forwarder class-slots slots)
-(redefine-class-forwarder (setf class-slots) slots)
-(redefine-class-forwarder class-direct-slots direct-slots)
-(redefine-class-forwarder (setf class-direct-slots) direct-slots)
-(redefine-class-forwarder class-layout layout)
-(redefine-class-forwarder (setf class-layout) layout)
-(redefine-class-forwarder class-direct-superclasses direct-superclasses)
-(redefine-class-forwarder (setf class-direct-superclasses) direct-superclasses)
-(redefine-class-forwarder class-direct-subclasses direct-subclasses)
-(redefine-class-forwarder (setf class-direct-subclasses) direct-subclasses)
-(redefine-class-forwarder class-direct-methods direct-methods)
-(redefine-class-forwarder (setf class-direct-methods) direct-methods)
-(redefine-class-forwarder class-precedence-list precedence-list)
-(redefine-class-forwarder (setf class-precedence-list) precedence-list)
-(redefine-class-forwarder class-finalized-p finalized-p)
-(redefine-class-forwarder (setf class-finalized-p) finalized-p)
-(redefine-class-forwarder class-default-initargs default-initargs)
-(redefine-class-forwarder (setf class-default-initargs) default-initargs)
-(redefine-class-forwarder class-direct-default-initargs direct-default-initargs)
-(redefine-class-forwarder (setf class-direct-default-initargs) direct-default-initargs)
+(redefine-class-forwarder class-slots sys:slots)
+(redefine-class-forwarder (setf class-slots) sys:slots)
+(redefine-class-forwarder class-direct-slots sys:direct-slots)
+(redefine-class-forwarder (setf class-direct-slots) sys:direct-slots)
+(redefine-class-forwarder class-layout sys:layout)
+(redefine-class-forwarder (setf class-layout) sys:layout)
+(redefine-class-forwarder class-direct-superclasses sys:direct-superclasses)
+(redefine-class-forwarder (setf class-direct-superclasses) sys:direct-superclasses)
+(redefine-class-forwarder class-direct-subclasses sys:direct-subclasses)
+(redefine-class-forwarder (setf class-direct-subclasses) sys:direct-subclasses)
+(redefine-class-forwarder class-direct-methods sys:direct-methods)
+(redefine-class-forwarder (setf class-direct-methods) sys:direct-methods)
+(redefine-class-forwarder class-precedence-list sys:precedence-list)
+(redefine-class-forwarder (setf class-precedence-list) sys:precedence-list)
+(redefine-class-forwarder class-finalized-p sys:finalized-p)
+(redefine-class-forwarder (setf class-finalized-p) sys:finalized-p)
+(redefine-class-forwarder class-default-initargs sys:default-initargs)
+(redefine-class-forwarder (setf class-default-initargs) sys:default-initargs)
+(redefine-class-forwarder class-direct-default-initargs sys:direct-default-initargs)
+(redefine-class-forwarder (setf class-direct-default-initargs) sys:direct-default-initargs)
 
 ;;; Class definition