Changeset 14470


Ignore:
Timestamp:
04/24/13 12:50:52 (10 years ago)
Author:
rschlatte
Message:

define multiply-referenced symbols in Symbol.java

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/StandardClass.java

    r14467 r14470  
    855855                                     BuiltInClass.CLASS_T);
    856856    STANDARD_GENERIC_FUNCTION.setDirectSlotDefinitions(
    857       list(new SlotDefinition(PACKAGE_SYS.intern("NAME"), NIL, constantlyNil),
    858            new SlotDefinition(PACKAGE_SYS.intern("LAMBDA-LIST"), NIL,
     857      list(new SlotDefinition(Symbol.NAME, NIL, constantlyNil),
     858           new SlotDefinition(Symbol.LAMBDA_LIST, NIL, constantlyNil),
     859           new SlotDefinition(Symbol.REQUIRED_ARGS, NIL, constantlyNil),
     860           new SlotDefinition(Symbol.OPTIONAL_ARGS, NIL, constantlyNil),
     861           new SlotDefinition(Symbol.INITIAL_METHODS, NIL, constantlyNil),
     862           new SlotDefinition(Symbol.METHODS, NIL, constantlyNil),
     863           new SlotDefinition(Symbol.METHOD_CLASS, NIL, constantlyNil),
     864           new SlotDefinition(Symbol._METHOD_COMBINATION, NIL, constantlyNil,
     865                              list(internKeyword("METHOD-COMBINATION"))),
     866           new SlotDefinition(Symbol.ARGUMENT_PRECEDENCE_ORDER, NIL,
    859867                              constantlyNil),
    860            new SlotDefinition(PACKAGE_SYS.intern("REQUIRED-ARGS"), NIL,
    861                               constantlyNil),
    862            new SlotDefinition(PACKAGE_SYS.intern("OPTIONAL-ARGS"), NIL,
    863                               constantlyNil),
    864            new SlotDefinition(PACKAGE_SYS.intern("INITIAL-METHODS"), NIL,
    865                               constantlyNil),
    866            new SlotDefinition(PACKAGE_SYS.intern("METHODS"), NIL,
    867                               constantlyNil),
    868            new SlotDefinition(PACKAGE_SYS.intern("METHOD-CLASS"), NIL,
    869                               constantlyNil),
    870            new SlotDefinition(PACKAGE_SYS.intern("%METHOD-COMBINATION"), NIL,
    871                               constantlyNil,
    872                               list(internKeyword("METHOD-COMBINATION"))),
    873            new SlotDefinition(PACKAGE_SYS.intern("ARGUMENT-PRECEDENCE-ORDER"),
    874                               NIL, constantlyNil),
    875            new SlotDefinition(PACKAGE_SYS.intern("DECLARATIONS"), NIL,
    876                               constantlyNil),
    877            new SlotDefinition(PACKAGE_SYS.intern("CLASSES-TO-EMF-TABLE"), NIL,
    878                               constantlyNil),
     868           new SlotDefinition(Symbol.DECLARATIONS, NIL, constantlyNil),
     869           new SlotDefinition(Symbol.CLASSES_TO_EMF_TABLE, NIL, constantlyNil),
    879870           new SlotDefinition(Symbol._DOCUMENTATION, NIL, constantlyNil,
    880871                              list(internKeyword("DOCUMENTATION")))));
  • trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java

    r14464 r14470  
    5858    LispObject[] instanceSlotNames =
    5959      {
    60         pkg.intern("NAME"),
    61         pkg.intern("LAMBDA-LIST"),
    62         pkg.intern("REQUIRED-ARGS"),
    63         pkg.intern("OPTIONAL-ARGS"),
    64         pkg.intern("INITIAL-METHODS"),
    65         pkg.intern("METHODS"),
    66         pkg.intern("METHOD-CLASS"),
    67         pkg.intern("%METHOD-COMBINATION"),
    68         pkg.intern("ARGUMENT-PRECEDENCE-ORDER"),
    69         pkg.intern("DECLARATIONS"),
    70         pkg.intern("CLASSES-TO-EMF-TABLE"),
     60        Symbol.NAME,
     61        Symbol.LAMBDA_LIST,
     62        Symbol.REQUIRED_ARGS,
     63        Symbol.OPTIONAL_ARGS,
     64        Symbol.INITIAL_METHODS,
     65        Symbol.METHODS,
     66        Symbol.METHOD_CLASS,
     67        Symbol._METHOD_COMBINATION,
     68        Symbol.ARGUMENT_PRECEDENCE_ORDER,
     69        Symbol.DECLARATIONS,
     70        Symbol.CLASSES_TO_EMF_TABLE,
    7171        Symbol._DOCUMENTATION
    7272      };
  • trunk/abcl/src/org/armedbear/lisp/Symbol.java

    r14465 r14470  
    31203120  public static final Symbol ALLOCATION_CLASS =
    31213121    PACKAGE_SYS.addInternalSymbol("ALLOCATION-CLASS");
     3122  public static final Symbol ARGUMENT_PRECEDENCE_ORDER =
     3123    PACKAGE_SYS.addInternalSymbol("ARGUMENT-PRECEDENCE-ORDER");
    31223124  public static final Symbol BACKQUOTE_MACRO =
    31233125    PACKAGE_SYS.addInternalSymbol("BACKQUOTE-MACRO");
     
    31263128  public static final Symbol CAUSE =
    31273129    PACKAGE_SYS.addInternalSymbol("CAUSE");
     3130  public static final Symbol CLASSES_TO_EMF_TABLE =
     3131    PACKAGE_SYS.addInternalSymbol("CLASSES-TO-EMF-TABLE");
    31283132  public static final Symbol COMMA_MACRO =
    31293133    PACKAGE_SYS.addInternalSymbol("COMMA-MACRO");
    31303134  public static final Symbol DATUM =
    31313135    PACKAGE_SYS.addInternalSymbol("DATUM");
     3136  public static final Symbol DECLARATIONS =
     3137    PACKAGE_SYS.addInternalSymbol("DECLARATIONS");
    31323138  public static final Symbol DEFTYPE_DEFINITION =
    31333139    PACKAGE_SYS.addInternalSymbol("DEFTYPE-DEFINITION");
     
    31533159  public static final Symbol INITFUNCTION =
    31543160    PACKAGE_SYS.addInternalSymbol("INITFUNCTION");
     3161  public static final Symbol INITIAL_METHODS =
     3162    PACKAGE_SYS.addInternalSymbol("INITIAL-METHODS");
    31553163  public static final Symbol INSTANCE =
    31563164    PACKAGE_SYS.addInternalSymbol("INSTANCE");
     
    31693177  public static final Symbol MAKE_FUNCTION_PRELOADING_CONTEXT =
    31703178    PACKAGE_SYS.addInternalSymbol("MAKE-FUNCTION-PRELOADING-CONTEXT");
     3179  public static final Symbol METHOD_CLASS =
     3180    PACKAGE_SYS.addInternalSymbol("METHOD-CLASS");
     3181  public static final Symbol _METHOD_COMBINATION =
     3182    PACKAGE_SYS.addInternalSymbol("%METHOD-COMBINATION");
     3183  public static final Symbol METHODS = PACKAGE_SYS.addInternalSymbol("METHODS");
    31713184  public static final Symbol NAME = PACKAGE_SYS.addInternalSymbol("NAME");
    31723185  public static final Symbol OBJECT = PACKAGE_SYS.addInternalSymbol("OBJECT");
     
    31753188  public static final Symbol OPERATION =
    31763189    PACKAGE_SYS.addInternalSymbol("OPERATION");
     3190  public static final Symbol OPTIONAL_ARGS =
     3191    PACKAGE_SYS.addInternalSymbol("OPTIONAL-ARGS");
    31773192  public static final Symbol OTHER_KEYWORDS_P =
    31783193    PACKAGE_SYS.addInternalSymbol("OTHER-KEYWORDS-P");
     
    31833198  public static final Symbol READERS =
    31843199    PACKAGE_SYS.addInternalSymbol("READERS");
     3200  public static final Symbol REQUIRED_ARGS =
     3201    PACKAGE_SYS.addInternalSymbol("REQUIRED-ARGS");
    31853202  public static final Symbol _SOURCE =
    31863203    PACKAGE_SYS.addInternalSymbol("%SOURCE");
Note: See TracChangeset for help on using the changeset viewer.