diff --git a/mainTool/CPG.py b/mainTool/CPG.py index 7b73f15..4f99edc 100644 --- a/mainTool/CPG.py +++ b/mainTool/CPG.py @@ -200,12 +200,12 @@ def fileParse(fileName: str, udgConverter: CFGToUDGConverter, def initialCalleeInfos(calleeInfs: Dict) -> CalleeInfos: calleeInfos: CalleeInfos = CalleeInfos() - defInfos = calleeInfs["ArgDefs"] + defInfos = calleeInfs["ArgDef"] for funcName, argNs in defInfos.items(): for argN in argNs: calleeInfos.addArgDef(funcName, argN) - useInfos = calleeInfs["ArgUses"] + useInfos = calleeInfs["ArgUse"] for funcName, argNs in useInfos.items(): for argN in argNs: calleeInfos.addArgUse(funcName, argN) diff --git a/test/extraToolTests/sysevrTest.py b/test/extraToolTests/sysevrTest.py index b1612e0..4865fb0 100644 --- a/test/extraToolTests/sysevrTest.py +++ b/test/extraToolTests/sysevrTest.py @@ -86,7 +86,7 @@ def testGenerateSlices(): converter: CFGToUDGConverter = CFGToUDGConverter() defUseConverter: CFGAndUDGToDefUseCFG = CFGAndUDGToDefUseCFG() ddgCreator: DDGCreator = DDGCreator() - cpgsCommon: List[CPG] = fileParse(file1, calleeInfos, converter, defUseConverter, ddgCreator) # print et al + cpgsCommon: List[CPG] = fileParse(file1, converter, defUseConverter, ddgCreator) # print et al for cpg in cpgsCommon: cpg.joinSlice = False cpg.file = file1 @@ -96,7 +96,7 @@ def testGenerateSlices(): # cpg.file = file2 cpgMainss: List[CPG] = list() for testfile in testfiles: - cpgMains: List[CPG] = fileParse(testfile, calleeInfos, converter, defUseConverter, ddgCreator) + cpgMains: List[CPG] = fileParse(testfile, converter, defUseConverter, ddgCreator) for cpg in cpgMains: cpg.file = testfile cpgMainss.extend(cpgMains)