From nobody Mon Dec 23 05:50:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1521242892401214.09980946769883; Fri, 16 Mar 2018 16:28:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C01F422571B3D; Fri, 16 Mar 2018 16:21:28 -0700 (PDT) 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 5217F22489CB0 for ; Fri, 16 Mar 2018 16:21:24 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Mar 2018 16:27:49 -0700 Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.144]) by orsmga001.jf.intel.com with ESMTP; 16 Mar 2018 16:27:48 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,318,1517904000"; d="scan'208";a="39650848" From: Jaben Carsey To: edk2-devel@lists.01.org Date: Fri, 16 Mar 2018 16:27:46 -0700 Message-Id: X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [edk2] [PATCH v1 9/9] BaseTools: remove local hex number regular expression X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Change to using the new shared hex number regular expression Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Common/Expression.py | 3 +-- BaseTools/Source/Python/Common/RangeExpression.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index c69c3cb1e84a..43ef586050e7 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -219,7 +219,6 @@ class ValueExpression(object): NonLetterOpLst =3D ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<',= '>>', '!', '=3D', '>', '<', '?', ':'] =20 PcdPattern =3D re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-= z_]*$') - HexPattern =3D re.compile(r'0[xX][0-9a-fA-F]+$') =20 SymbolPattern =3D re.compile("(" "\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+= \.\w+|" @@ -671,7 +670,7 @@ class ValueExpression(object): self._LiteralToken.endswith('}'): return True =20 - if self.HexPattern.match(self._LiteralToken): + if gHexPattern.match(self._LiteralToken): Token =3D self._LiteralToken[2:] if not Token: self._LiteralToken =3D '0x0' diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index bbcbd6b767e0..2fdb99688557 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -210,7 +210,6 @@ class RangeExpression(object): NonLetterOpLst =3D ['+', '-', '&', '|', '^', '!', '=3D', '>', '<'] =20 PcdPattern =3D re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-= z_]*$') - HexPattern =3D re.compile(r'0[xX][0-9a-fA-F]+') =20 SymbolPattern =3D re.compile("(" "\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+= \.\w+|" @@ -226,7 +225,7 @@ class RangeExpression(object): # convert interval to object index. ex. 1 - 10 to a GUID expr =3D expr.strip() NumberDict =3D {} - for HexNumber in self.HexPattern.findall(expr): + for HexNumber in gHexPattern.findall(expr): Number =3D str(int(HexNumber, 16)) NumberDict[HexNumber] =3D Number for HexNum in NumberDict: @@ -631,7 +630,7 @@ class RangeExpression(object): self._LiteralToken.endswith('}'): return True =20 - if self.HexPattern.match(self._LiteralToken): + if gHexPattern.match(self._LiteralToken): Token =3D self._LiteralToken[2:] Token =3D Token.lstrip('0') if not Token: --=20 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel