Changeset 12303

Timestamp:

12/23/09 20:53:57 (14 years ago)

Author:

astalla

Message:

Extended the new smart behavior of jcall to jnew: (jnew class-name args) finds the most specific constructor and calls it.

File:

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

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

@@ -449 +449 @@
             LispObject classRef = args[0];
             try {
-                Constructor constructor = (Constructor) JavaObject.getObject(classRef);
+                Constructor constructor;
+    if(classRef instanceof AbstractString) {
+        constructor = findConstructor(javaClass(classRef), args);
+    } else {
+        constructor = (Constructor) JavaObject.getObject(classRef);
+    }
                 Class[] argTypes = constructor.getParameterTypes();
                 Object[] initargs = new Object[args.length-1];
@@ -677 +682 @@
     }
 
-    private static Method findMethod(Class<?> c, String methodName, LispObject[] args) throws NoSuchMethodException {
-        int argCount = args.length - 2;
+    private static Object[] translateMethodArguments(LispObject[] args) {
+  return translateMethodArguments(args, 0);
+    }
+
+    private static Object[] translateMethodArguments(LispObject[] args, int offs) {
+  int argCount = args.length - offs;
         Object[] javaArgs = new Object[argCount];
         for (int i = 0; i < argCount; ++i) {
-            Object x = args[i + 2];
+            Object x = args[i + offs];
             if (x == NIL) {
                 javaArgs[i] = null;
@@ -688 +697 @@
             }
         }
+  return javaArgs;
+    }
+
+    private static Method findMethod(Class<?> c, String methodName, LispObject[] args) throws NoSuchMethodException {
+  int argCount = args.length - 2;
+        Object[] javaArgs = translateMethodArguments(args, 2);
         Method[] methods = c.getMethods();
         Method result = null;
@@ -702 +717 @@
                 continue;
             }
-            if (result == null || isMoreSpecialized(method, result)) {
+            if (result == null || isMoreSpecialized(methodTypes, result.getParameterTypes())) {
                 result = method;
             }
@@ -708 +723 @@
         if (result == null) {
             throw new NoSuchMethodException(methodName);
+        }
+        return result;
+    }
+
+    private static Constructor findConstructor(Class<?> c, LispObject[] args) throws NoSuchMethodException {
+  int argCount = args.length - 1;
+        Object[] javaArgs = translateMethodArguments(args, 1);
+        Constructor[] ctors = c.getConstructors();
+        Constructor result = null;
+        for (int i = ctors.length; i-- > 0;) {
+            Constructor ctor = ctors[i];
+            if (ctor.getParameterTypes().length != argCount) {
+                continue;
+            }
+            Class<?>[] methodTypes = (Class<?>[]) ctor.getParameterTypes();
+            if (!isApplicableMethod(methodTypes, javaArgs)) {
+                continue;
+            }
+            if (result == null || isMoreSpecialized(methodTypes, result.getParameterTypes())) {
+                result = ctor;
+            }
+        }
+        if (result == null) {
+            throw new NoSuchMethodException(c.getSimpleName());
         }
         return result;
@@ -729 +768 @@
     }
 
-    private static boolean isMoreSpecialized(Method x, Method y) {
-        Class<?>[] xtypes = x.getParameterTypes();
-        Class<?>[] ytypes = y.getParameterTypes();
+    private static boolean isMoreSpecialized(Class<?>[] xtypes, Class<?>[] ytypes) {
         for (int i = 0; i < xtypes.length; ++i) {
             Class<?> xtype = xtypes[i];