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

fix regroup

Browse Source
This commit is contained in:
Haoye TIAN
2020-02-06 17:01:21 +01:00
parent 381bc04e61
commit e8b1ba7b23
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/fixminer/akka/ediff/HierarchicalRegrouperForC.java
+25 -4
View File
@@ -50,7 +50,7 @@ public class HierarchicalRegrouperForC {
continue; continue;
} }
Action parentAct = findParentAction(act, actions); Action parentAct = findParentAction(act, actions);
if (parentAct == null) { if (parentAct == null) {
actionSet = createActionSet(act, parentAct, null); actionSet = createActionSet(act, parentAct, null);
actionSets.add(actionSet); actionSets.add(actionSet);
@@ -78,13 +78,34 @@ public class HierarchicalRegrouperForC {
// if (astNodeType.endsWith("TypeDeclaration") || astNodeType.endsWith("FieldDeclaration") || astNodeType.endsWith("EnumDeclaration") || // if (astNodeType.endsWith("TypeDeclaration") || astNodeType.endsWith("FieldDeclaration") || astNodeType.endsWith("EnumDeclaration") ||
// astNodeType.endsWith("MethodDeclaration") || astNodeType.endsWith("Statement") || // astNodeType.endsWith("MethodDeclaration") || astNodeType.endsWith("Statement") ||
// astNodeType.endsWith("ConstructorInvocation") || astNodeType.endsWith("CatchClause") || astNodeType.endsWith("SwitchCase")) { // astNodeType.endsWith("ConstructorInvocation") || astNodeType.endsWith("CatchClause") || astNodeType.endsWith("SwitchCase")) {
if (isStatement(actSet.getNode())) { // if (isStatement(actSet.getNode())) {
reActionSets.add(actSet); reActionSets.add(actSet);
} // }
// } // }
} }
} }
return reActionSets;
List<HierarchicalActionSet> re2ActionSets = new ArrayList<>();
for (HierarchicalActionSet act:reActionSets){
if (!act.getAction().getClass().equals(Update.class))
re2ActionSets.add(act);
if (((Update) act.getAction()).getflag() == true)
re2ActionSets.add(act);
findRealAction(act, re2ActionSets);
}
return re2ActionSets;
}
private void findRealAction(HierarchicalActionSet act, List<HierarchicalActionSet> re2ActionSets) {
if (!act.getAction().getClass().equals(Update.class) || ((Update) act.getAction()).getflag() == true){
re2ActionSets.add(act);
return;
}
for (HierarchicalActionSet a:act.getSubActions()){
findRealAction(a, re2ActionSets);
}
} }
private HierarchicalActionSet createActionSet(Action act, Action parentAct, HierarchicalActionSet parent) { private HierarchicalActionSet createActionSet(Action act, Action parentAct, HierarchicalActionSet parent) {