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>
This commit is contained in:
committed by
Yonghong Zhu
parent
cd67d66484
commit
256e2d885b
@ -52,7 +52,8 @@ gMacroDefPattern = re.compile("^(DEFINE|EDK_GLOBAL)[ \t]+")
|
|||||||
gMacroNamePattern = re.compile("^{}$".format(_MacroNamePattern))
|
gMacroNamePattern = re.compile("^{}$".format(_MacroNamePattern))
|
||||||
|
|
||||||
# definition for a GUID. used to create regular expressions below.
|
# definition for a GUID. used to create regular expressions below.
|
||||||
_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}"
|
_HexChar = r"[0-9a-fA-F]"
|
||||||
|
_GuidPattern = r"{Hex}{{8}}-{Hex}{{4}}-{Hex}{{4}}-{Hex}{{4}}-{Hex}{{12}}".format(Hex=_HexChar)
|
||||||
|
|
||||||
## Regular expressions for GUID matching
|
## Regular expressions for GUID matching
|
||||||
gGuidPattern = re.compile(r'{}'.format(_GuidPattern))
|
gGuidPattern = re.compile(r'{}'.format(_GuidPattern))
|
||||||
|
Reference in New Issue
Block a user