BaseTools: fix imports

1 - Some of these imports are cascaded from another file. Import them locally.
2 - Some of these imports are not used. Remove them.
3 - Some of these were missing the namespace used to import them.

These changes facilitate optimization of BaseTools:
https://bugzilla.tianocore.org/show_bug.cgi?id=42

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 032220813b..02c8d7bbb5 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -36,6 +36,7 @@ from Common.LongFilePathSupport import OpenLongFilePath as open
 from collections import defaultdict

 from .MetaFileTable import MetaFileStorage

 from .MetaFileCommentParser import CheckInfComment

+from Common.DataType import TAB_COMMENT_EDK_START, TAB_COMMENT_EDK_END

 

 ## RegEx for finding file versions

 hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')

@@ -45,7 +46,7 @@ CODEPattern = re.compile(r"{CODE\([a-fA-F0-9Xx\{\},\s]*\)}")
 ## A decorator used to parse macro definition

 def ParseMacro(Parser):

     def MacroParser(self):

-        Match = gMacroDefPattern.match(self._CurrentLine)

+        Match = GlobalData.gMacroDefPattern.match(self._CurrentLine)

         if not Match:

             # Not 'DEFINE/EDK_GLOBAL' statement, call decorated method

             Parser(self)

@@ -66,7 +67,7 @@ def ParseMacro(Parser):
             EdkLogger.error('Parser', FORMAT_INVALID, "%s can only be defined via environment variable" % Name,

                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)

         # Only upper case letters, digit and '_' are allowed

-        if not gMacroNamePattern.match(Name):

+        if not GlobalData.gMacroNamePattern.match(Name):

             EdkLogger.error('Parser', FORMAT_INVALID, "The macro name must be in the pattern [A-Z][A-Z0-9_]*",

                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)

 

@@ -562,10 +563,10 @@ class InfParser(MetaFileParser):
                     SectionComments.extend(Comments)

                     Comments = []

                 continue

-            if Line.find(DataType.TAB_COMMENT_EDK_START) > -1:

+            if Line.find(TAB_COMMENT_EDK_START) > -1:

                 IsFindBlockComment = True

                 continue

-            if Line.find(DataType.TAB_COMMENT_EDK_END) > -1:

+            if Line.find(TAB_COMMENT_EDK_END) > -1:

                 IsFindBlockComment = False

                 continue

             if IsFindBlockComment: