Skip to content

Commit

Permalink
move getMatchingParams method from Compiler to Reflector
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelBlume
Alexander Taggart authored and MichaelBlume committed Jan 30, 2015
1 parent 94908ce commit 31903a0
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 77 deletions.
79 changes: 3 additions & 76 deletions src/jvm/clojure/lang/Compiler.java
View file
Expand Up @@ -1456,7 +1456,7 @@ public InstanceMethodExpr(String source, int line, int column, Symbol tag, Expr
params.add(m.getParameterTypes());
rets.add(m.getReturnType());
}
methodidx = getMatchingParams(methodName, params, argexprTypes(args), rets);
methodidx = Reflector.getMatchingParams(methodName, params, argexprTypes(args), rets);
}
java.lang.reflect.Method m =
(java.lang.reflect.Method) (methodidx >= 0 ? methods.get(methodidx) : null);
Expand Down Expand Up @@ -1624,7 +1624,7 @@ public StaticMethodExpr(String source, int line, int column, Symbol tag, Class c
params.add(m.getParameterTypes());
rets.add(m.getReturnType());
}
methodidx = getMatchingParams(methodName, params, argexprTypes(args), rets);
methodidx = Reflector.getMatchingParams(methodName, params, argexprTypes(args), rets);
}
method = (java.lang.reflect.Method) (methodidx >= 0 ? methods.get(methodidx) : null);
if(method == null && RT.booleanCast(RT.WARN_ON_REFLECTION.deref()))
Expand Down Expand Up @@ -2386,25 +2386,6 @@ public Expr parse(C context, Object form) {
}


static public boolean subsumes(Class[] c1, Class[] c2){
//presumes matching lengths
Boolean better = false;
for(int i = 0; i < c1.length; i++)
{
if(c1[i] != c2[i])// || c2[i].isPrimitive() && c1[i] == Object.class))
{
if(!c1[i].isPrimitive() && c2[i].isPrimitive()
//|| Number.class.isAssignableFrom(c1[i]) && c2[i].isPrimitive()
||
c2[i].isAssignableFrom(c1[i]))
better = true;
else
return false;
}
}
return better;
}

static String getTypeStringForArgs(IPersistentVector args){
StringBuilder sb = new StringBuilder();
for(int i = 0; i < args.count(); i++)
Expand All @@ -2416,60 +2397,6 @@ static String getTypeStringForArgs(IPersistentVector args){
return sb.toString();
}

static int getMatchingParams(String methodName, ArrayList<Class[]> paramlists, Class[] argTypes,
List<Class> rets)
{
//presumes matching lengths
int matchIdx = -1;
boolean tied = false;
boolean foundExact = false;
for(int i = 0; i < paramlists.size(); i++)
{
boolean match = true;
int exact = 0;
for(int p = 0; match && p < argTypes.length; ++p)
{
Class aclass = argTypes[p];
Class pclass = paramlists.get(i)[p];
if(aclass == pclass)
exact++;
else
match = Reflector.paramArgTypeMatch(pclass, aclass);
}
if(exact == argTypes.length)
{
if(!foundExact || matchIdx == -1 || rets.get(matchIdx).isAssignableFrom(rets.get(i)))
matchIdx = i;
tied = false;
foundExact = true;
}
else if(match && !foundExact)
{
if(matchIdx == -1)
matchIdx = i;
else
{
if(subsumes(paramlists.get(i), paramlists.get(matchIdx)))
{
matchIdx = i;
tied = false;
}
else if(Arrays.equals(paramlists.get(matchIdx), paramlists.get(i)))
{
if(rets.get(matchIdx).isAssignableFrom(rets.get(i)))
matchIdx = i;
}
else if(!(subsumes(paramlists.get(matchIdx), paramlists.get(i))))
tied = true;
}
}
}
if(tied)
throw new IllegalArgumentException("More than one matching method found: " + methodName);

return matchIdx;
}

public static class NewExpr implements Expr{
public final IPersistentVector args;
public final Constructor ctor;
Expand Down Expand Up @@ -2502,7 +2429,7 @@ public NewExpr(Class c, IPersistentVector args, int line, int column) {
int ctoridx = 0;
if(ctors.size() > 1)
{
ctoridx = getMatchingParams(c.getName(), params, argexprTypes(args), rets);
ctoridx = Reflector.getMatchingParams(c.getName(), params, argexprTypes(args), rets);
}

this.ctor = ctoridx >= 0 ? (Constructor) ctors.get(ctoridx) : null;
Expand Down
76 changes: 75 additions & 1 deletion src/jvm/clojure/lang/Reflector.java
View file
Expand Up @@ -17,6 +17,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;

Expand Down Expand Up @@ -67,7 +68,7 @@ else if(methods.size() == 1)
Class[] params = m.getParameterTypes();
if(isCongruent(params, args))
{
if(foundm == null || Compiler.subsumes(params, foundm.getParameterTypes()))
if(foundm == null || subsumes(params, foundm.getParameterTypes()))
{
foundm = m;
boxedArgs = boxArgs(params, args);
Expand Down Expand Up @@ -369,6 +370,79 @@ static public Field getField(Class c, String name, boolean getStatics){
return null;
}

static public boolean subsumes(Class[] c1, Class[] c2){
//presumes matching lengths
Boolean better = false;
for(int i = 0; i < c1.length; i++)
{
if(c1[i] != c2[i])// || c2[i].isPrimitive() && c1[i] == Object.class))
{
if(!c1[i].isPrimitive() && c2[i].isPrimitive()
//|| Number.class.isAssignableFrom(c1[i]) && c2[i].isPrimitive()
||
c2[i].isAssignableFrom(c1[i]))
better = true;
else
return false;
}
}
return better;
}

static int getMatchingParams(String methodName, ArrayList<Class[]> paramlists, Class[] argTypes,
List<Class> rets)
{
//presumes matching lengths
int matchIdx = -1;
boolean tied = false;
boolean foundExact = false;
for(int i = 0; i < paramlists.size(); i++)
{
boolean match = true;
int exact = 0;
for(int p = 0; match && p < argTypes.length; ++p)
{
Class aclass = argTypes[p];
Class pclass = paramlists.get(i)[p];
if(aclass == pclass)
exact++;
else
match = Reflector.paramArgTypeMatch(pclass, aclass);
}
if(exact == argTypes.length)
{
if(!foundExact || matchIdx == -1 || rets.get(matchIdx).isAssignableFrom(rets.get(i)))
matchIdx = i;
tied = false;
foundExact = true;
}
else if(match && !foundExact)
{
if(matchIdx == -1)
matchIdx = i;
else
{
if(subsumes(paramlists.get(i), paramlists.get(matchIdx)))
{
matchIdx = i;
tied = false;
}
else if(Arrays.equals(paramlists.get(matchIdx), paramlists.get(i)))
{
if(rets.get(matchIdx).isAssignableFrom(rets.get(i)))
matchIdx = i;
}
else if(!(subsumes(paramlists.get(matchIdx), paramlists.get(i))))
tied = true;
}
}
}
if(tied)
throw new IllegalArgumentException("More than one matching method found: " + methodName);

return matchIdx;
}

static public List getMethods(Class c, int arity, String name, boolean getStatics){
Method[] allmethods = c.getMethods();
ArrayList methods = new ArrayList();
Expand Down

0 comments on commit 31903a0

Please sign in to comment.