Sync BaseTools Trunk (version r2524) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / Common / Expression.py

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index a4853b78a4f5f62dc3be6863610b5ed575ad9985..80fad7563d17909bcdde8d6b6302ec60142b5493 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -256,9 +256,12 @@ class ValueExpression(object):
             if self.__IsNumberToken():\r
                 return self._Expr\r
 \r
             if self.__IsNumberToken():\r
                 return self._Expr\r
 \r

-            Token = self._GetToken()\r
-            if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:\r
-                return self._Expr\r
+            try:\r
+                Token = self._GetToken()\r
+                if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:\r
+                    return self._Expr\r
+            except BadExpression:\r
+                pass\r

 \r
             self._Idx = 0\r
             self._Token = ''\r
 \r
             self._Idx = 0\r
             self._Token = ''\r