Sync tool code to BuildTools project r1739.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / UniClassObject.py

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 412fa72df0154a65c2d3ca311dcb4015c004a1d9..dcfa264025971ddbcd6afcde6f7db525de27670f 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -234,6 +234,11 @@ class UniFileClassObject(object):
         Value = ''\r
 \r
         Name = Item.split()[1]\r
+        # Check the string name is the upper character\r
+        if not self.IsCompatibleMode and Name != '':\r
+            MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)\r
+            if MatchString == None or MatchString.end(0) != len(Name):\r
+                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))\r
         LanguageList = Item.split(u'#language ')\r
         for IndexI in range(len(LanguageList)):\r
             if IndexI == 0:\r
@@ -365,6 +370,11 @@ class UniFileClassObject(object):
                         break\r
                 # Value = Value.replace(u'\r\n', u'')\r
                 Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File)\r
+                # Check the string name is the upper character\r
+                if not self.IsCompatibleMode and Name != '':\r
+                    MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)\r
+                    if MatchString == None or MatchString.end(0) != len(Name):\r
+                        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))\r
                 self.AddStringToList(Name, Language, Value)\r
                 continue\r
 \r