* [Patch] BaseTools: Fix bug caused by 03c36c36a3
@ 2018-10-17 12:17 Yonghong Zhu
2018-10-18 1:04 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2018-10-17 12:17 UTC (permalink / raw)
To: edk2-devel
In the expression for unicode string and general string compare, it
should check whether it startswith "L'" or 'L"', but not "L".
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
BaseTools/Source/Python/Common/Expression.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index e398f7a..05459b9 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -295,12 +295,12 @@ class ValueExpression(BaseExpression):
# bitwise and logical operation between number and boolean is allowed
pass
else:
raise BadExpression(ERR_EXPR_TYPE)
if isinstance(Oprand1, type('')) and isinstance(Oprand2, type('')):
- if ((Oprand1.startswith('L"') or Oprand1.startswith('L')) and (not Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \
- (((not Oprand1.startswith('L"')) and (not Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or Oprand2.startswith('L'))):
+ if ((Oprand1.startswith('L"') or Oprand1.startswith("L'")) and (not Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \
+ (((not Oprand1.startswith('L"')) and (not Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or Oprand2.startswith("L'"))):
raise BadExpression(ERR_STRING_CMP % (Oprand1, Operator, Oprand2))
if 'in' in Operator and isinstance(Oprand2, type('')):
Oprand2 = Oprand2.split()
EvalStr = 'Oprand1 ' + Operator + ' Oprand2'
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Fix bug caused by 03c36c36a3
2018-10-17 12:17 [Patch] BaseTools: Fix bug caused by 03c36c36a3 Yonghong Zhu
@ 2018-10-18 1:04 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2018-10-18 1:04 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Wednesday, October 17, 2018 8:18 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix bug caused by 03c36c36a3
>
>In the expression for unicode string and general string compare, it
>should check whether it startswith "L'" or 'L"', but not "L".
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/Common/Expression.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Common/Expression.py
>b/BaseTools/Source/Python/Common/Expression.py
>index e398f7a..05459b9 100644
>--- a/BaseTools/Source/Python/Common/Expression.py
>+++ b/BaseTools/Source/Python/Common/Expression.py
>@@ -295,12 +295,12 @@ class ValueExpression(BaseExpression):
> # bitwise and logical operation between number and boolean is
>allowed
> pass
> else:
> raise BadExpression(ERR_EXPR_TYPE)
> if isinstance(Oprand1, type('')) and isinstance(Oprand2, type('')):
>- if ((Oprand1.startswith('L"') or Oprand1.startswith('L')) and (not
>Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \
>- (((not Oprand1.startswith('L"')) and (not
>Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or
>Oprand2.startswith('L'))):
>+ if ((Oprand1.startswith('L"') or Oprand1.startswith("L'")) and (not
>Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \
>+ (((not Oprand1.startswith('L"')) and (not
>Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or
>Oprand2.startswith("L'"))):
> raise BadExpression(ERR_STRING_CMP % (Oprand1, Operator,
>Oprand2))
> if 'in' in Operator and isinstance(Oprand2, type('')):
> Oprand2 = Oprand2.split()
> EvalStr = 'Oprand1 ' + Operator + ' Oprand2'
>
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-18 1:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-17 12:17 [Patch] BaseTools: Fix bug caused by 03c36c36a3 Yonghong Zhu
2018-10-18 1:04 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox