diff options
| author | Carsey, Jaben </o=Intel/ou=Americas01/cn=Workers/cn=Carsey, Jaben> | 2018-04-04 06:34:05 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-04-08 15:34:11 +0800 |
| commit | 1f26f5fdb96b4a0010c4388273fc42d551170dd6 (patch) | |
| tree | db88f4e94ce9899d54816fef0fcfabc34dc4f4a6 /BaseTools/Source/Python/AutoGen/IdfClassObject.py | |
| parent | 7da06eeede10fc8b908327b375bcdf36707ff7b5 (diff) | |
| download | edk2-1f26f5fdb96b4a0010c4388273fc42d551170dd6.tar.gz edk2-1f26f5fdb96b4a0010c4388273fc42d551170dd6.tar.bz2 edk2-1f26f5fdb96b4a0010c4388273fc42d551170dd6.zip | |
BaseTools: AutoGen - use the new shared RegEx
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@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>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen/IdfClassObject.py')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/IdfClassObject.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py index cb72219b40..a028aceee9 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -21,6 +21,7 @@ from Common.Misc import PathClass from Common.LongFilePathSupport import LongFilePath
import re
import os
+from Common.GlobalData import gIdentifierPattern
IMAGE_TOKEN = re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)
@@ -105,7 +106,7 @@ class IdfFileClassObject(object): EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The format is not match #image IMAGE_ID [TRANSPARENT] ImageFileName in Line %s of File %s.' % (LineNo, File.Path))
if Len == 4 and LineDetails[2] != 'TRANSPARENT':
EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'Please use the keyword "TRANSPARENT" to describe the transparency setting in Line %s of File %s.' % (LineNo, File.Path))
- MatchString = re.match('^[a-zA-Z][a-zA-Z0-9_]*$', LineDetails[1], re.UNICODE)
+ MatchString = gIdentifierPattern.match(LineDetails[1])
if MatchString is None or MatchString.end(0) != len(LineDetails[1]):
EdkLogger.error('Image Definition File Parser', FORMAT_INVALID, 'The Image token name %s defined in Idf file %s contains the invalid character.' % (LineDetails[1], File.Path))
if LineDetails[1] not in self.ImageIDList:
|