From afb04ba198799e1a377e7518965c7eb29c26732b Mon Sep 17 00:00:00 2001 From: "Carsey, Jaben" Date: Fri, 16 Mar 2018 05:39:04 +0800 Subject: [PATCH] BaseTools: StrGather has redundant declaration remove COMPATIBLE_STRING_TOKEN as it is the same as STRING_TOKEN remove if statement that used one or the other (identical) re Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/AutoGen/StrGather.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py index ed33554cd7..0e0e9bd74d 100644 --- 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 # file. # -# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -63,7 +63,6 @@ OFFSET = 'offset' STRING = 'string' TO = 'to' STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE) -COMPATIBLE_STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE) EFI_HII_ARRAY_SIZE_LENGTH = 4 EFI_HII_PACKAGE_HEADER_LENGTH = 4 @@ -572,11 +571,7 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode): if os.path.isfile(File): Lines = open(File, 'r') for Line in Lines: - if not IsCompatibleMode: - StringTokenList = STRING_TOKEN.findall(Line) - else: - StringTokenList = COMPATIBLE_STRING_TOKEN.findall(Line) - for StrName in StringTokenList: + for StrName in STRING_TOKEN.findall(Line): EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName) UniObjectClass.SetStringReferenced(StrName) -- 2.39.2