BaseTools: Allow string token identifier to use lower case letters

This patch is to align the code behavior with UNI spec that string token
identifier can use upper case and lower case letters.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Felix <Felixp@ami.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 183b2b2337..856d19cda2 100644
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -348,11 +348,11 @@ class UniFileClassObject(object):
         Value = ''

 

         Name = Item.split()[1]

-        # Check the string name is the upper character

+        # Check the string name

         if Name != '':

-            MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)

+            MatchString = re.match('^[a-zA-Z][a-zA-Z0-9_]*$', Name, re.UNICODE)

             if MatchString == None or MatchString.end(0) != len(Name):

-                EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid lower case character.' % (Name, self.File))

+                EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid character.' % (Name, self.File))

         LanguageList = Item.split(u'#language ')

         for IndexI in range(len(LanguageList)):

             if IndexI == 0:

@@ -518,11 +518,11 @@ class UniFileClassObject(object):
                         break

                 # Value = Value.replace(u'\r\n', u'')

                 Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File)

-                # Check the string name is the upper character

+                # Check the string name

                 if not self.IsCompatibleMode and Name != '':

-                    MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)

+                    MatchString = re.match('^[a-zA-Z][a-zA-Z0-9_]*$', Name, re.UNICODE)

                     if MatchString == None or MatchString.end(0) != len(Name):

-                        EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid lower case character.' % (Name, self.File))

+                        EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid character.' % (Name, self.File))

                 self.AddStringToList(Name, Language, Value)

                 continue