BaseTools: StrGather simplify string/int conversion functions

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

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 60840041ba22ce2fc290808efc0ace05e615b6b0..e6f10142cb665af0de537cc94ffcce37ffc7a03b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -2,7 +2,7 @@
 # This file is used to parse a strings file and create or add to a string database \r
 # file.\r
 #\r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,7 +19,7 @@ import Common.EdkLogger as EdkLogger
 from Common.BuildToolError import *\r
 from UniClassObject import *\r
 from StringIO import StringIO\r
-from struct import pack\r
+from struct import pack, unpack\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 ##\r
@@ -59,11 +59,7 @@ NOT_REFERENCED = 'not referenced'
 COMMENT_NOT_REFERENCED = ' ' + COMMENT + NOT_REFERENCED\r
 CHAR_ARRAY_DEFIN = 'unsigned char'\r
 COMMON_FILE_NAME = 'Strings'\r
-OFFSET = 'offset'\r
-STRING = 'string'\r
-TO = 'to'\r
 STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)\r
-COMPATIBLE_STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)\r
 \r
 EFI_HII_ARRAY_SIZE_LENGTH = 4\r
 EFI_HII_PACKAGE_HEADER_LENGTH = 4\r
@@ -98,7 +94,7 @@ PRINTABLE_LANGUAGE_NAME_STRING_NAME = '$PRINTABLE_LANGUAGE_NAME'
 # @retval:       The formatted hex string\r
 #\r
 def DecToHexStr(Dec, Digit = 8):\r
-    return eval("'0x%0" + str(Digit) + "X' % int(Dec)")\r
+    return '0x{0:0{1}X}'.format(Dec,Digit)\r
 \r
 ## Convert a dec number to a hex list\r
 #\r
@@ -113,11 +109,8 @@ def DecToHexStr(Dec, Digit = 8):
 # @retval:       A list for formatted hex string\r
 #\r
 def DecToHexList(Dec, Digit = 8):\r
-    Hex = eval("'%0" + str(Digit) + "X' % int(Dec)")\r
-    List = []\r
-    for Bit in range(Digit - 2, -1, -2):\r
-        List.append(HexHeader + Hex[Bit:Bit + 2])\r
-    return List\r
+    Hex = '{0:0{1}X}'.format(Dec,Digit)\r
+    return ["0x" + Hex[Bit:Bit + 2] for Bit in range(Digit - 2, -1, -2)]\r
 \r
 ## Convert a acsii string to a hex list\r
 #\r
@@ -129,11 +122,7 @@ def DecToHexList(Dec, Digit = 8):
 # @retval:       A list for formatted hex string\r
 #\r
 def AscToHexList(Ascii):\r
-    List = []\r
-    for Item in Ascii:\r
-        List.append('0x%2X' % ord(Item))\r
-\r
-    return List\r
+    return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]\r
 \r
 ## Create header of .h file\r
 #\r
@@ -572,11 +561,7 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode):
         if os.path.isfile(File):\r
             Lines = open(File, 'r')\r
             for Line in Lines:\r
-                if not IsCompatibleMode:\r
-                    StringTokenList = STRING_TOKEN.findall(Line)\r
-                else:\r
-                    StringTokenList = COMPATIBLE_STRING_TOKEN.findall(Line)\r
-                for StrName in StringTokenList:\r
+                for StrName in STRING_TOKEN.findall(Line):\r
                     EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName)\r
                     UniObjectClass.SetStringReferenced(StrName)\r
 \r