diff options
| author | Hess Chen <hesheng.chen@intel.com> | 2018-10-09 12:44:35 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-13 09:57:18 +0800 |
| commit | 22c4de1ac8f1fc72e8d72af6a315e584490a44b0 (patch) | |
| tree | 103d8856db1369c2799641bf429826fe535d6b27 /BaseTools/Source/Python/Ecc/CodeFragmentCollector.py | |
| parent | 472eb3b89682f7af333ec46f84f990f6b8d4f497 (diff) | |
| download | edk2-22c4de1ac8f1fc72e8d72af6a315e584490a44b0.tar.gz edk2-22c4de1ac8f1fc72e8d72af6a315e584490a44b0.tar.bz2 edk2-22c4de1ac8f1fc72e8d72af6a315e584490a44b0.zip | |
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 <hesheng.chen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/Ecc/CodeFragmentCollector.py')
| -rw-r--r-- | BaseTools/Source/Python/Ecc/CodeFragmentCollector.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py index d12232cc6f..b6fa287cf7 100644 --- a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py +++ b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py @@ -22,7 +22,7 @@ import re import Common.LongFilePathOs as os
import sys
-import antlr3
+import antlr4
from Ecc.CLexer import CLexer
from Ecc.CParser import CParser
@@ -499,13 +499,14 @@ class CodeFragmentCollector: def ParseFile(self):
self.PreprocessFile()
# restore from ListOfList to ListOfString
+ # print(self.Profile.FileLinesList)
self.Profile.FileLinesList = ["".join(list) for list in self.Profile.FileLinesList]
FileStringContents = ''
for fileLine in self.Profile.FileLinesList:
FileStringContents += fileLine
- cStream = antlr3.StringStream(FileStringContents)
+ cStream = antlr4.InputStream(FileStringContents)
lexer = CLexer(cStream)
- tStream = antlr3.CommonTokenStream(lexer)
+ tStream = antlr4.CommonTokenStream(lexer)
parser = CParser(tStream)
parser.translation_unit()
@@ -516,9 +517,9 @@ class CodeFragmentCollector: FileStringContents = ''
for fileLine in self.Profile.FileLinesList:
FileStringContents += fileLine
- cStream = antlr3.StringStream(FileStringContents)
+ cStream = antlr4.InputStream(FileStringContents)
lexer = CLexer(cStream)
- tStream = antlr3.CommonTokenStream(lexer)
+ tStream = antlr4.CommonTokenStream(lexer)
parser = CParser(tStream)
parser.translation_unit()
|