From 22c4de1ac8f1fc72e8d72af6a315e584490a44b0 Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Tue, 9 Oct 2018 12:44:35 +0800 Subject: BaseTools/Ecc/EOT: Add Python 3 support on ECC and EOT tools. 1. Add Python 3 support on ECC and EOT tools 2. Add C grammar file of ANTLR4 and fix some bugs Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen Reviewed-by: Liming Gao --- BaseTools/Source/Python/Ecc/c.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (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 953f1630b6..7105cdf2a9 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -35,7 +35,7 @@ IgnoredKeywordList = ['EFI_ERROR'] def GetIgnoredDirListPattern(): skipList = list(EccGlobalData.gConfig.SkipDirList) + ['.svn'] - DirString = string.join(skipList, '|') + DirString = '|'.join(skipList) p = re.compile(r'.*[\\/](?:%s)[\\/]?.*' % DirString) return p @@ -963,7 +963,7 @@ def StripComments(Str): ListFromStr[Index] = ' ' Index += 1 # check for // comment - elif ListFromStr[Index] == '/' and ListFromStr[Index + 1] == '/' and ListFromStr[Index + 2] != '\n': + elif ListFromStr[Index] == '/' and ListFromStr[Index + 1] == '/': InComment = True DoubleSlashComment = True @@ -1297,7 +1297,7 @@ def CheckFuncLayoutReturnType(FullFileName): Result0 = Result[0] if Result0.upper().startswith('STATIC'): Result0 = Result0[6:].strip() - Index = Result0.find(ReturnType) + Index = Result0.find(TypeStart) if Index != 0 or Result[3] != 0: PrintErrorMsg(ERROR_C_FUNCTION_LAYOUT_CHECK_RETURN_TYPE, '[%s] Return Type should appear at the start of line' % FuncName, 'Function', Result[1]) -- cgit v1.2.3