diff --git a/src/main/java/edu/lu/uni/serval/FixPattern/utils/CNodeMap.java b/src/main/java/edu/lu/uni/serval/FixPattern/utils/CNodeMap.java index 97f0638..648449c 100644 --- a/src/main/java/edu/lu/uni/serval/FixPattern/utils/CNodeMap.java +++ b/src/main/java/edu/lu/uni/serval/FixPattern/utils/CNodeMap.java @@ -9,80 +9,93 @@ public class CNodeMap { static { map = new HashMap(); - map.put(240500, "CondExpr"); - map.put(240400, "FunCall"); - map.put(241800, "StatementExpr"); - map.put(241300, "RecordAccess"); - map.put(420100, "DefineExpr"); - map.put(290001, "None"); - map.put(350200, "MacroDecl"); - map.put(280100, "Goto"); - map.put(60100, "BaseType"); - map.put(410001, "DefineVar"); - map.put(420200, "DefineStmt"); - map.put(450800, "FinalDef"); - map.put(260300, "ExprStatement"); - map.put(340000, "Storage"); - map.put(290100, "Some"); - map.put(410100, "DefineFunc"); - map.put(420400, "DefineDoWhileZero"); - map.put(70100, "IntType"); - map.put(20100, "Left"); - map.put(480000, "GenericString"); - map.put(241600, "SizeOfType"); - map.put(241000, "Unary"); - map.put(300100, "If"); - map.put(450300, "CppTop"); - map.put(460000, "Program"); - map.put(241200, "ArrayAccess"); - map.put(450400, "IfdefTop"); - map.put(330000, "Compound"); - map.put(310200, "DoWhile"); - map.put(240700, "Assignment"); - map.put(270100, "Label"); - map.put(360100, "InitExpr"); - map.put(270400, "Default"); - map.put(450600, "EmptyDef"); - map.put(470000, "GenericList"); - map.put(490100, "IfToken"); - map.put(60900, "StructUnionName"); - map.put(240600, "Sequence"); - map.put(80100, "Si"); - map.put(360200, "InitList"); - map.put(370200, "DesignatorIndex"); - map.put(360300, "InitDesignators"); - map.put(280001, "Continue"); - map.put(420001, "DefineEmpty"); - map.put(310100, "While"); - map.put(270200, "Case"); - map.put(450700, "NotParsedCorrectly"); - map.put(400100, "Define"); - map.put(370100, "DesignatorField"); - map.put(280003, "Return"); - map.put(240800, "Postfix"); - map.put(100003, "CInt"); - map.put(240100, "Ident"); - map.put(310300, "For"); - map.put(400200, "Include"); - map.put(440100, "IfdefDirective"); - map.put(220100, "ParameterType"); - map.put(242000, "ParenExpr"); - map.put(200000, "ParamList"); - map.put(280002, "Break"); - map.put(241500, "SizeOfExpr"); - map.put(241400, "RecordPtAccess"); - map.put(380000, "Definition"); - map.put(50000, "TypeQualifier"); - map.put(450100, "Declaration"); - map.put(240900, "Infix"); - map.put(241100, "Binary"); - map.put(40000, "FullType"); - map.put(450200, "Definition"); - map.put(310400, "MacroIteration"); - map.put(280200, "ReturnExpr"); - map.put(300200, "Switch"); - map.put(350100, "DeclList"); - map.put(240200, "Constant"); - map.put(241700, "Cast"); + map.put(20100,"Left"); + map.put(30100,"ActMisc"); + map.put(40000,"FullType"); + map.put(50000,"TypeQualifier"); + map.put(60100,"BaseType"); + map.put(60200,"Pointer"); + map.put(60800,"EnumName"); + map.put(60900,"StructUnionName"); + map.put(61000,"TypeName"); + map.put(70002,"SizeType"); + map.put(70100,"IntType"); + map.put(80001,"CChar"); + map.put(80100,"Si"); + map.put(90002,"UnSigned"); + map.put(100003,"CInt"); + map.put(200000,"ParamList"); + map.put(210000,"DotsParameter"); + map.put(220100,"ParameterType"); + map.put(240100,"Ident"); + map.put(240200,"Constant"); + map.put(240400,"FunCall"); + map.put(240500,"CondExpr"); + map.put(240600,"Sequence"); + map.put(240700,"Assignment"); + map.put(240800,"Postfix"); + map.put(240900,"Infix"); + map.put(241000,"Unary"); + map.put(241100,"Binary"); + map.put(241200,"ArrayAccess"); + map.put(241300,"RecordAccess"); + map.put(241400,"RecordPtAccess"); + map.put(241500,"SizeOfExpr"); + map.put(241600,"SizeOfType"); + map.put(241700,"Cast"); + map.put(241900,"Constructor"); + map.put(242000,"ParenExpr"); + map.put(260300,"ExprStatement"); + map.put(260800,"Asm"); + map.put(270100,"Label"); + map.put(270200,"Case"); + map.put(270300,"CaseRange"); + map.put(270400,"Default"); + map.put(280001,"Continue"); + map.put(280002,"Break"); + map.put(280003,"Return"); + map.put(280100,"Goto"); + map.put(280200,"ReturnExpr"); + map.put(290001,"None"); + map.put(290100,"Some"); + map.put(300100,"If"); + map.put(300200,"Switch"); + map.put(310100,"While"); + map.put(310200,"DoWhile"); + map.put(310300,"For"); + map.put(310400,"MacroIteration"); + map.put(330000,"Compound"); + map.put(340000,"Storage"); + map.put(350100,"DeclList"); + map.put(350200,"MacroDecl"); + map.put(360100,"InitExpr"); + map.put(360200,"InitList"); + map.put(360300,"InitDesignators"); + map.put(370100,"DesignatorField"); + map.put(370200,"DesignatorIndex"); + map.put(370300,"DesignatorRange"); + map.put(380000,"Definition"); + map.put(400100,"Define"); + map.put(400200,"Include"); + map.put(400400,"OtherDirective"); + map.put(410001,"DefineVar"); + map.put(410002,"Undef"); + map.put(410100,"DefineFunc"); + map.put(420001,"DefineEmpty"); + map.put(420100,"DefineExpr"); + map.put(420200,"DefineStmt"); + map.put(420400,"DefineDoWhileZero"); + map.put(420600,"DefineInit"); + map.put(440100,"IfdefDirective"); + map.put(450100,"Declaration"); + map.put(450200,"Definition"); + map.put(450300,"CppTop"); + map.put(450400,"IfdefTop"); + map.put(450700,"NotParsedCorrectly"); + map.put(450800,"FinalDef"); + map.put(460000,"Program"); + map.put(470000,"GenericList"); + map.put(480000,"GenericString"); + map.put(490100,"IfToken"); } } diff --git a/src/main/java/edu/lu/uni/serval/MultipleThreadsParser/AkkaParser2.java b/src/main/java/edu/lu/uni/serval/MultipleThreadsParser/AkkaParser2.java index ab1b332..fa07097 100644 --- a/src/main/java/edu/lu/uni/serval/MultipleThreadsParser/AkkaParser2.java +++ b/src/main/java/edu/lu/uni/serval/MultipleThreadsParser/AkkaParser2.java @@ -109,6 +109,6 @@ public class AkkaParser2 { // } } - return msgFiles.subList(10,20); + return msgFiles; //.subList(10,20); } } diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java index bf2554c..268d014 100644 --- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java +++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouperForC.java @@ -20,8 +20,8 @@ public class HierarchicalRegrouperForC { public static void main(String[] args) { GumTreeComparer com = new GumTreeComparer(); - File cFile1 = new File("/Users/anilkoyuncu/bugStudy/dataset/GumTreeInput/linux-stable/prevFiles/prev_0a3d00_b404bc_drivers#pci#iov.c"); - File cFile2 = new File("/Users/anilkoyuncu/bugStudy/dataset/GumTreeInput/linux-stable/revFiles/0a3d00_b404bc_drivers#pci#iov.c"); + File cFile1 = new File("/Users/anilkoyuncu/bugStudy/dataset/GumTreeInput/linux-stable/prevFiles/prev_7779c5_545624_drivers#gpu#drm#drm_dp_helper.c"); + File cFile2 = new File("/Users/anilkoyuncu/bugStudy/dataset/GumTreeInput/linux-stable/revFiles/7779c5_545624_drivers#gpu#drm#drm_dp_helper.c"); List action = com.compareTwoFilesWithGumTreeForCCode(cFile1, cFile2); List actionSet = new HierarchicalRegrouperForC().regroupGumTreeResults(action); System.out.println(actionSet);