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

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

Revision: 2521
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2521&view=rev
Author:   yingke
Date:     2012-05-21 08:26:22 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Fix bug to support ?\226?\128?\156!?\226?\128?\157 prefix used as part of an expression in PCD value.

Reviewed-by: Su Jikui <jik...@in...>
Signed-off-by: Liu Yingke <yin...@in...>

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

Modified: trunk/BaseTools/Source/Python/Common/Expression.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/Expression.py	2012-05-21 08:21:47 UTC (rev 2520)
+++ trunk/BaseTools/Source/Python/Common/Expression.py	2012-05-21 08:26:22 UTC (rev 2521)
@@ -256,9 +256,12 @@
             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
+            try:
+                Token = self._GetToken()
+                if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
+                    return self._Expr
+            except BadExpression:
+                pass
 
             self._Idx = 0
             self._Token = ''

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