diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-17 20:15:07 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-18 09:36:49 +0800 |
| commit | fea5e28658c672ce2cbe38d0927ab27beb792097 (patch) | |
| tree | f74bebe46e96a8c3ee02fe0ce6a3cc7250eb8520 | |
| parent | 53c64f4286ba86788e350a82a3798e1a7abf5ef7 (diff) | |
| download | edk2-fea5e28658c672ce2cbe38d0927ab27beb792097.tar.gz edk2-fea5e28658c672ce2cbe38d0927ab27beb792097.tar.bz2 edk2-fea5e28658c672ce2cbe38d0927ab27beb792097.zip | |
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>
Reviewed-by: Liming Gao <liming.gao@intel.com>
| -rw-r--r-- | BaseTools/Source/Python/Common/Expression.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index e398f7a034..05459b9c26 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -297,8 +297,8 @@ class ValueExpression(BaseExpression): 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()
|