SF.net SVN: edk2-buildtools:[2442] trunk/BaseTools/Source/Python/Common/ Expression.py

[<yi...@us...>]

Revision: 2442
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2442&view=rev
Author:   yingke
Date:     2011-11-29 03:32:14 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Keep PCD value unchanged if PCD value is a single token not a complex expression.

Signed-off-by: yingke
Reviewed-by: jsu1
Reviewed-by: gikidy

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/Common/Expression.py

Modified: trunk/BaseTools/Source/Python/Common/Expression.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/Expression.py	2011-11-29 03:29:15 UTC (rev 2441)
+++ trunk/BaseTools/Source/Python/Common/Expression.py	2011-11-29 03:32:14 UTC (rev 2442)
@@ -133,7 +133,7 @@
     @staticmethod
     def Eval(Operator, Oprand1, Oprand2 = None):
         WrnExp = None
-        
+
         if Operator not in ["==", "!=", ">=", "<=", ">", "<", "in", "not in"] and \
             (type(Oprand1) == type('') or type(Oprand2) == type('')):
             raise BadExpression(ERR_STRING_EXPR % Operator)
@@ -166,13 +166,13 @@
                     raise WrnExp
                 else:
                     raise BadExpression(ERR_RELCMP_STR_OTHERS % Operator)
-            elif TypeDict[type(Oprand1)] != TypeDict[type(Oprand2)]: 
+            elif TypeDict[type(Oprand1)] != TypeDict[type(Oprand2)]:
                 if Operator in ["==", "!=", ">=", "<=", ">", "<"] and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):
                     # comparison between number and boolean is allowed
                     pass
                 elif Operator in ['&', '|', '^', "and", "or"] and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):
                     # bitwise and logical operation between number and boolean is allowed
-                    pass                
+                    pass
                 else:
                     raise BadExpression(ERR_EXPR_TYPE)
             if type(Oprand1) == type('') and type(Oprand2) == type(''):
@@ -242,6 +242,19 @@
         if self._NoProcess:
             return self._Expr
 
+        self._Expr = self._Expr.strip()
+        if RealValue:
+            self._Token = self._Expr
+            if self.__IsNumberToken():
+                return self._Expr
+
+            Token = self._GetToken()
+            if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
+                return self._Expr
+
+            self._Idx = 0
+            self._Token = ''
+
         Val = self._OrExpr()
         RealVal = Val
         if type(Val) == type(''):
@@ -265,7 +278,7 @@
             RetVal = True
         else:
             RetVal = False
-        
+
         if self._WarnExcept:
             self._WarnExcept.result = RetVal
             raise self._WarnExcept
@@ -496,7 +509,7 @@
             if not Token:
                 self._LiteralToken = '0x0'
             else:
-                self._LiteralToken = '0x' + Token
+                self._LiteralToken = '0x' + Token.lower()
             return True
         return False
 
@@ -600,6 +613,3 @@
             print str(Ex)
         except Exception, Ex:
             print str(Ex)
-        
-
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.