From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 7D38121A1098A for ; Thu, 28 Dec 2017 18:16:47 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Dec 2017 18:21:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,473,1508828400"; d="scan'208";a="22238481" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga002.jf.intel.com with ESMTP; 28 Dec 2017 18:21:43 -0800 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 28 Dec 2017 18:21:43 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 28 Dec 2017 18:21:43 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.213]) with mapi id 14.03.0319.002; Fri, 29 Dec 2017 10:21:41 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix the bug for QuarkPlatformPkg build failure Thread-Index: AQHTgDvxt+xJ1lNOgU6KDpbIM61ZxaNZlwAA Date: Fri, 29 Dec 2017 02:21:40 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E19AF33@SHSMSX104.ccr.corp.intel.com> References: <1514507297-9128-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1514507297-9128-1-git-send-email-yonghong.zhu@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] BaseTools: Fix the bug for QuarkPlatformPkg build failure 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: , X-List-Received-Date: Fri, 29 Dec 2017 02:16:47 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Friday, December 29, 2017 8:28 AM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [Patch] BaseTools: Fix the bug for QuarkPlatformPkg build failure > >The issue is that the string 'LPC' starts with the 'L' character and >this is being confused with L" or L' for a Unicode string or Unicode >character. > >Fixes:https://bugzilla.tianocore.org/show_bug.cgi?id=3D831 >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/Common/Expression.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/BaseTools/Source/Python/Common/Expression.py >b/BaseTools/Source/Python/Common/Expression.py >index 953a412..55fa06d 100644 >--- a/BaseTools/Source/Python/Common/Expression.py >+++ b/BaseTools/Source/Python/Common/Expression.py >@@ -162,11 +162,11 @@ class ValueExpression(object): > if Oprand1[0] in ['"', "'"] or Oprand1.startswith('L"') o= r >Oprand1.startswith("L'")or Oprand1.startswith('UINT'): > Oprand1, Size =3D ParseFieldValue(Oprand1) > else: > Oprand1,Size =3D ParseFieldValue('"' + Oprand1 + '"') > if type(Oprand2) =3D=3D type(''): >- if Oprand2[0] in ['"', "'", 'L'] or Oprand2.startswith('U= INT'): >+ if Oprand2[0] in ['"', "'"] or Oprand2.startswith('L"') o= r >Oprand2.startswith("L'") or Oprand2.startswith('UINT'): > Oprand2, Size =3D ParseFieldValue(Oprand2) > else: > Oprand2, Size =3D ParseFieldValue('"' + Oprand2 + '"'= ) > if type(Oprand1) =3D=3D type('') or type(Oprand2) =3D=3D type= (''): > raise BadExpression(ERR_STRING_EXPR % Operator) >-- >2.6.1.windows.1