BaseTools: Regular Expressions refactor out the hex char for later reuse

move hex character info from GUID expressions into seperate variable to
facilitate reuse.

I had a type with insufficient {} in the first version.

Cc: Yonghong Zhu <yonghong.zhu@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: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index 4a85a8e0db63ccf5d26055bc012d0d657abbd156..3933e86cb9f650e999b967943d43b67113a62e7d 100644 (file)
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -52,7 +52,8 @@ gMacroDefPattern = re.compile("^(DEFINE|EDK_GLOBAL)[ \t]+")
 gMacroNamePattern = re.compile("^{}$".format(_MacroNamePattern))\r
 \r
 # definition for a GUID.  used to create regular expressions below.\r
 gMacroNamePattern = re.compile("^{}$".format(_MacroNamePattern))\r
 \r
 # definition for a GUID.  used to create regular expressions below.\r

-_GuidPattern = r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"\r
+_HexChar = r"[0-9a-fA-F]"\r
+_GuidPattern = r"{Hex}{{8}}-{Hex}{{4}}-{Hex}{{4}}-{Hex}{{4}}-{Hex}{{12}}".format(Hex=_HexChar)\r

 \r
 ## Regular expressions for GUID matching\r
 gGuidPattern = re.compile(r'{}'.format(_GuidPattern))\r
 \r
 ## Regular expressions for GUID matching\r
 gGuidPattern = re.compile(r'{}'.format(_GuidPattern))\r