fix(noclasspath): Mark target as implicit if it's an anonymous class. (…

…Closes #707)
INRIA · Jul 4, 2016 · cffd98e · cffd98e
1 parent b37859c
commit cffd98e
Show file tree

Hide file tree

Showing 4 changed files with 2,667 additions and 1 deletion.
diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -2094,6 +2094,9 @@ public void visitCtCircularTypeReference(CtCircularTypeReference reference) {
 
  @Override
  public <T> void visitCtTypeAccess(CtTypeAccess<T> typeAccess) {
+ if (typeAccess.isImplicit()) {
+ return;
+ }
  enterCtExpression(typeAccess);
  scan(typeAccess.getAccessedType());
  exitCtExpression(typeAccess);

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTTreeBuilder.java b/src/main/java/spoon/support/compiler/jdt/JDTTreeBuilder.java
@@ -2921,6 +2921,9 @@ public boolean visit(MessageSend messageSend, BlockScope scope) {
  // We are in a static complex in noclasspath mode.
  if (inv.getExecutable() != null && inv.getExecutable().getDeclaringType() != null) {
  final CtTypeAccess ta = factory.Code().createTypeAccess(inv.getExecutable().getDeclaringType());
+ if (ta.getAccessedType().isAnonymous()) {
+ ta.setImplicit(true);
+ }
  inv.setTarget(ta);
  }
  if (messageSend.expectedType() != null) {
@@ -2971,7 +2974,11 @@ public boolean visit(MessageSend messageSend, BlockScope scope) {
  context.enter(inv, messageSend);
  if (messageSend.receiver.isImplicitThis()) {
  if (inv.getExecutable().getDeclaringType() != null && inv.getExecutable().isStatic()) {
- inv.setTarget(factory.Code().createTypeAccess(inv.getExecutable().getDeclaringType()));
+ final CtTypeAccess<?> typeAccess = factory.Code().createTypeAccess(inv.getExecutable().getDeclaringType());
+ if (typeAccess.getAccessedType().isAnonymous()) {
+ typeAccess.setImplicit(true);
+ }
+ inv.setTarget(typeAccess);
  } else if (inv.getExecutable().getDeclaringType() != null && !inv.getExecutable().isStatic()) {
  messageSend.receiver.traverse(this, scope);
  if (inv.getTarget() instanceof CtThisAccess) {

diff --git a/src/test/java/spoon/test/visibility/VisibilityTest.java b/src/test/java/spoon/test/visibility/VisibilityTest.java
@@ -7,7 +7,9 @@
 import spoon.compiler.SpoonCompiler;
 import spoon.reflect.code.CtBinaryOperator;
 import spoon.reflect.code.CtFieldAccess;
+import spoon.reflect.code.CtInvocation;
 import spoon.reflect.declaration.CtClass;
+import spoon.reflect.declaration.CtField;
 import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.factory.Factory;
@@ -23,6 +25,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static spoon.testing.utils.ModelUtils.build;
 import static spoon.testing.utils.ModelUtils.canBeBuilt;
 
@@ -134,4 +137,25 @@ public boolean matches(CtFieldReference<?> reference) {
  assertEquals(tacos, field.getDeclaringType().getDeclaration());
  assertEquals(tacos.getFields().get(0), field.getDeclaration());
  }
+
+ @Test
+ public void testInvocationVisibilityInFieldDeclaration() throws Exception {
+ final Launcher launcher = new Launcher();
+ launcher.getEnvironment().setNoClasspath(true);
+ launcher.addInputResource("./src/test/resources/noclasspath/Solver.java");
+ launcher.setSourceOutputDirectory("./target/spooned");
+ launcher.buildModel();
+
+ final CtType<Object> aSolver = launcher.getFactory().Type().get("org.sat4j.minisat.core.Solver");
+ final CtField<?> lbdTimerField = aSolver.getField("lbdTimer");
+ final CtInvocation<?> ctInvocation = lbdTimerField.getElements(new TypeFilter<CtInvocation<?>>(CtInvocation.class) {
+ @Override
+ public boolean matches(CtInvocation<?> element) {
+ return "bound".equals(element.getExecutable().getSimpleName()) && super.matches(element);
+ }
+ }).get(0);
+ assertNotNull(ctInvocation.getTarget());
+ assertTrue(ctInvocation.getTarget().isImplicit());
+ assertEquals("bound()", ctInvocation.toString());
+ }
 }