[Patch] BaseTools: Fix one expression bug to support ~ operate

[Patch] BaseTools: Fix one expression bug to support ~ operate

[Yonghong Zhu]

current use (0x41>=~0x0&0x41|0x0) as Pcd value cause build failure
because the ~ is not correctly recognized.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 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 0091e47..78c69fa 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -786,11 +786,11 @@ class ValueExpression(BaseExpression):
             return ''
 
         OpToken = ''
         for Ch in Expr:
             if Ch in self.NonLetterOpLst:
-                if '!' == Ch and OpToken:
+                if Ch in ['!', '~'] and OpToken:
                     break
                 self._Idx += 1
                 OpToken += Ch
             else:
                 break
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix one expression bug to support ~ operate

[Gao, Liming]

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, August 22, 2018 3:17 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch] BaseTools: Fix one expression bug to support ~ operate
> 
> current use (0x41>=~0x0&0x41|0x0) as Pcd value cause build failure
> because the ~ is not correctly recognized.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  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 0091e47..78c69fa 100644
> --- a/BaseTools/Source/Python/Common/Expression.py
> +++ b/BaseTools/Source/Python/Common/Expression.py
> @@ -786,11 +786,11 @@ class ValueExpression(BaseExpression):
>              return ''
> 
>          OpToken = ''
>          for Ch in Expr:
>              if Ch in self.NonLetterOpLst:
> -                if '!' == Ch and OpToken:
> +                if Ch in ['!', '~'] and OpToken:
>                      break
>                  self._Idx += 1
>                  OpToken += Ch
>              else:
>                  break
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel