BaseTools: Fix flexible PCD single quote and double quote bugs

1.The " and ' inside the string, must use escape character format
  (\", \')
2.'string' and L'string' format in --pcd, it must be double quoted
  first.

  Some examples that to match --pcd format and DSC format
  --pcd                             DSC format
  L"ABC"                            L"ABC"
  "AB\\\"C"                         "AB\"C"
  "AB\\\'C"                         "AB\'C"
  L"\'AB\\\"C\'"                    L'AB\"C'
  "\'AB\\\'C\'"                     'AB\'C'
  H"{0, L\"AB\\\"B\", \'ab\\\"c\'}" {0, L"AB\"B", 'ab\"c'}

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

1 files changed, 18 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 1461d00669..a7e7797d04 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1443,21 +1443,26 @@ def ParseConsoleLog(Filename):
 

 def AnalyzePcdExpression(Setting):

     Setting = Setting.strip()

-    # There might be escaped quote in a string: \", \\\"

-    Data = Setting.replace('\\\\', '//').replace('\\\"', '\\\'')

+    # There might be escaped quote in a string: \", \\\" , \', \\\'

+    Data = Setting

     # There might be '|' in string and in ( ... | ... ), replace it with '-'

     NewStr = ''

-    InStr = False

+    InSingleQuoteStr = False

+    InDoubleQuoteStr = False

     Pair = 0

-    for ch in Data:

-        if ch == '"':

-            InStr = not InStr

-        elif ch == '(' and not InStr:

+    for Index, ch in enumerate(Data):

+        if ch == '"' and not InSingleQuoteStr:

+            if Data[Index - 1] != '\\':

+                InDoubleQuoteStr = not InDoubleQuoteStr

+        elif ch == "'" and not InDoubleQuoteStr:

+            if Data[Index - 1] != '\\':

+                InSingleQuoteStr = not InSingleQuoteStr

+        elif ch == '(' and not (InSingleQuoteStr or InDoubleQuoteStr):

             Pair += 1

-        elif ch == ')' and not InStr:

+        elif ch == ')' and not (InSingleQuoteStr or InDoubleQuoteStr):

             Pair -= 1

 

-        if (Pair > 0 or InStr) and ch == TAB_VALUE_SPLIT:

+        if (Pair > 0 or InSingleQuoteStr or InDoubleQuoteStr) and ch == TAB_VALUE_SPLIT:

             NewStr += '-'

         else:

             NewStr += ch

@@ -1549,7 +1554,7 @@ def ParseFieldValue (Value):
         return Value, 16

     if Value.startswith('L"') and Value.endswith('"'):

         # Unicode String

-        List = list(Value[2:-1])

+        List = list(eval(Value[1:]))  # translate escape character

         List.reverse()

         Value = 0

         for Char in List:

@@ -1557,7 +1562,7 @@ def ParseFieldValue (Value):
         return Value, (len(List) + 1) * 2

     if Value.startswith('"') and Value.endswith('"'):

         # ASCII String

-        List = list(Value[1:-1])

+        List = list(eval(Value))  # translate escape character

         List.reverse()

         Value = 0

         for Char in List:

@@ -1565,7 +1570,7 @@ def ParseFieldValue (Value):
         return Value, len(List) + 1

     if Value.startswith("L'") and Value.endswith("'"):

         # Unicode Character Constant

-        List = list(Value[2:-1])

+        List = list(eval(Value[1:])) # translate escape character

         if len(List) == 0:

             raise BadExpression('Length %s is %s' % (Value, len(List)))

         List.reverse()

@@ -1575,7 +1580,7 @@ def ParseFieldValue (Value):
         return Value, len(List) * 2

     if Value.startswith("'") and Value.endswith("'"):

         # Character constant

-        List = list(Value[1:-1])

+        List = list(eval(Value)) # translate escape character

         if len(List) == 0:

             raise BadExpression('Length %s is %s' % (Value, len(List)))

         List.reverse()