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

Output AST diff with source code together.

Browse Source
This commit is contained in:
Kui LIU
2017-08-11 18:35:57 +02:00
parent 25faec0591
commit 4e200e0750
1 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
+56 -43
View File
@@ -29,6 +29,7 @@ public class FixedViolationHunkParser extends FixedViolationParser {
public FixedViolationHunkParser(File positionFile) { public FixedViolationHunkParser(File positionFile) {
setPositionFile(positionFile); setPositionFile(positionFile);
} }
@Override @Override
public void parseFixPatterns(File prevFile, File revFile, File diffentryFile) { public void parseFixPatterns(File prevFile, File revFile, File diffentryFile) {
// GumTree results // GumTree results
@@ -70,35 +71,35 @@ public class FixedViolationHunkParser extends FixedViolationParser {
for (Violation violation : selectedViolations) { for (Violation violation : selectedViolations) {
List<HierarchicalActionSet> hunkActionSets = violation.getActionSets(); List<HierarchicalActionSet> hunkActionSets = violation.getActionSets();
// Remove overlapped UPD and INS // // Remove overlapped UPD and INS, MOV
List<HierarchicalActionSet> addActions = new ArrayList<>(); // List<HierarchicalActionSet> addActions = new ArrayList<>();
List<HierarchicalActionSet> insertActions = new ArrayList<>(); // List<HierarchicalActionSet> insertActions = new ArrayList<>();
for (HierarchicalActionSet hunkActionSet : hunkActionSets) { // for (HierarchicalActionSet hunkActionSet : hunkActionSets) {
if (hunkActionSet.getActionString().startsWith("INS")) insertActions.add(hunkActionSet); // if (hunkActionSet.getActionString().startsWith("INS")) insertActions.add(hunkActionSet);
if (hunkActionSet.getActionString().startsWith("UPD")) addActions.add(hunkActionSet); // if (hunkActionSet.getActionString().startsWith("UPD")) addActions.add(hunkActionSet);
} // }
List<HierarchicalActionSet> selectedActionSets = new ArrayList<>(); // List<HierarchicalActionSet> selectedActionSets = new ArrayList<>();
for (HierarchicalActionSet hunkActionSet : hunkActionSets) { // for (HierarchicalActionSet hunkActionSet : hunkActionSets) {
if (insertActions.contains(hunkActionSet)) { // if (insertActions.contains(hunkActionSet)) {
boolean isIntersection = false; // boolean isIntersection = false;
int bugStartL1 = hunkActionSet.getBugStartLineNum(); // int bugStartL1 = hunkActionSet.getBugStartLineNum();
int bugEndL1 = hunkActionSet.getBugEndLineNum(); // int bugEndL1 = hunkActionSet.getBugEndLineNum();
for (HierarchicalActionSet addAction : addActions) { // for (HierarchicalActionSet addAction : addActions) {
int bugStartL = addAction.getBugStartLineNum(); // int bugStartL = addAction.getBugStartLineNum();
int bugEndL = addAction.getBugEndLineNum(); // int bugEndL = addAction.getBugEndLineNum();
if (bugEndL1 < bugStartL || bugStartL1 > bugEndL) { // if (bugEndL1 < bugStartL || bugStartL1 > bugEndL) {
continue; // continue;
} // }
isIntersection = true; // isIntersection = true;
break; // break;
} // }
if (!isIntersection) { // if (!isIntersection) {
selectedActionSets.add(hunkActionSet); // selectedActionSets.add(hunkActionSet);
} // }
continue; // continue;
} // }
selectedActionSets.add(hunkActionSet); // selectedActionSets.add(hunkActionSet);
} // }
// Range of buggy source code // Range of buggy source code
int bugStartLine = 0; int bugStartLine = 0;
@@ -115,15 +116,10 @@ public class FixedViolationHunkParser extends FixedViolationParser {
simpleTree.setNodeType("Block"); simpleTree.setNodeType("Block");
List<SimpleTree> children = new ArrayList<>(); List<SimpleTree> children = new ArrayList<>();
String astEditScripts = ""; String astEditScripts = "";
for (HierarchicalActionSet hunkActionSet : selectedActionSets) { for (HierarchicalActionSet hunkActionSet : hunkActionSets) {
SimplifyTree abstractIdentifier = new SimplifyTree(); if (hunkActionSet.getActionString().startsWith("INS")) {
abstractIdentifier.abstractTree(hunkActionSet); System.out.println();
SimpleTree simpleT = hunkActionSet.getSimpleTree(); }
if (simpleT == null) { // Failed to get the simple tree for INS actions.
continue;
}
children.add(simpleT);
/** /**
* Select edit scripts for deep learning. * Select edit scripts for deep learning.
* Edit scripts will be used to mine common fix patterns. * Edit scripts will be used to mine common fix patterns.
@@ -146,13 +142,22 @@ public class FixedViolationHunkParser extends FixedViolationParser {
} }
if (bugEndLine < actionBugEnd) bugEndLine = actionBugEnd; if (bugEndLine < actionBugEnd) bugEndLine = actionBugEnd;
if (fixEndLine < actionFixEnd) fixEndLine = actionFixEnd; if (fixEndLine < actionFixEnd) fixEndLine = actionFixEnd;
SimplifyTree abstractIdentifier = new SimplifyTree();
abstractIdentifier.abstractTree(hunkActionSet);
SimpleTree simpleT = hunkActionSet.getSimpleTree();
if (simpleT == null) { // Failed to get the simple tree for INS actions.
continue;
}
children.add(simpleT);
} }
if (children.size() == 0) continue; // if (children.size() == 0) continue;
boolean isInsert = false;
if (bugStartLine == 0) { if (bugStartLine == 0) {
bugStartLine = violation.getStartLineNum(); bugStartLine = violation.getStartLineNum();
if (bugEndLine < bugStartLine) bugEndLine = violation.getEndLineNum(); bugEndLine = violation.getEndLineNum();
isInsert = true;
} }
if (bugEndLine - bugStartLine >= Configuration.HUNK_SIZE || fixEndLine - fixStartLine >= Configuration.HUNK_SIZE) continue; if (bugEndLine - bugStartLine >= Configuration.HUNK_SIZE || fixEndLine - fixStartLine >= Configuration.HUNK_SIZE) continue;
@@ -160,11 +165,11 @@ public class FixedViolationHunkParser extends FixedViolationParser {
simpleTree.setParent(null); simpleTree.setParent(null);
// Source Code of patches. // Source Code of patches.
String patchSourceCode = getPatchSourceCode(prevFile, revFile, bugStartLine, bugEndLine, fixStartLine, fixEndLine); String patchSourceCode = getPatchSourceCode(prevFile, revFile, bugStartLine, bugEndLine, fixStartLine, fixEndLine, isInsert);
if ("".equals(patchSourceCode)) continue; if ("".equals(patchSourceCode)) continue;
counter ++; counter ++;
String patchPosition = "";//"###:" + counter + "\n" + revFile.getName() + "\nPosition: " + violation.getStartLineNum() + " --> " + violation.getEndLineNum() + "\n@@ -" + bugStartLine + ", " + bugEndLine + " +" + fixStartLine + ", " + fixEndLine + "@@\n"; String patchPosition = "";//"###:" + counter + "\n" + revFile.getName() + "\nPosition: " + violation.getStartLineNum() + " --> " + violation.getEndLineNum() + "\n@@ -" + bugStartLine + ", " + bugEndLine + " +" + fixStartLine + ", " + fixEndLine + "@@\n";
this.patchesSourceCode += Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchSourceCode + "\n"; this.patchesSourceCode += Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchSourceCode + "\nAST diff:\n" + getAstEditScripts(hunkActionSets) + "\n";
int size = astEditScripts.split(" ").length; int size = astEditScripts.split(" ").length;
this.sizes += size + "\n"; this.sizes += size + "\n";
this.astEditScripts += astEditScripts + "\n"; this.astEditScripts += astEditScripts + "\n";
@@ -177,5 +182,13 @@ public class FixedViolationHunkParser extends FixedViolationParser {
} }
} }
} }
private String getAstEditScripts(List<HierarchicalActionSet> actionSets) {
String editScripts = "";
for (HierarchicalActionSet actionSet : actionSets) {
editScripts += actionSet.toString();
}
return editScripts;
}
} }