From 0cb3f77153b7fde612ed49dddd986cf8421be7ba Mon Sep 17 00:00:00 2001 From: "Fan, ZhijuX" Date: Mon, 6 May 2019 10:35:07 +0800 Subject: BaseTools:ECC report errors on account of analyze special characters BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1751 In case that a C function body contains the string of L'', L'\"', L"\"", L''', L""", L"\"\"", L"\"^", L" \"", L"\" \"", ('L",\\\""') ECC tool running under python3 interpreter will report error. The antlr4 module misidentified this character This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan Reviewed-by: Bob Feng --- BaseTools/Source/Python/Ecc/c.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'BaseTools/Source/Python/Ecc/c.py') diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py index fdb53e4e3e..2a73da7cb8 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -495,6 +495,8 @@ def CollectSourceCodeDataIntoDB(RootDir): tuple = os.walk(RootDir) IgnoredPattern = GetIgnoredDirListPattern() ParseErrorFileList = [] + TokenReleaceList = EccGlobalData.gConfig.TokenReleaceList + TokenReleaceList.extend(['L",\\\""']) for dirpath, dirnames, filenames in tuple: if IgnoredPattern.match(dirpath.upper()): @@ -519,6 +521,7 @@ def CollectSourceCodeDataIntoDB(RootDir): EdkLogger.info("Parsing " + FullName) model = f.endswith('c') and DataClass.MODEL_FILE_C or DataClass.MODEL_FILE_H collector = CodeFragmentCollector.CodeFragmentCollector(FullName) + collector.TokenReleaceList = TokenReleaceList try: collector.ParseFile() except UnicodeError: -- cgit v1.2.3