Changeset 12831 for trunk/abcl/src/org/armedbear/lisp/java.lisp

Timestamp:

07/28/10 22:13:15 (13 years ago)

Author:

astalla

Message:

First stab at Java collections integration with the sequences protocol.

File:

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

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

@@ -149 +149 @@
         method implementation)))))
     lisp-this))
+
+(defun jequal (obj1 obj2)
+  "Compares obj1 with obj2 using java.lang.Object.equals()"
+  (jcall (jmethod "java.lang.Object" "equals" "java.lang.Object")
+   obj1 obj2))
 
 (defun jobject-class (obj)
@@ -364 +369 @@
              :java-class +java-lang-object+)))
 
+(defun jclass-additional-superclasses (jclass)
+  "Extension point to put additional CLOS classes on the CPL of a CLOS Java class."
+  (let ((supers nil))
+    (when (jclass-interface-p jclass)
+      (push (find-class 'java-object) supers))
+    (when (jequal jclass (jclass "java.util.List"))
+      (push (find-class 'sequence) supers))
+    supers))
+
 (defun ensure-java-class (jclass)
   (let ((class (%find-java-class jclass)))
@@ -379 +393 @@
                  (list (jclass-superclass jclass))
                  (jclass-interfaces jclass))))))
-       (if (jclass-interface-p jclass)
-           (append supers (list (find-class 'java-object)))
-           supers))
+       (append supers (jclass-additional-superclasses jclass)))
      :java-class jclass)))))