Changeset 12661

Timestamp:

05/09/10 14:58:36 (13 years ago)

Author:

astalla

Message:

Fix computation of the class precedence list for Java classes in case of multiple occurrences of the same interface in the class hierarchy.

File:

• trunk/abcl/src/org/armedbear/lisp/java.lisp (modified) (2 diffs)

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

@@ -349 +349 @@
      (make-symbol (jclass-name jclass))
      :metaclass (find-class 'java-class)
-     :direct-superclasses (mapcar #'ensure-java-class
-                (remove-duplicates
-                 (delete nil
-                   (concatenate 'list
-                    (list (jclass-superclass jclass))
-                    (jclass-interfaces jclass)))
-                 :key #'jclass-name :test #'string=))
+     :direct-superclasses
+     (let ((supers
+      (mapcar #'ensure-java-class
+        (delete nil
+          (concatenate 'list
+                 (list (jclass-superclass jclass))
+                 (jclass-interfaces jclass))))))
+       (if (jclass-interface-p jclass)
+           (append supers (list (find-class 'java-object)))
+           supers))
      :java-class jclass)))))
 
@@ -374 +377 @@
    gf is specialized on two different interfaces and you apply it to an object that
    implements both, it is unspecified which method will be called."
-  (let ((cpl (call-next-method)))
+  (let ((cpl (nreverse (mop::collect-superclasses* class))))
     (flet ((score (class)
        (if (not (typep class 'java-class))