From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EF4B922106DCB for ; Wed, 28 Mar 2018 05:59:14 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2018 06:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,371,1517904000"; d="scan'208";a="32097987" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 28 Mar 2018 06:05:52 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Mar 2018 06:05:52 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Mar 2018 06:05:52 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.235]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.129]) with mapi id 14.03.0319.002; Wed, 28 Mar 2018 21:05:50 +0800 From: "Zhu, Yonghong" To: "Carsey, Jaben" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Thread-Index: AQHTvX5moBxCoYSp0UiKKOpSu7qQZqPlrZKA Date: Wed, 28 Mar 2018 13:05:50 +0000 Message-ID: References: <6fb495a81dfe4fb8d9cf1b6072607364a416639e.1521242771.git.jaben.carsey@intel.com> In-Reply-To: <6fb495a81dfe4fb8d9cf1b6072607364a416639e.1521242771.git.jaben.carsey@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 12:59:15 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Jaben, For this series patch, I have two comment: 1. 1/9 patch: after remove the 'Pattern' variable in FdfParser.py file, th= is statement " if Pattern.match(self.__Token): " is incorrect now since the= re missing 'Pattern' variable. 2. 6/9 patch: need additional {} ({{4}}) for the statement "g4HexChar =3D = re.compile(r'{}{4}'.format(_HexChar))" Others are good to me. thanks. Best Regards, Zhu Yonghong -----Original Message----- From: Carsey, Jaben=20 Sent: Saturday, March 17, 2018 7:28 AM To: edk2-devel@lists.01.org Cc: Zhu, Yonghong ; Gao, Liming Subject: [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg ex= p FdfParser can share regular expression from FdfParserLite. reduce overlap and reduce recompile of the same expression. Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Common/FdfParserLite.py | 5 +++-- BaseTools/Source/Python/GenFds/FdfParser.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/So= urce/Python/Common/FdfParserLite.py index 7d129bfcab59..330422ad59d2 100644 --- a/BaseTools/Source/Python/Common/FdfParserLite.py +++ b/BaseTools/Source/Python/Common/FdfParserLite.py @@ -46,6 +46,8 @@ InputMacroDict =3D {} # All Macro values when parsing file, not replace existing Macro AllMacro= List =3D [] =20 +FileExtensionPattern =3D re.compile(r'([a-zA-Z][a-zA-Z0-9]*)') + def GetRealFileLine (File, Line): =20 InsertedLines =3D 0 @@ -2842,8 +2844,7 @@ class FdfParser(object): =20 Ext =3D "" if self.__GetNextToken(): - Pattern =3D re.compile(r'([a-zA-Z][a-zA-Z0-9]*)') - if Pattern.match(self.__Token): + if FileExtensionPattern.match(self.__Token): Ext =3D self.__Token =20 return '.' + Ext =20 else: diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index dda7ed4ce798..03183e398bdb 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -59,6 +59,7 @@ import Common.LongFilePathOs as os from Common.LongFileP= athSupport import OpenLongFilePath as open from Capsule import EFI_CERT_TY= PE_PKCS7_GUID from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID +from Common.FdfParserLite import FileExtensionPattern =20 ##define T_CHAR_SPACE ' ' ##define T_CHAR_NULL '\0' @@ -3706,7 +3707,6 @@ class FdfParser: =20 Ext =3D "" if self.__GetNextToken(): - Pattern =3D re.compile(r'([a-zA-Z][a-zA-Z0-9]*)') if Pattern.match(self.__Token): Ext =3D self.__Token return '.' + Ext -- 2.16.2.windows.1