Changeset 14079

Timestamp:

08/13/12 13:22:17 (9 years ago)

Author:

rschlatte

Message:

Don't overwrite existing attributes in ensure-generic-function

• also add initargs :method-combination, :documentation for generic functions

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (1 diff)
• clos.lisp (modified) (1 diff)

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

@@ -866 +866 @@
                                      BuiltInClass.FUNCTION,
                                      BuiltInClass.CLASS_T);
-    STANDARD_GENERIC_FUNCTION.setDirectSlotDefinitions(STANDARD_GENERIC_FUNCTION.getClassLayout().generateSlotDefinitions());
+    STANDARD_GENERIC_FUNCTION.setDirectSlotDefinitions(
+      list(new SlotDefinition(PACKAGE_SYS.intern("NAME"), NIL, constantlyNil),
+           new SlotDefinition(PACKAGE_SYS.intern("LAMBDA-LIST"), 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._DOCUMENTATION, NIL, constantlyNil,
+                              list(internKeyword("DOCUMENTATION")))));
     // There are no inherited slots.
     STANDARD_GENERIC_FUNCTION.setSlotDefinitions(STANDARD_GENERIC_FUNCTION.getDirectSlotDefinitions());

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

@@ -4494 +4494 @@
      function-name
      &rest all-keys
-     &key (generic-function-class +the-standard-generic-function-class+)
+     &key (generic-function-class (class-of generic-function))
      (lambda-list nil lambda-list-supplied-p)
-     (method-class +the-standard-method-class+)
-     (method-combination +the-standard-method-combination+)
+     (method-class (generic-function-method-class generic-function))
+     (method-combination (generic-function-method-combination generic-function))
      &allow-other-keys)
   (setf all-keys (copy-list all-keys))  ; since we modify it