Changeset 15234

Timestamp:

02/09/20 13:03:52 (3 years ago)

Author:

Mark Evenson

Message:

Fix calling Java varargs methods

Calling varargs with java.reflect.Method.invoke() is tricky. Still
not sure how this works, but guessed at it after reading
<​https://stackoverflow.com/questions/2600854/how-to-work-with-varargs-and-reflection>,
and it sems to work.

Test via

(java:jstatic-raw "asList" "java.util.Arrays" (java:jnew-array (java:jclass "int") 1))

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Java.java (modified) (2 diffs)
• JavaObject.java (modified) (1 diff)

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

@@ -471 +471 @@
             }
             m.setAccessible(true);
-            Object result = m.invoke(null, methodArgs);
+            Object result = null;
+            if (!m.isVarArgs()) {
+              result = m.invoke(null, methodArgs);
+            } else {
+              result = m.invoke(null, (Object)methodArgs);
+            }
       return JavaObject.getInstance(result, translate, m.getReturnType());
         }
@@ -1065 +1070 @@
         } else if (Float.class.equals(from)) {
             return Double.class.equals(to);
+        } else if (from.isArray() && to.isArray()) {
+            // for now just indicate that anything is assignable to an
+            // java.lang.Object[], as this is the most common case
+            if (to.getComponentType().equals(java.lang.Object.class)) {
+                return true;
+            }
         }
         return false;

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

@@ -289 +289 @@
               // representations.  
                 return obj;
+            } else if (c.isArray() && obj.getClass().isArray()) {
+                       // ??? only supports conversions to java.lang.Object[]
+                       //                       && c.getComponentType().equals(obj.getClass().getComponentType())) {
+                       
+              return obj;
             } else {
                 return error(new TypeError(intendedClass.getName() + " is not assignable to " + c.getName()));