Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug related to "insertBefore()" and "getSignature()" #450

Merged
merged 3 commits into from
Dec 9, 2015
Merged

Fix bug related to "insertBefore()" and "getSignature()" #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b70644f
Fix bug related to "insertBefore()" and "getSignature()"
Dec 8, 2015
34c7300
Fix insertAfter and insertEnd
tdurieux Dec 9, 2015
f278230
Merge pull request #1 from tdurieux/fix-insert
maxcleme Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/main/java/spoon/support/reflect/code/CtStatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@ void insert(CtBlock<?> block, CtStatementList statementsToBeInserted) {
}

@Override
void insertFromFirstStatement(CtBlock<?> block, CtStatement target, CtStatementList statementsToBeInserted) {
int indexOfTargetElement = block.getStatements().indexOf(target);
void insertFromFirstStatement(CtBlock<?> block, CtStatement target,
CtStatementList statementsToBeInserted) {
// check the reference not the equality
int indexOfTargetElement = indexOfReference(block.getStatements(), target);
for (CtStatement s : statementsToBeInserted) {
s.setParent(block);
block.getStatements().add(indexOfTargetElement++, s);
Expand All @@ -192,7 +194,8 @@ void insertFromFirstStatement(CtBlock<?> block, CtStatement target, CtStatementL

@Override
<T extends CtElement> void insertFromLastStatement(List<T> statements, CtStatement target, CtStatementList statementsToBeInserted) {
int indexOfTargetElement = statements.indexOf(target);
// check the reference not the equality
int indexOfTargetElement = indexOfReference(statements, target);
for (int j = statementsToBeInserted.getStatements().size() - 1; j >= 0; j--) {
final CtStatement newStatement = statementsToBeInserted.getStatements().get(j);
newStatement.setParent(statements.get(indexOfTargetElement).getParent());
Expand All @@ -208,7 +211,8 @@ void insert(CtBlock<?> block, CtStatementList statementsToBeInserted) {

@Override
void insertFromFirstStatement(CtBlock<?> block, CtStatement target, CtStatementList statementsToBeInserted) {
int indexOfTargetElement = block.getStatements().indexOf(target);
// check the reference not the equality
int indexOfTargetElement = indexOfReference(block.getStatements(), target);
for (CtStatement s : statementsToBeInserted) {
s.setParent(block);
block.getStatements().add(++indexOfTargetElement, s);
Expand All @@ -217,7 +221,7 @@ void insertFromFirstStatement(CtBlock<?> block, CtStatement target, CtStatementL

@Override
<T extends CtElement> void insertFromLastStatement(List<T> statements, CtStatement target, CtStatementList statementsToBeInserted) {
int indexOfTargetElement = statements.indexOf(target) + 1;
int indexOfTargetElement = indexOfReference(statements, target) + 1;
for (int j = statementsToBeInserted.getStatements().size() - 1; j >= 0; j--) {
final CtStatement newStatement = statementsToBeInserted.getStatements().get(j);
newStatement.setParent(target.getParent());
Expand All @@ -226,6 +230,17 @@ <T extends CtElement> void insertFromLastStatement(List<T> statements, CtStateme
}
};

public int indexOfReference(List statements, CtElement target) {
int indexOfTargetElement = -1;
// check the reference not the equality
for (int i = 0; i < statements.size(); i++) {
if (statements.get(i) == target) {
indexOfTargetElement = i;
break;
}
}
return indexOfTargetElement;
}
abstract void insert(CtBlock<?> block, CtStatementList statementsToBeInserted);
abstract void insertFromFirstStatement(CtBlock<?> block, CtStatement target, CtStatementList statementsToBeInserted);
abstract <T extends CtElement> void insertFromLastStatement(List<T> statements, CtStatement target, CtStatementList statementsToBeInserted);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/spoon/support/visitor/SignaturePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ public void visitCtBreak(CtBreak breakStatement) {
public <E> void visitCtCase(CtCase<E> caseStatement) {
write("case (");
scan(caseStatement.getCaseExpression());
for (CtStatement statement : caseStatement.getStatements()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to scan(caseStatement.getStatements())

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no scan method for List

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to |scan(caseStatement.getStatements())|

|it's not equivalent, the scan does not work, we trued it first :-)|

scan(statement);
}
write(")");
}

Expand Down
83 changes: 68 additions & 15 deletions src/test/java/spoon/test/processing/ProcessingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,97 @@
import org.junit.Test;
import spoon.Launcher;
import spoon.SpoonException;
import spoon.reflect.code.CtCodeSnippetStatement;
import spoon.reflect.code.CtSwitch;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtConstructor;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.visitor.filter.TypeFilter;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import static spoon.test.TestUtils.build;

public class ProcessingTest {

@Test
public void testInsertBegin() throws Exception {
CtClass<?> type = build("spoon.test.processing",
"SampleForInsertBefore");
CtClass<?> type = build("spoon.test.processing", "SampleForInsertBefore");
for (CtMethod<?> meth : type.getMethods()) {
int i = meth.getBody().getStatements().size();
meth.getBody().insertBegin(
type.getFactory().Code()
.createCodeSnippetStatement("int i = 0;"));
meth.getBody().insertBegin(type.getFactory().Code()
.createCodeSnippetStatement("int i = 0;"));
assertEquals("insert failed for method " + meth.getSimpleName(),
i + 1, meth.getBody().getStatements().size());
assertEquals("insert failed for method " + meth.getSimpleName(),
"int i = 0;", meth.getBody().getStatement(0).toString());
}
for (CtConstructor<?> constructor : type.getConstructors()) {
int i = constructor.getBody().getStatements().size();
constructor.getBody().insertBegin(
type.getFactory().Code()
.createCodeSnippetStatement("int i = 0;"));
assertEquals(
"insert failed for constructor "
+ constructor.getSimpleName(), i + 1, constructor
.getBody().getStatements().size());
assertEquals(
"insert failed for constructor "
+ constructor.getSimpleName(), "int i = 0;",
constructor.getBody().insertBegin(type.getFactory().Code()
.createCodeSnippetStatement("int i = 0;"));
assertEquals("insert failed for constructor " + constructor.getSimpleName(),
i + 1,
constructor.getBody().getStatements().size());
assertEquals("insert failed for constructor " + constructor.getSimpleName(),
"int i = 0;",
constructor.getBody().getStatement(1).toString());
}

CtConstructor<?> constructor = type.getConstructor(type.getFactory().Type().INTEGER_PRIMITIVE);
String myBeforeStatementAsString = "int before";
for (CtSwitch<?> ctSwitch : constructor.getElements(new TypeFilter<CtSwitch<?>>(CtSwitch.class))) {
ctSwitch.insertBefore(type.getFactory().Code()
.createCodeSnippetStatement(myBeforeStatementAsString));
}
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(3).toString());
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(5).toString());
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(7).toString());

assertFalse("switch should not be the same", constructor.getBody().getStatement(6).equals(constructor.getBody().getStatement(8)));
assertFalse("switch should not be the same", constructor.getBody().getStatement(6).toString().equals(constructor.getBody().getStatement(8).toString()));

}

@Test
public void testInsertEnd() throws Exception {
CtClass<?> type = build("spoon.test.processing", "SampleForInsertBefore");
for (CtMethod<?> meth : type.getMethods()) {
int i = meth.getBody().getStatements().size();
meth.getBody().insertEnd(type.getFactory().Code()
.createCodeSnippetStatement("int i = 0"));
assertEquals("insert failed for method " + meth.getSimpleName(),
i + 1, meth.getBody().getStatements().size());
assertEquals("insert failed for method " + meth.getSimpleName(),
"int i = 0", meth.getBody().getStatement(meth.getBody().getStatements().size() - 1).toString());
}
for (CtConstructor<?> constructor : type.getConstructors()) {
int i = constructor.getBody().getStatements().size();
constructor.getBody().insertEnd(type.getFactory().Code()
.createCodeSnippetStatement("int i = 0"));
assertEquals("insert failed for constructor " + constructor.getSimpleName(),
i + 1,
constructor.getBody().getStatements().size());
assertEquals("insert failed for constructor",
"int i = 0",
constructor.getBody().getStatement(constructor.getBody().getStatements().size() - 1).toString());
}

CtConstructor<?> constructor = type.getConstructor(type.getFactory().Type().INTEGER_PRIMITIVE);
String myBeforeStatementAsString = "int after";
for (CtSwitch<?> ctSwitch : constructor.getElements(new TypeFilter<CtSwitch<?>>(CtSwitch.class))) {
ctSwitch.insertAfter(type.getFactory().Code()
.createCodeSnippetStatement(myBeforeStatementAsString));
}
System.out.println(type);
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(3).toString());
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(5).toString());
assertEquals("insert has not been done at the right position", myBeforeStatementAsString, constructor.getBody().getStatement(7).toString());

assertFalse("switch should not be the same", constructor.getBody().getStatement(6).equals(constructor.getBody().getStatement(8)));
assertFalse("switch should not be the same", constructor.getBody().getStatement(6).toString().equals(constructor.getBody().getStatement(8).toString()));

}

@Test
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/spoon/test/processing/SampleForInsertBefore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@ public SampleForInsertBefore(int j) {
this(j, 0);
new Thread() {
};
switch (j) {
default:
break;
}
switch (j) {
default:
break;
}
switch (j) {
default: {
break;
}
}
}

public SampleForInsertBefore(int j, int k) {
Expand Down