Changeset 14470

Timestamp:

04/24/13 12:50:52 (11 years ago)

Author:

rschlatte

Message:

define multiply-referenced symbols in Symbol.java

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (1 diff)
• StandardGenericFunctionClass.java (modified) (1 diff)
• Symbol.java (modified) (6 diffs)

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

@@ -855 +855 @@
                                      BuiltInClass.CLASS_T);
     STANDARD_GENERIC_FUNCTION.setDirectSlotDefinitions(
-      list(new SlotDefinition(PACKAGE_SYS.intern("NAME"), NIL, constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("LAMBDA-LIST"), NIL,
+      list(new SlotDefinition(Symbol.NAME, NIL, constantlyNil),
+           new SlotDefinition(Symbol.LAMBDA_LIST, NIL, constantlyNil),
+           new SlotDefinition(Symbol.REQUIRED_ARGS, NIL, constantlyNil),
+           new SlotDefinition(Symbol.OPTIONAL_ARGS, NIL, constantlyNil),
+           new SlotDefinition(Symbol.INITIAL_METHODS, NIL, constantlyNil),
+           new SlotDefinition(Symbol.METHODS, NIL, constantlyNil),
+           new SlotDefinition(Symbol.METHOD_CLASS, NIL, constantlyNil),
+           new SlotDefinition(Symbol._METHOD_COMBINATION, NIL, constantlyNil,
+                              list(internKeyword("METHOD-COMBINATION"))),
+           new SlotDefinition(Symbol.ARGUMENT_PRECEDENCE_ORDER, NIL,
                               constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("REQUIRED-ARGS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("OPTIONAL-ARGS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("INITIAL-METHODS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("METHODS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("METHOD-CLASS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("%METHOD-COMBINATION"), NIL,
-                              constantlyNil,
-                              list(internKeyword("METHOD-COMBINATION"))),
-           new SlotDefinition(PACKAGE_SYS.intern("ARGUMENT-PRECEDENCE-ORDER"),
-                              NIL, constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("DECLARATIONS"), NIL,
-                              constantlyNil),
-           new SlotDefinition(PACKAGE_SYS.intern("CLASSES-TO-EMF-TABLE"), NIL,
-                              constantlyNil),
+           new SlotDefinition(Symbol.DECLARATIONS, NIL, constantlyNil),
+           new SlotDefinition(Symbol.CLASSES_TO_EMF_TABLE, NIL, constantlyNil),
            new SlotDefinition(Symbol._DOCUMENTATION, NIL, constantlyNil,
                               list(internKeyword("DOCUMENTATION")))));

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

@@ -58 +58 @@
     LispObject[] instanceSlotNames =
       {
-        pkg.intern("NAME"),
-        pkg.intern("LAMBDA-LIST"),
-        pkg.intern("REQUIRED-ARGS"),
-        pkg.intern("OPTIONAL-ARGS"),
-        pkg.intern("INITIAL-METHODS"),
-        pkg.intern("METHODS"),
-        pkg.intern("METHOD-CLASS"),
-        pkg.intern("%METHOD-COMBINATION"),
-        pkg.intern("ARGUMENT-PRECEDENCE-ORDER"),
-        pkg.intern("DECLARATIONS"),
-        pkg.intern("CLASSES-TO-EMF-TABLE"),
+        Symbol.NAME,
+        Symbol.LAMBDA_LIST,
+        Symbol.REQUIRED_ARGS,
+        Symbol.OPTIONAL_ARGS,
+        Symbol.INITIAL_METHODS,
+        Symbol.METHODS,
+        Symbol.METHOD_CLASS,
+        Symbol._METHOD_COMBINATION,
+        Symbol.ARGUMENT_PRECEDENCE_ORDER,
+        Symbol.DECLARATIONS,
+        Symbol.CLASSES_TO_EMF_TABLE,
         Symbol._DOCUMENTATION
       };

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

@@ -3120 +3120 @@
   public static final Symbol ALLOCATION_CLASS =
     PACKAGE_SYS.addInternalSymbol("ALLOCATION-CLASS");
+  public static final Symbol ARGUMENT_PRECEDENCE_ORDER =
+    PACKAGE_SYS.addInternalSymbol("ARGUMENT-PRECEDENCE-ORDER");
   public static final Symbol BACKQUOTE_MACRO =
     PACKAGE_SYS.addInternalSymbol("BACKQUOTE-MACRO");
@@ -3126 +3128 @@
   public static final Symbol CAUSE =
     PACKAGE_SYS.addInternalSymbol("CAUSE");
+  public static final Symbol CLASSES_TO_EMF_TABLE =
+    PACKAGE_SYS.addInternalSymbol("CLASSES-TO-EMF-TABLE");
   public static final Symbol COMMA_MACRO =
     PACKAGE_SYS.addInternalSymbol("COMMA-MACRO");
   public static final Symbol DATUM =
     PACKAGE_SYS.addInternalSymbol("DATUM");
+  public static final Symbol DECLARATIONS =
+    PACKAGE_SYS.addInternalSymbol("DECLARATIONS");
   public static final Symbol DEFTYPE_DEFINITION =
     PACKAGE_SYS.addInternalSymbol("DEFTYPE-DEFINITION");
@@ -3153 +3159 @@
   public static final Symbol INITFUNCTION =
     PACKAGE_SYS.addInternalSymbol("INITFUNCTION");
+  public static final Symbol INITIAL_METHODS =
+    PACKAGE_SYS.addInternalSymbol("INITIAL-METHODS");
   public static final Symbol INSTANCE =
     PACKAGE_SYS.addInternalSymbol("INSTANCE");
@@ -3169 +3177 @@
   public static final Symbol MAKE_FUNCTION_PRELOADING_CONTEXT =
     PACKAGE_SYS.addInternalSymbol("MAKE-FUNCTION-PRELOADING-CONTEXT");
+  public static final Symbol METHOD_CLASS =
+    PACKAGE_SYS.addInternalSymbol("METHOD-CLASS");
+  public static final Symbol _METHOD_COMBINATION =
+    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");
@@ -3175 +3188 @@
   public static final Symbol OPERATION =
     PACKAGE_SYS.addInternalSymbol("OPERATION");
+  public static final Symbol OPTIONAL_ARGS =
+    PACKAGE_SYS.addInternalSymbol("OPTIONAL-ARGS");
   public static final Symbol OTHER_KEYWORDS_P =
     PACKAGE_SYS.addInternalSymbol("OTHER-KEYWORDS-P");
@@ -3183 +3198 @@
   public static final Symbol READERS =
     PACKAGE_SYS.addInternalSymbol("READERS");
+  public static final Symbol REQUIRED_ARGS =
+    PACKAGE_SYS.addInternalSymbol("REQUIRED-ARGS");
   public static final Symbol _SOURCE =
     PACKAGE_SYS.addInternalSymbol("%SOURCE");