[ductilej] push by samskivert - Added a test for leniently resolving a named imported method, fixed so... on 2010-11-30 00:43 GMT

[duct...@googlecode.com]

Revision: 467896c06f
Author: Michael Bayne <m...@samskivert.com>
Date: Mon Nov 29 16:43:11 2010
Log: Added a test for leniently resolving a named imported method, fixed
some bugs,
consolidated the searching of named and star import scopes. Just because
javac
likes to duplicate code doesn't mean we have to follow suit.
http://code.google.com/p/ductilej/source/detail?r=467896c06f

Modified:
/src/main/java/org/ductilej/detyper/Resolver.java
/src/test/java/org/ductilej/dtests/FindStaticMethodTest.java

=======================================
--- /src/main/java/org/ductilej/detyper/Resolver.java Mon Nov 29 16:25:08
2010
+++ /src/main/java/org/ductilej/detyper/Resolver.java Mon Nov 29 16:43:11
2010
@@ -52,6 +52,10 @@
// were varargs used at this call site? (needed by
Resolve.instantiate)
public boolean varArgs;

+ // TODO: add a flag indicating whether this is a lenient
resolution, in which case we
+ // should perhaps not emit precise runtime types for the target
method and instead allow
+ // additional runtime resolution based on runtime actual argument
types...
+
/** Returns true if we were able to resolve the method, false if
not. */
public boolean isValid () {
return msym.kind < Kinds.ERR;
@@ -844,7 +848,6 @@
bestSoFar = sym;
}
if ((env1.enclClass.sym.flags() & Flags.STATIC) != 0)
staticOnly = true;
- env1 = env1.outer;
}

// look for a match in the predef class (TODO: I don't think any
methods are entered into
@@ -855,42 +858,30 @@
return sym;
}

- // check for a named-imported method that matches this name
- for (Scope.Entry e = env.toplevel.namedImportScope.lookup(name);
- e.scope != null; e = e.next()) {
- sym = e.sym;
- Type origin = e.getOrigin().owner.type;
- if (sym.kind == Kinds.MTH) {
- if (e.sym.owner.type != origin) {
- sym = sym.clone(e.getOrigin().owner);
- }
- // TODO: for now we're ignoring access controls; we could
in theory choose
- // accessible methods over inaccessible methods in the
event of collision
- // if (!_resolve.isAccessible(aenv, origin, sym)) {
- // sym = new AccessError(env, origin, sym);
- // }
- bestSoFar = selectBest(env, origin, atypes, tatypes, sym,
bestSoFar);
- }
- }
- if (bestSoFar.exists()) {
- return bestSoFar;
- }
-
- // check for a star-imported method that matches this name
- for (Scope.Entry e = env.toplevel.starImportScope.lookup(name);
- e.scope != null; e = e.next()) {
- sym = e.sym;
- Type origin = e.getOrigin().owner.type;
- if (sym.kind == Kinds.MTH) {
- if (e.sym.owner.type != origin) {
- sym = sym.clone(e.getOrigin().owner);
- }
- // TODO: for now we're ignoring access controls; we could
in theory choose
- // accessible methods over inaccessible methods in the
event of collision
- // if (!_resolve.isAccessible(aenv, origin, sym)) {
- // sym = new AccessError(env, origin, sym);
- // }
- bestSoFar = selectBest(env, origin, atypes, tatypes, sym,
bestSoFar);
+ for (Scope.Entry scope : new Scope.Entry[] {
+ // first, check for a named-imported method that matches
this name
+ env.toplevel.namedImportScope.lookup(name),
+ // then, check for a star-imported method that matches
this name
+ env.toplevel.starImportScope.lookup(name)
+ }) {
+ for (Scope.Entry e = scope;
+ e.scope != null; e = e.next()) {
+ sym = e.sym;
+ Type origin = e.getOrigin().owner.type;
+ if (sym.kind == Kinds.MTH) {
+ if (e.sym.owner.type != origin) {
+ sym = sym.clone(e.getOrigin().owner);
+ }
+ // TODO: for now we're ignoring access controls; we
could in theory choose
+ // accessible methods over inaccessible methods in the
event of collision
+ // if (!_resolve.isAccessible(aenv, origin, sym)) {
+ // sym = new AccessError(env, origin, sym);
+ // }
+ bestSoFar = selectBest(env, origin, atypes, tatypes,
sym, bestSoFar);
+ }
+ }
+ if (bestSoFar.exists()) {
+ return bestSoFar;
}
}

@@ -925,10 +916,7 @@
// if the member is a method, and is non-synthetic, check
whether it's better than
// our current best match, and if so, use it as our new
best match
if (e.sym.kind == Kinds.MTH && (e.sym.flags_field &
Flags.SYNTHETIC) == 0) {
- MethodSymbol msym = (MethodSymbol)e.sym;
- if (msym.params.length() == atypes.length()) {
- bestSoFar = selectBest(env, site, atypes, tatypes,
msym, bestSoFar);
- }
+ bestSoFar = selectBest(env, site, atypes, tatypes,
e.sym, bestSoFar);
}
}
//- System.out.println(" - " + bestSoFar);
@@ -959,7 +947,12 @@
protected Symbol selectBest (Env<AttrContext> env, Type site,
List<Type> atypes,
List<Type> tatypes, Symbol candidate,
Symbol bestSoFar)
{
- if (bestSoFar == AMBIGUOUS) {
+ // if the arity of the candidate does not match the supplied
parameters, or...
+ // (TODO: handle varargs)
+ if (candidate.type.asMethodType().argtypes.length() !=
atypes.length() ||
+ // ...we've already matched too many methods
+ bestSoFar == AMBIGUOUS) {
+ // return our existing best candidate (which may be the
AMBIGUOUS failure symbol)
return bestSoFar;
} else if (candidate.kind < bestSoFar.kind) {
return candidate;
@@ -1059,10 +1052,16 @@
@Override public <R, P> R accept(ElementVisitor<R, P> v, P p) {
throw new AssertionError();
}
+ @Override public boolean exists() {
+ return false;
+ }
};
protected static final Symbol AMBIGUOUS = new Symbol(Kinds.AMBIGUOUS,
0, null, null, null) {
@Override public <R, P> R accept(ElementVisitor<R, P> v, P p) {
throw new AssertionError();
}
+ @Override public boolean exists() {
+ return false;
+ }
};
}
=======================================
--- /src/test/java/org/ductilej/dtests/FindStaticMethodTest.java Mon Nov 29
16:15:31 2010
+++ /src/test/java/org/ductilej/dtests/FindStaticMethodTest.java Mon Nov 29
16:43:11 2010
@@ -3,6 +3,8 @@

package org.ductilej.dtests;

+import static java.lang.Integer.valueOf;
+
import org.junit.Test;
import static org.junit.Assert.*;

@@ -40,4 +42,12 @@
{
callStaticTests();
}
-}
+
+ @Test public void testNamedImportFinding ()
+ {
+ Object number = "FFCC";
+ // valueOf takes a string (and has two single argument overloaded
variants), but we should
+ // find the two argument variant even though one of its argument
types is invalid
+ assertEquals(0xFFCC, valueOf(number, 16));
+ }
+}