Sync BaseTool trunk (version r2599) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / Python / Eot / Parser.py

diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Python/Eot/Parser.py
index 9ef71a958769dc17050bb2b7c8faac8ff016772f..d5419d0e06618b3e8c1a93aef31cd3389b5b6306 100644 (file)
--- a/BaseTools/Source/Python/Eot/Parser.py
+++ b/BaseTools/Source/Python/Eot/Parser.py
@@ -22,6 +22,7 @@ from CommonDataClass.DataClass import *
 from Common.String import CleanString, GetSplitValueList, ReplaceMacro\r
 import EotGlobalData\r
 from Common.Misc import sdict\r
+from Common.String import GetSplitList\r
 \r
 ## PreProcess() method\r
 #\r
@@ -49,11 +50,11 @@ def PreProcess(Filename, MergeMultipleLines = True, LineNo = -1):
     for Line in open(Filename, 'r'):\r
         Line = Line.strip()\r
         # Remove comment block\r
-        if Line.find(TAB_COMMENT_R8_START) > -1:\r
-            ReservedLine = GetSplitValueList(Line, TAB_COMMENT_R8_START, 1)[0]\r
+        if Line.find(TAB_COMMENT_EDK_START) > -1:\r
+            ReservedLine = GetSplitList(Line, TAB_COMMENT_EDK_START, 1)[0]\r
             IsFindBlockComment = True\r
-        if Line.find(TAB_COMMENT_R8_END) > -1:\r
-            Line = ReservedLine + GetSplitValueList(Line, TAB_COMMENT_R8_END, 1)[1]\r
+        if Line.find(TAB_COMMENT_EDK_END) > -1:\r
+            Line = ReservedLine + GetSplitList(Line, TAB_COMMENT_EDK_END, 1)[1]\r
             ReservedLine = ''\r
             IsFindBlockComment = False\r
         if IsFindBlockComment:\r