Changeset 15060

Timestamp:

06/09/17 08:50:42 (6 years ago)

Author:

Mark Evenson

Message:

Fix J2LIST
(Olof-Joachim Frahm)

From <​https://github.com/armedbear/abcl/pull/50/commits/335405b2ef48da2e4894763ff23824113d29cb5b>.

Merges <​https://github.com/armedbear/abcl/pull/50>.

File:

• trunk/abcl/contrib/jss/collections.lisp (modified) (1 diff)

trunk/abcl/contrib/jss/collections.lisp

@@ -124 +124 @@
            (load-time-value (jmethod "java.lang.Class" "isInstance" "java.lang.Object"))))
       (cond
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.AbstractCollection")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.AbstractCollection"))) thing)
          (iterator-collect (#"iterator" thing)))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Iterator")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Iterator"))) thing)
          (iterator-collect thing))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Enumeration")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Enumeration"))) thing)
          (enumeration-collect thing))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.AbstractMap")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.AbstractMap"))) thing)
          (map-collect thing))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Collections")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Collections"))) thing)
          (iterator-collect (#"iterator" thing)))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Spliterator")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Spliterator"))) thing)
          (iterator-collect (#"iterator" (#"stream" 'StreamSupport thing))))
-        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Dictionary")) thing))
+        ((jcall isinstance (load-time-value (ignore-errors (jclass "java.util.Dictionary"))) thing)
          (iterator-collect (#"elements" thing)))
         ((ignore-errors (#"toArray" thing))