azalea/fixminer_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the bug of canonicalizing variable names.

Browse Source
This commit is contained in:
Kui LIU
2017-08-03 15:39:46 +02:00
parent 371c062e37
commit fd81abc4cb
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/gumtree/regroup/SimplifyTree.java
+27 -2
View File
@@ -115,12 +115,18 @@ public class SimplifyTree {
if (astNode.endsWith("Type")) { if (astNode.endsWith("Type")) {
simpleTree.setLabel(canonicalizeTypeStr(label).replaceAll(" ", "")); simpleTree.setLabel(canonicalizeTypeStr(label).replaceAll(" ", ""));
} else { } else {
if ((astNode.equals("SimpleName") || astNode.equals("MethodInvocation")) && label.startsWith("MethodName:")) {
label = label.substring(11);
simpleTree.setNodeType("MethodName");
simpleTree.setLabel(label);
} else {
simpleTree.setLabel(astNode);
}
List<SimpleTree> subTrees = new ArrayList<>(); List<SimpleTree> subTrees = new ArrayList<>();
for (ITree child : children) { for (ITree child : children) {
subTrees.add(canonicalizeSourceCodeTree(child, simpleTree)); subTrees.add(canonicalizeSourceCodeTree(child, simpleTree));
} }
simpleTree.setChildren(subTrees); simpleTree.setChildren(subTrees);
simpleTree.setLabel(astNode);
} }
} else { } else {
if (astNode.endsWith("Name")) { if (astNode.endsWith("Name")) {
@@ -147,6 +153,12 @@ public class SimplifyTree {
simpleTree.setNodeType(astNode); simpleTree.setNodeType(astNode);
if (astNode.endsWith("Type")) { if (astNode.endsWith("Type")) {
simpleTree.setLabel(canonicalizeTypeStr(label).replaceAll(" ", "")); simpleTree.setLabel(canonicalizeTypeStr(label).replaceAll(" ", ""));
} else if (astNode.startsWith("Type")) {
simpleTree.setLabel(canonicalizeTypeStr(label).replaceAll(" ", ""));
} else if (astNode.equals("MethodInvocation") && label.startsWith("MethodName:")) {
label = label.substring(11);
simpleTree.setNodeType("MethodName");
simpleTree.setLabel(label);
} else { } else {
simpleTree.setLabel(label.replaceAll(" ", "")); simpleTree.setLabel(label.replaceAll(" ", ""));
} }
@@ -189,9 +201,22 @@ public class SimplifyTree {
matchStr = matchStatements(parentType, parent, label); matchStr = matchStatements(parentType, parent, label);
} else if (parentType == 55) { // TypeDeclaration: Class Declaration } else if (parentType == 55) { // TypeDeclaration: Class Declaration
List<ITree> children = parent.getChildren(); List<ITree> children = parent.getChildren();
for (ITree child : children) { int index = children.indexOf(tree);
for (int i = index - 1; i >=0; i --) {
ITree child = children.get(i);
if (child.getType() == 23) { // FieldDeclaration if (child.getType() == 23) { // FieldDeclaration
matchStr = matchVariableDeclarationExpression(child, label); matchStr = matchVariableDeclarationExpression(child, label);
if (matchStr != null) break;
}
}
} else if (parentType == 8) { // Block body
List<ITree> children = parent.getChildren();
int index = children.indexOf(tree);
for (int i = index - 1; i >=0; i --) {
ITree child = children.get(i);
if (child.getType() == 60) { // VariableDeclarationStatement
matchStr = matchVariableDeclarationExpression(child, label);
if (matchStr != null) break;
} }
} }
} }