review: fix regression due to #2009

src/main/java/spoon/template/BlockTemplate.java

@@ -48,7 +48,10 @@ public BlockTemplate() {
 
 	public CtBlock<?> apply(CtType<?> targetType) {
 		CtClass<? extends BlockTemplate> c = Substitution.getTemplateCtClass(targetType, this);
-		return Substitution.substitute(targetType, this, getBlock(c));
+		CtBlock<?> result = Substitution.substitute(targetType, this, getBlock(c));
+		// removing it from its parent
+		result.delete();
+		return result;
 	}
 
 	public Void S() {

src/main/java/spoon/template/ExpressionTemplate.java

@@ -65,7 +65,9 @@ public ExpressionTemplate() {
 	public CtExpression<T> apply(CtType<?> targetType) {
 		CtClass<? extends ExpressionTemplate<?>> c = Substitution.getTemplateCtClass(targetType, this);
 		CtBlock<?> b = Substitution.substitute(targetType, this, getExpressionBlock(c));
-		return ((CtReturn<T>) b.getStatements().get(0)).getReturnedExpression();
+		CtExpression<T> returnedExpression = ((CtReturn<T>) b.getStatements().get(0)).getReturnedExpression();
+		returnedExpression.setParent(null);
+		return returnedExpression;
 	}
 
 	public T S() {

src/main/java/spoon/template/StatementTemplate.java

@@ -50,7 +50,13 @@ public CtStatement apply(CtType<?> targetType) {
 		if (statements.size() > 1) {
 			throw new SpoonException("StatementTemplate cannot return more then one statement");
 		}
-		return statements.isEmpty() ? null : statements.get(0);
+
+		if (statements.size() == 1) {
+			statements.get(0).setParent(null);
+			return statements.get(0);
+		}
+
+		return null;
 	}
 
 	public Void S() {

src/test/java/spoon/test/template/TemplateInvocationSubstitutionTest.java

@@ -1,6 +1,8 @@
 package spoon.test.template;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
@@ -43,8 +45,12 @@ public void testInvocationSubstitutionByExpression() throws Exception {
 
 		CtClass<?> resultKlass = factory.Class().create("Result");
 		CtBlock<?> result = new InvocationSubstitutionByExpressionTemplate(factory.createLiteral("abc")).apply(resultKlass);
+
 		assertEquals("java.lang.System.out.println(\"abc\".substring(1))", result.getStatement(0).toString());
 		assertEquals("java.lang.System.out.println(\"abc\".substring(1))", result.getStatement(1).toString());
+
+		// contract: the result of the template has no parent, and can be put anywhere in an AST
+		assertFalse(result.isParentInitialized());
 	}
 
 	@Test

src/test/java/spoon/test/template/TemplateTest.java

@@ -811,6 +811,7 @@ public void testExpressionTemplate() throws Exception {
 
 		CtClass<?> resultKlass = factory.Class().create("Result");
 		CtExpression result = new AnExpressionTemplate(factory.createCodeSnippetExpression("\"Spoon is cool!\"")).apply(resultKlass);
+		assertFalse(result.isParentInitialized());
 		assertEquals("new java.lang.String(\"Spoon is cool!\")", result.toString());
 	}