Fix many small bugs with double usage of AST nodes in different subtr…

…ees, (#645)
INRIA · May 9, 2016 · 3af47b1 · 3af47b1
1 parent 603e161
commit 3af47b1
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 20 deletions.
diff --git a/src/main/java/spoon/reflect/factory/CodeFactory.java b/src/main/java/spoon/reflect/factory/CodeFactory.java
@@ -139,7 +139,7 @@ public <T> CtFieldAccess<Class<T>> createClassAccess(CtTypeReference<T> type) {
 		fieldReference.setDeclaringType(type);
 
 		CtFieldRead<Class<T>> fieldRead = factory.Core().createFieldRead();
-		fieldRead.setType(classType);
+		fieldRead.setType(factory.Core().clone(classType));
 		fieldRead.setVariable(fieldReference);
 		fieldRead.setTarget(typeAccess);
 		return fieldRead;
@@ -159,7 +159,7 @@ public <T> CtConstructorCall<T> createConstructorCall(CtTypeReference<T> type, C
 		CtExecutableReference<T> executableReference = factory.Core()
 				.createExecutableReference();
 		executableReference.setType(type);
-		executableReference.setDeclaringType(type);
+		executableReference.setDeclaringType(factory.Core().clone(type));
 		executableReference.setSimpleName(CtExecutableReference.CONSTRUCTOR_NAME);
 		List<CtTypeReference<?>> typeReferences = new ArrayList<CtTypeReference<?>>();
 		for (int i = 0; i < parameters.length; i++) {
@@ -285,7 +285,7 @@ public <T> CtLocalVariable<T> createLocalVariable(CtTypeReference<T> type, Strin
 	 */
 	public <T> CtLocalVariableReference<T> createLocalVariableReference(CtLocalVariable<T> localVariable) {
 		CtLocalVariableReference<T> ref = factory.Core().createLocalVariableReference();
-		ref.setType(localVariable.getType());
+		ref.setType(factory.Core().clone(localVariable.getType()));
 		ref.setSimpleName(localVariable.getSimpleName());
 		ref.setDeclaration(localVariable);
 		return ref;
@@ -368,7 +368,7 @@ public <T> CtVariableAccess<T> createVariableRead(CtVariableReference<T> variabl
 		} else {
 			va = factory.Core().createVariableRead();
 		}
-		return va.setVariable(variable).setType(variable.getType());
+		return va.setVariable(variable).setType(factory.Core().clone(variable.getType()));
 	}
 
 	/**

diff --git a/src/main/java/spoon/reflect/factory/ConstructorFactory.java b/src/main/java/spoon/reflect/factory/ConstructorFactory.java
@@ -152,7 +152,7 @@ public <T> CtExecutableReference<T> createReference(CtConstructor<T> c) {
 	 */
 	public <T> CtExecutableReference<T> createReference(Constructor<T> constructor) {
 		CtTypeReference<T> type = factory.Type().createReference(constructor.getDeclaringClass());
-		return createReference(type, type, CtExecutableReference.CONSTRUCTOR_NAME,
+		return createReference(type, factory.Core().clone(type), CtExecutableReference.CONSTRUCTOR_NAME,
 				factory.Type().createReferences(Arrays.asList(constructor.getParameterTypes())));
 	}
 
@@ -166,11 +166,11 @@ public <T> CtExecutableReference<T> createReference(Constructor<T> constructor)
 	public <T> CtExecutableReference<T> createReference(CtTypeReference<T> type, CtExpression<?>...parameters) {
 		final CtExecutableReference<T> executableReference = factory.Core().createExecutableReference();
 		executableReference.setType(type);
-		executableReference.setDeclaringType(type);
+		executableReference.setDeclaringType(factory.Core().clone(type));
 		executableReference.setSimpleName(CtExecutableReference.CONSTRUCTOR_NAME);
 		List<CtTypeReference<?>> typeReferences = new ArrayList<CtTypeReference<?>>();
 		for (CtExpression<?> parameter : parameters) {
-			typeReferences.add(parameter.getType());
+			typeReferences.add(factory.Core().clone(parameter.getType()));
 		}
 		executableReference.setParameters(typeReferences);
 		return executableReference;

diff --git a/src/main/java/spoon/reflect/factory/ExecutableFactory.java b/src/main/java/spoon/reflect/factory/ExecutableFactory.java
@@ -97,12 +97,12 @@ public <T> CtExecutableReference<T> createReference(CtExecutable<T> e) {
 		CtTypeReference<?> refs[] = new CtTypeReference[e.getParameters().size()];
 		int i = 0;
 		for (CtParameter<?> param : e.getParameters()) {
-			refs[i++] = param.getType();
+			refs[i++] = factory.Core().clone(param.getType());
 		}
 		if (e instanceof CtMethod) {
-			return createReference(((CtMethod<T>) e).getDeclaringType().getReference(), ((CtMethod<T>) e).getType(), e.getSimpleName(), refs);
+			return createReference(((CtMethod<T>) e).getDeclaringType().getReference(), factory.Core().clone(((CtMethod<T>) e).getType()), e.getSimpleName(), refs);
 		}
-		return createReference(((CtConstructor<T>) e).getDeclaringType().getReference(), ((CtConstructor<T>) e).getType(), CtExecutableReference.CONSTRUCTOR_NAME, refs);
+		return createReference(((CtConstructor<T>) e).getDeclaringType().getReference(), factory.Core().clone(((CtConstructor<T>) e).getType()), CtExecutableReference.CONSTRUCTOR_NAME, refs);
 	}
 
 	/**

diff --git a/src/main/java/spoon/reflect/factory/TypeFactory.java b/src/main/java/spoon/reflect/factory/TypeFactory.java
@@ -391,10 +391,11 @@ public CtTypeParameterReference createTypeParameterReference(String name, List<C
 	 */
 	public <T> CtIntersectionTypeReference<T> createIntersectionTypeReference(List<CtTypeReference<?>> bounds) {
 		final CtIntersectionTypeReference<T> intersectionRef = factory.Core().createIntersectionTypeReference();
-		intersectionRef.setSimpleName(bounds.get(0).getSimpleName());
-		intersectionRef.setDeclaringType(bounds.get(0).getDeclaringType());
-		intersectionRef.setPackage(bounds.get(0).getPackage());
-		intersectionRef.setActualTypeArguments(bounds.get(0).getActualTypeArguments());
+		CtTypeReference<?> firstBound = factory.Core().clone(bounds.get(0));
+		intersectionRef.setSimpleName(firstBound.getSimpleName());
+		intersectionRef.setDeclaringType(firstBound.getDeclaringType());
+		intersectionRef.setPackage(firstBound.getPackage());
+		intersectionRef.setActualTypeArguments(firstBound.getActualTypeArguments());
 		intersectionRef.setBounds(bounds);
 		return intersectionRef;
 	}

diff --git a/src/main/java/spoon/reflect/visitor/AstParentConsistencyChecker.java b/src/main/java/spoon/reflect/visitor/AstParentConsistencyChecker.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2006-2015 INRIA and contributors
+ * Spoon - http://spoon.gforge.inria.fr/
+ *
+ * This software is governed by the CeCILL-C License under French law and
+ * abiding by the rules of distribution of free software. You can use, modify
+ * and/or redistribute the software under the terms of the CeCILL-C license as
+ * circulated by CEA, CNRS and INRIA at http://www.cecill.info.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the CeCILL-C License for more details.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL-C license and that you accept its terms.
+ */
+package spoon.reflect.visitor;
+
+import spoon.reflect.declaration.CtElement;
+
+public class AstParentConsistencyChecker extends CtScanner {
+
+	private CtElement parent;
+	@Override
+	public void scan(CtElement element) {
+		if (element == null) {
+			return;
+		}
+		if (parent != null && element.getParent() != parent) {
+			throw new IllegalStateException(toDebugString(element)
+					+ "is set as child of\n" + toDebugString(element.getParent())
+					+ "however it is visited as a child of\n" + toDebugString(parent));
+		}
+		CtElement parent = this.parent;
+		this.parent = element;
+		super.scan(element);
+		this.parent = parent;
+	}
+
+	private static String toDebugString(CtElement e) {
+		return "Element: " + e + "\nSignature: " + e.getSignature() + "\nClass: " + e.getClass() + "\n";
+	}
+}
diff --git a/src/main/java/spoon/reflect/visitor/CtScanner.java b/src/main/java/spoon/reflect/visitor/CtScanner.java
@@ -565,6 +565,7 @@ public <T> void visitCtConstructorCall(final CtConstructorCall<T> ctConstructorC
 		scan(ctConstructorCall.getTypeCasts());
 		scan(ctConstructorCall.getExecutable());
 		scan(ctConstructorCall.getTarget());
+		scan(ctConstructorCall.getActualTypeArguments());
 		scan(ctConstructorCall.getArguments());
 		scan(ctConstructorCall.getComments());
 		exit(ctConstructorCall);
@@ -573,10 +574,10 @@ public <T> void visitCtConstructorCall(final CtConstructorCall<T> ctConstructorC
 	public <T> void visitCtNewClass(final CtNewClass<T> newClass) {
 		enter(newClass);
 		scan(newClass.getAnnotations());
-		scan(newClass.getType());
 		scan(newClass.getTypeCasts());
 		scan(newClass.getExecutable());
 		scan(newClass.getTarget());
+		scan(newClass.getActualTypeArguments());
 		scan(newClass.getArguments());
 		scan(newClass.getAnonymousClass());
 		scan(newClass.getComments());

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java b/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java
@@ -49,6 +49,7 @@
 import spoon.reflect.factory.Factory;
 import spoon.reflect.visitor.DefaultJavaPrettyPrinter;
 import spoon.reflect.visitor.Filter;
+import spoon.reflect.visitor.AstParentConsistencyChecker;
 import spoon.reflect.visitor.PrettyPrinter;
 import spoon.reflect.visitor.Query;
 import spoon.support.QueueProcessingManager;
@@ -130,9 +131,14 @@ public boolean build(JDTBuilder builder) {
 		t = System.currentTimeMillis();
 		templateSuccess = buildTemplates(builder);
 		factory.getEnvironment().debugMessage("built in " + (System.currentTimeMillis() - t) + " ms");
+		checkModel();
 		return srcSuccess && templateSuccess;
 	}
 
+	private void checkModel() {
+		factory.getModel().getRootPackage().accept(new AstParentConsistencyChecker());
+	}
+
 	@Override
 	public boolean compile() {
 		initInputClassLoader();

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTTreeBuilder.java b/src/main/java/spoon/support/compiler/jdt/JDTTreeBuilder.java
@@ -2095,7 +2095,7 @@ private <T, E extends CtExpression<?>> CtExecutableReferenceExpression<T, E> cre
 			executableReference.setSimpleName(new String(referenceExpression.selector));
 			executableReference.setDeclaringType(references.getTypeReference(referenceExpression.lhs.resolvedType));
 		}
-		executableReference.setType((CtTypeReference<T>) executableReference.getDeclaringType());
+		executableReference.setType(factory.Core().clone((CtTypeReference<T>) executableReference.getDeclaringType()));
 		executableRef.setExecutable(executableReference);
 		return executableRef;
 	}
@@ -3272,7 +3272,7 @@ public boolean onAccess(char[][] tokens, int index) {
 				va = factory.Core().createVariableRead();
 			}
 			va.setVariable(references.getVariableReference((VariableBinding) qualifiedNameReference.binding));
-			va.setType(va.getVariable().getType());
+			va.setType(factory.Core().clone(va.getVariable().getType()));
 			if (qualifiedNameReference.otherBindings != null) {
 				int i = 0; //positions index;
 				int sourceStart = (int) (positions[0] >>> 32);

diff --git a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
@@ -424,9 +424,9 @@ public <T> void visitCtNewClass(CtNewClass<T> newClass) {
 			final QualifiedAllocationExpression node = (QualifiedAllocationExpression) jdtTreeBuilder.context.stack.peek().node;
 			final ReferenceBinding[] referenceBindings = node.resolvedType == null ? null : node.resolvedType.superInterfaces();
 			if (referenceBindings != null && referenceBindings.length > 0) {
-				((CtClass<?>) child).addSuperInterface(newClass.getType());
+				((CtClass<?>) child).addSuperInterface(child.getFactory().Core().clone(newClass.getType()));
 			} else if (newClass.getType() != null) {
-				((CtClass<?>) child).setSuperclass(newClass.getType());
+				((CtClass<?>) child).setSuperclass(child.getFactory().Core().clone(newClass.getType()));
 			}
 			return;
 		}

diff --git a/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java b/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java
@@ -1486,16 +1486,17 @@ public <T> void visitCtConstructorCall(final spoon.reflect.code.CtConstructorCal
 		replaceInListIfExist(ctConstructorCall.getTypeCasts(), new spoon.support.visitor.replace.ReplacementVisitor.CtExpressionTypeCastsReplaceListener(ctConstructorCall));
 		replaceElementIfExist(ctConstructorCall.getExecutable(), new spoon.support.visitor.replace.ReplacementVisitor.CtAbstractInvocationExecutableReplaceListener(ctConstructorCall));
 		replaceElementIfExist(ctConstructorCall.getTarget(), new spoon.support.visitor.replace.ReplacementVisitor.CtTargetedExpressionTargetReplaceListener(ctConstructorCall));
+		replaceInListIfExist(ctConstructorCall.getActualTypeArguments(), new spoon.support.visitor.replace.ReplacementVisitor.CtGenericElementReferenceActualTypeArgumentsReplaceListener(ctConstructorCall));
 		replaceInListIfExist(ctConstructorCall.getArguments(), new spoon.support.visitor.replace.ReplacementVisitor.CtAbstractInvocationArgumentsReplaceListener(ctConstructorCall));
 		replaceInListIfExist(ctConstructorCall.getComments(), new spoon.support.visitor.replace.ReplacementVisitor.CtElementCommentsReplaceListener(ctConstructorCall));
 	}
 
 	public <T> void visitCtNewClass(final spoon.reflect.code.CtNewClass<T> newClass) {
 		replaceInListIfExist(newClass.getAnnotations(), new spoon.support.visitor.replace.ReplacementVisitor.CtElementAnnotationsReplaceListener(newClass));
-		replaceElementIfExist(newClass.getType(), new spoon.support.visitor.replace.ReplacementVisitor.CtTypedElementTypeReplaceListener(newClass));
 		replaceInListIfExist(newClass.getTypeCasts(), new spoon.support.visitor.replace.ReplacementVisitor.CtExpressionTypeCastsReplaceListener(newClass));
 		replaceElementIfExist(newClass.getExecutable(), new spoon.support.visitor.replace.ReplacementVisitor.CtAbstractInvocationExecutableReplaceListener(newClass));
 		replaceElementIfExist(newClass.getTarget(), new spoon.support.visitor.replace.ReplacementVisitor.CtTargetedExpressionTargetReplaceListener(newClass));
+		replaceInListIfExist(newClass.getActualTypeArguments(), new spoon.support.visitor.replace.ReplacementVisitor.CtGenericElementReferenceActualTypeArgumentsReplaceListener(newClass));
 		replaceInListIfExist(newClass.getArguments(), new spoon.support.visitor.replace.ReplacementVisitor.CtAbstractInvocationArgumentsReplaceListener(newClass));
 		replaceElementIfExist(newClass.getAnonymousClass(), new spoon.support.visitor.replace.ReplacementVisitor.CtNewClassAnonymousClassReplaceListener(newClass));
 		replaceInListIfExist(newClass.getComments(), new spoon.support.visitor.replace.ReplacementVisitor.CtElementCommentsReplaceListener(newClass));