Moved instance-method-finding code from Compiler to Reflector

MichaelBlume · Jan 30, 2015 · 56995f3 · 56995f3
1 parent 31903a0
commit 56995f3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 41 deletions.
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
@@ -1432,47 +1432,13 @@ public InstanceMethodExpr(String source, int line, int column, Symbol tag, Expr
 		this.tag = tag;
 		if(target.hasJavaClass() && target.getJavaClass() != null)
 			{
-			List methods = Reflector.getMethods(target.getJavaClass(), args.count(), methodName, false);
-			if(methods.isEmpty())
-				{
-				method = null;
-				if(RT.booleanCast(RT.WARN_ON_REFLECTION.deref()))
-					{
-					RT.errPrintWriter()
-						.format("Reflection warning, %s:%d:%d - call to method %s on %s can't be resolved (no such method).\n",
-							SOURCE_PATH.deref(), line, column, methodName, target.getJavaClass().getName());
-					}
-				}
-			else
-				{
-				int methodidx = 0;
-				if(methods.size() > 1)
-					{
-					ArrayList<Class[]> params = new ArrayList();
-					ArrayList<Class> rets = new ArrayList();
-					for(int i = 0; i < methods.size(); i++)
-						{
-						java.lang.reflect.Method m = (java.lang.reflect.Method) methods.get(i);
-						params.add(m.getParameterTypes());
-						rets.add(m.getReturnType());
-						}
-					methodidx = Reflector.getMatchingParams(methodName, params, argexprTypes(args), rets);
-					}
-				java.lang.reflect.Method m =
-						(java.lang.reflect.Method) (methodidx >= 0 ? methods.get(methodidx) : null);
-				if(m != null && !Modifier.isPublic(m.getDeclaringClass().getModifiers()))
-					{
-					//public method of non-public class, try to find it in hierarchy
-					m = Reflector.getAsMethodOfPublicBase(m.getDeclaringClass(), m);
-					}
-				method = m;
-				if(method == null && RT.booleanCast(RT.WARN_ON_REFLECTION.deref()))
-					{
-					RT.errPrintWriter()
-						.format("Reflection warning, %s:%d:%d - call to method %s on %s can't be resolved (argument types: %s).\n",
-							SOURCE_PATH.deref(), line, column, methodName, target.getJavaClass().getName(), getTypeStringForArgs(args));
-					}
-				}
+			method = Reflector.getMatchingInstanceMethod(target.getJavaClass(), methodName, argexprTypes(args));
+      if(method == null && RT.booleanCast(RT.WARN_ON_REFLECTION.deref()))
+        {
+        RT.errPrintWriter()
+          .format("Reflection warning, %s:%d:%d - call to method %s on %s can't be resolved (argument types: %s).\n",
+            SOURCE_PATH.deref(), line, column, methodName, target.getJavaClass().getName(), getTypeStringForArgs(args));
+        }
 			}
 		else
 			{

diff --git a/src/jvm/clojure/lang/Reflector.java b/src/jvm/clojure/lang/Reflector.java
@@ -495,6 +495,36 @@ static public List getMethods(Class c, int arity, String name, boolean getStatic
 	return methods;
 }
 
+public static Method getMatchingInstanceMethod(Class c, String methodName, Class[] argTypes){
+    List methods = getMethods(c, argTypes.length, methodName, false);
+    if(methods.isEmpty())
+        return null;
+    //throw new IllegalArgumentException("No matching method found");
+    else
+        {
+        int methodidx = 0;
+        if(methods.size() > 1)
+            {
+            ArrayList<Class[]> params = new ArrayList();
+            ArrayList<Class> rets = new ArrayList();
+            for(int i = 0; i < methods.size(); i++)
+                {
+                java.lang.reflect.Method m = (java.lang.reflect.Method) methods.get(i);
+                params.add(m.getParameterTypes());
+                rets.add(m.getReturnType());
+                }
+            methodidx = getMatchingParams(methodName, params, argTypes, rets);
+            }
+        java.lang.reflect.Method m =
+                (java.lang.reflect.Method) (methodidx >= 0 ? methods.get(methodidx) : null);
+        if(m != null && !Modifier.isPublic(m.getDeclaringClass().getModifiers()))
+            {
+            //public method of non-public class, try to find it in hierarchy
+            m = Reflector.getAsMethodOfPublicBase(m.getDeclaringClass(), m);
+            }
+        return m;
+        }
+}
 
 static Object boxArg(Class paramType, Object arg){
 	if(!paramType.isPrimitive())