BaseTools: Eot tool Python3 adaption

v2:
The python files under CParser4 are generated by antlr4 and for
python3 usage. They have python3 specific syntax, for example
the data type declaration for the arguments of a function. That
is not compitable with python2. this patch is to remove these syntax.

Eot tool Python3 adaption.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Feng, Bob C
2019-01-14 16:41:22 +08:00
parent c60377d7f9
commit 8189be6fd7
8 changed files with 7740 additions and 8 deletions

View File

@ -21,13 +21,19 @@ import re
import Common.LongFilePathOs as os
import sys
import antlr3
from .CLexer import CLexer
from .CParser import CParser
if sys.version_info.major == 3:
import antlr4 as antlr
from Eot.CParser4.CLexer import CLexer
from Eot.CParser4.CParser import CParser
else:
import antlr3 as antlr
antlr.InputStream = antlr.StringStream
from Eot.CParser3.CLexer import CLexer
from Eot.CParser3.CParser import CParser
from . import FileProfile
from .CodeFragment import PP_Directive
from .ParserWarning import Warning
from Eot import FileProfile
from Eot.CodeFragment import PP_Directive
from Eot.ParserWarning import Warning
##define T_CHAR_SPACE ' '
@ -354,9 +360,9 @@ class CodeFragmentCollector:
FileStringContents = ''
for fileLine in self.Profile.FileLinesList:
FileStringContents += fileLine
cStream = antlr3.StringStream(FileStringContents)
cStream = antlr.InputStream(FileStringContents)
lexer = CLexer(cStream)
tStream = antlr3.CommonTokenStream(lexer)
tStream = antlr.CommonTokenStream(lexer)
parser = CParser(tStream)
parser.translation_unit()