\r
## Import Modules\r
#\r
+from __future__ import print_function\r
+from __future__ import absolute_import\r
from Common.GlobalData import *\r
from CommonDataClass.Exceptions import BadExpression\r
from CommonDataClass.Exceptions import WrnExpression\r
-from Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFieldValueAnArray\r
+from .Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFieldValueAnArray\r
import Common.EdkLogger as EdkLogger\r
import copy\r
+from Common.DataType import *\r
+import sys\r
\r
ERR_STRING_EXPR = 'This operator cannot be used in string expression: [%s].'\r
ERR_SNYTAX = 'Syntax error, the rest of expression cannot be evaluated: [%s].'\r
ERR_EMPTY_EXPR = 'Empty expression is not allowed.'\r
ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARCH), $(TOOL_CHAIN_TAG) and $(TARGET).'\r
\r
+__ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$')\r
+_ReLabel = re.compile('LABEL\((\w+)\)')\r
+_ReOffset = re.compile('OFFSET_OF\((\w+)\)')\r
+PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
+\r
## SplitString\r
# Split string to list according double quote\r
# For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi', '"jkl"', 'mn']\r
for i, ch in enumerate(String):\r
if ch == '(':\r
InParenthesis += 1\r
- if ch == ')':\r
+ elif ch == ')':\r
if InParenthesis:\r
InParenthesis -= 1\r
else:\r
raise BadExpression(ERR_STRING_TOKEN % Item)\r
- if ch == '"' and not InSingleQuote:\r
+ elif ch == '"' and not InSingleQuote:\r
if String[i-1] != '\\':\r
InDoubleQuote = not InDoubleQuote\r
- if ch == "'" and not InDoubleQuote:\r
+ elif ch == "'" and not InDoubleQuote:\r
if String[i-1] != '\\':\r
InSingleQuote = not InSingleQuote\r
- if ch == ',':\r
+ elif ch == ',':\r
if InParenthesis or InSingleQuote or InDoubleQuote:\r
Item += String[i]\r
continue\r
RetList.append(Item)\r
return RetList\r
\r
-def IsValidCString(Str):\r
- ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$')\r
- if not ValidString.match(Str):\r
- return False\r
- return True\r
+def IsValidCName(Str):\r
+ return True if __ValidString.match(Str) else False\r
\r
def BuildOptionValue(PcdValue, GuidDict):\r
- IsArray = False\r
if PcdValue.startswith('H'):\r
InputValue = PcdValue[1:]\r
elif PcdValue.startswith("L'") or PcdValue.startswith("'"):\r
else:\r
InputValue = PcdValue\r
if IsFieldValueAnArray(InputValue):\r
- IsArray = True\r
- if IsArray:\r
try:\r
- PcdValue = ValueExpressionEx(InputValue, 'VOID*', GuidDict)(True)\r
+ PcdValue = ValueExpressionEx(InputValue, TAB_VOID, GuidDict)(True)\r
except:\r
pass\r
return PcdValue\r
InQuote = True\r
MacroStartPos = String.find('$(')\r
if MacroStartPos < 0:\r
- for Pcd in gPlatformPcds.keys():\r
+ for Pcd in gPlatformPcds:\r
if Pcd in String:\r
if Pcd not in gConditionalPcds:\r
gConditionalPcds.append(Pcd)\r
RetStr += '0'\r
elif not InQuote:\r
Tklst = RetStr.split()\r
- if Tklst and Tklst[-1] in ['IN', 'in'] and ExceptionList and Macro not in ExceptionList:\r
+ if Tklst and Tklst[-1] in {'IN', 'in'} and ExceptionList and Macro not in ExceptionList:\r
raise BadExpression(ERR_IN_OPERAND)\r
# Make sure the macro in exception list is encapsulated by double quote\r
# For example: DEFINE ARCH = IA32 X64\r
\r
SupportedInMacroList = ['TARGET', 'TOOL_CHAIN_TAG', 'ARCH', 'FAMILY']\r
\r
-class ValueExpression(object):\r
+class BaseExpression(object):\r
+ def __init__(self, *args, **kwargs):\r
+ super(BaseExpression, self).__init__()\r
+\r
+ # Check if current token matches the operators given from parameter\r
+ def _IsOperator(self, OpSet):\r
+ Idx = self._Idx\r
+ self._GetOperator()\r
+ if self._Token in OpSet:\r
+ if self._Token in self.LogicalOperators:\r
+ self._Token = self.LogicalOperators[self._Token]\r
+ return True\r
+ self._Idx = Idx\r
+ return False\r
+\r
+class ValueExpression(BaseExpression):\r
# Logical operator mapping\r
LogicalOperators = {\r
'&&' : 'and', '||' : 'or',\r
\r
NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']\r
\r
- PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
- HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
- RegGuidPattern = re.compile(r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}')\r
\r
SymbolPattern = re.compile("("\r
"\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|"\r
def Eval(Operator, Oprand1, Oprand2 = None):\r
WrnExp = None\r
\r
- if Operator not in ["==", "!=", ">=", "<=", ">", "<", "in", "not in"] and \\r
- (type(Oprand1) == type('') or type(Oprand2) == type('')):\r
+ if Operator not in {"==", "!=", ">=", "<=", ">", "<", "in", "not in"} and \\r
+ (isinstance(Oprand1, type('')) or isinstance(Oprand2, type(''))):\r
raise BadExpression(ERR_STRING_EXPR % Operator)\r
- if Operator in ['in', 'not in']:\r
- if type(Oprand1) != type(''):\r
+ if Operator in {'in', 'not in'}:\r
+ if not isinstance(Oprand1, type('')):\r
Oprand1 = IntToStr(Oprand1)\r
- if type(Oprand2) != type(''):\r
+ if not isinstance(Oprand2, type('')):\r
Oprand2 = IntToStr(Oprand2)\r
TypeDict = {\r
type(0) : 0,\r
- type(0L) : 0,\r
+ # For python2 long type\r
+ type(sys.maxsize + 1) : 0,\r
type('') : 1,\r
type(True) : 2\r
}\r
\r
EvalStr = ''\r
- if Operator in ["!", "NOT", "not"]:\r
- if type(Oprand1) == type(''):\r
+ if Operator in {"!", "NOT", "not"}:\r
+ if isinstance(Oprand1, type('')):\r
raise BadExpression(ERR_STRING_EXPR % Operator)\r
EvalStr = 'not Oprand1'\r
- elif Operator in ["~"]:\r
- if type(Oprand1) == type(''):\r
+ elif Operator in {"~"}:\r
+ if isinstance(Oprand1, type('')):\r
raise BadExpression(ERR_STRING_EXPR % Operator)\r
EvalStr = '~ Oprand1'\r
else:\r
- if Operator in ["+", "-"] and (type(True) in [type(Oprand1), type(Oprand2)]):\r
+ if Operator in {"+", "-"} and (type(True) in {type(Oprand1), type(Oprand2)}):\r
# Boolean in '+'/'-' will be evaluated but raise warning\r
WrnExp = WrnExpression(WRN_BOOL_EXPR)\r
- elif type('') in [type(Oprand1), type(Oprand2)] and type(Oprand1)!= type(Oprand2):\r
+ elif type('') in {type(Oprand1), type(Oprand2)} and not isinstance(Oprand1, type(Oprand2)):\r
# == between string and number/boolean will always return False, != return True\r
if Operator == "==":\r
WrnExp = WrnExpression(WRN_EQCMP_STR_OTHERS)\r
else:\r
raise BadExpression(ERR_RELCMP_STR_OTHERS % Operator)\r
elif TypeDict[type(Oprand1)] != TypeDict[type(Oprand2)]:\r
- if Operator in ["==", "!=", ">=", "<=", ">", "<"] and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):\r
+ if Operator in {"==", "!=", ">=", "<=", ">", "<"} and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):\r
# comparison between number and boolean is allowed\r
pass\r
- elif Operator in ['&', '|', '^', "and", "or"] and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):\r
+ elif Operator in {'&', '|', '^', "and", "or"} and set((TypeDict[type(Oprand1)], TypeDict[type(Oprand2)])) == set((TypeDict[type(True)], TypeDict[type(0)])):\r
# bitwise and logical operation between number and boolean is allowed\r
pass\r
else:\r
raise BadExpression(ERR_EXPR_TYPE)\r
- if type(Oprand1) == type('') and type(Oprand2) == type(''):\r
+ if isinstance(Oprand1, type('')) and isinstance(Oprand2, type('')):\r
if (Oprand1.startswith('L"') and not Oprand2.startswith('L"')) or \\r
(not Oprand1.startswith('L"') and Oprand2.startswith('L"')):\r
raise BadExpression(ERR_STRING_CMP % (Oprand1, Operator, Oprand2))\r
- if 'in' in Operator and type(Oprand2) == type(''):\r
+ if 'in' in Operator and isinstance(Oprand2, type('')):\r
Oprand2 = Oprand2.split()\r
EvalStr = 'Oprand1 ' + Operator + ' Oprand2'\r
\r
}\r
try:\r
Val = eval(EvalStr, {}, Dict)\r
- except Exception, Excpt:\r
+ except Exception as Excpt:\r
raise BadExpression(str(Excpt))\r
\r
- if Operator in ['and', 'or']:\r
+ if Operator in {'and', 'or'}:\r
if Val:\r
Val = True\r
else:\r
return Val\r
\r
def __init__(self, Expression, SymbolTable={}):\r
+ super(ValueExpression, self).__init__(self, Expression, SymbolTable)\r
self._NoProcess = False\r
- if type(Expression) != type(''):\r
+ if not isinstance(Expression, type('')):\r
self._Expr = Expression\r
self._NoProcess = True\r
return\r
Token = self._GetToken()\r
except BadExpression:\r
pass\r
- if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:\r
+ if isinstance(Token, type('')) and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:\r
return self._Expr\r
\r
self._Idx = 0\r
\r
Val = self._ConExpr()\r
RealVal = Val\r
- if type(Val) == type(''):\r
+ if isinstance(Val, type('')):\r
if Val == 'L""':\r
Val = False\r
elif not Val:\r
\r
# Template function to parse binary operators which have same precedence\r
# Expr [Operator Expr]*\r
- def _ExprFuncTemplate(self, EvalFunc, OpLst):\r
+ def _ExprFuncTemplate(self, EvalFunc, OpSet):\r
Val = EvalFunc()\r
- while self._IsOperator(OpLst):\r
+ while self._IsOperator(OpSet):\r
Op = self._Token\r
if Op == '?':\r
Val2 = EvalFunc()\r
- if self._IsOperator(':'):\r
+ if self._IsOperator({':'}):\r
Val3 = EvalFunc()\r
if Val:\r
Val = Val2\r
continue\r
try:\r
Val = self.Eval(Op, Val, EvalFunc())\r
- except WrnExpression, Warn:\r
+ except WrnExpression as Warn:\r
self._WarnExcept = Warn\r
Val = Warn.result\r
return Val\r
# A [? B]*\r
def _ConExpr(self):\r
- return self._ExprFuncTemplate(self._OrExpr, ['?', ':'])\r
+ return self._ExprFuncTemplate(self._OrExpr, {'?', ':'})\r
\r
# A [|| B]*\r
def _OrExpr(self):\r
- return self._ExprFuncTemplate(self._AndExpr, ["OR", "or", "||"])\r
+ return self._ExprFuncTemplate(self._AndExpr, {"OR", "or", "||"})\r
\r
# A [&& B]*\r
def _AndExpr(self):\r
- return self._ExprFuncTemplate(self._BitOr, ["AND", "and", "&&"])\r
+ return self._ExprFuncTemplate(self._BitOr, {"AND", "and", "&&"})\r
\r
# A [ | B]*\r
def _BitOr(self):\r
- return self._ExprFuncTemplate(self._BitXor, ["|"])\r
+ return self._ExprFuncTemplate(self._BitXor, {"|"})\r
\r
# A [ ^ B]*\r
def _BitXor(self):\r
- return self._ExprFuncTemplate(self._BitAnd, ["XOR", "xor", "^"])\r
+ return self._ExprFuncTemplate(self._BitAnd, {"XOR", "xor", "^"})\r
\r
# A [ & B]*\r
def _BitAnd(self):\r
- return self._ExprFuncTemplate(self._EqExpr, ["&"])\r
+ return self._ExprFuncTemplate(self._EqExpr, {"&"})\r
\r
# A [ == B]*\r
def _EqExpr(self):\r
Val = self._RelExpr()\r
- while self._IsOperator(["==", "!=", "EQ", "NE", "IN", "in", "!", "NOT", "not"]):\r
+ while self._IsOperator({"==", "!=", "EQ", "NE", "IN", "in", "!", "NOT", "not"}):\r
Op = self._Token\r
- if Op in ["!", "NOT", "not"]:\r
- if not self._IsOperator(["IN", "in"]):\r
+ if Op in {"!", "NOT", "not"}:\r
+ if not self._IsOperator({"IN", "in"}):\r
raise BadExpression(ERR_REL_NOT_IN)\r
Op += ' ' + self._Token\r
try:\r
Val = self.Eval(Op, Val, self._RelExpr())\r
- except WrnExpression, Warn:\r
+ except WrnExpression as Warn:\r
self._WarnExcept = Warn\r
Val = Warn.result\r
return Val\r
\r
# A [ > B]*\r
def _RelExpr(self):\r
- return self._ExprFuncTemplate(self._ShiftExpr, ["<=", ">=", "<", ">", "LE", "GE", "LT", "GT"])\r
+ return self._ExprFuncTemplate(self._ShiftExpr, {"<=", ">=", "<", ">", "LE", "GE", "LT", "GT"})\r
\r
def _ShiftExpr(self):\r
- return self._ExprFuncTemplate(self._AddExpr, ["<<", ">>"])\r
+ return self._ExprFuncTemplate(self._AddExpr, {"<<", ">>"})\r
\r
# A [ + B]*\r
def _AddExpr(self):\r
- return self._ExprFuncTemplate(self._MulExpr, ["+", "-"])\r
+ return self._ExprFuncTemplate(self._MulExpr, {"+", "-"})\r
\r
# A [ * B]*\r
def _MulExpr(self):\r
- return self._ExprFuncTemplate(self._UnaryExpr, ["*", "/", "%"])\r
+ return self._ExprFuncTemplate(self._UnaryExpr, {"*", "/", "%"})\r
\r
# [!]*A\r
def _UnaryExpr(self):\r
- if self._IsOperator(["!", "NOT", "not"]):\r
+ if self._IsOperator({"!", "NOT", "not"}):\r
Val = self._UnaryExpr()\r
try:\r
return self.Eval('not', Val)\r
- except WrnExpression, Warn:\r
+ except WrnExpression as Warn:\r
self._WarnExcept = Warn\r
return Warn.result\r
- if self._IsOperator(["~"]):\r
+ if self._IsOperator({"~"}):\r
Val = self._UnaryExpr()\r
try:\r
return self.Eval('~', Val)\r
- except WrnExpression, Warn:\r
+ except WrnExpression as Warn:\r
self._WarnExcept = Warn\r
return Warn.result\r
return self._IdenExpr()\r
if self._Token.startswith('"') or self._Token.startswith('L"'):\r
Flag = 0\r
for Index in range(len(self._Token)):\r
- if self._Token[Index] in ['"']:\r
+ if self._Token[Index] in {'"'}:\r
if self._Token[Index - 1] == '\\':\r
continue\r
Flag += 1\r
if self._Token.startswith("'") or self._Token.startswith("L'"):\r
Flag = 0\r
for Index in range(len(self._Token)):\r
- if self._Token[Index] in ["'"]:\r
+ if self._Token[Index] in {"'"}:\r
if self._Token[Index - 1] == '\\':\r
continue\r
Flag += 1\r
IsArray = IsGuid = False\r
if len(Token.split(',')) == 11 and len(Token.split(',{')) == 2 \\r
and len(Token.split('},')) == 1:\r
- HexLen = [11,6,6,5,4,4,4,4,4,4,6]\r
+ HexLen = [11, 6, 6, 5, 4, 4, 4, 4, 4, 4, 6]\r
HexList= Token.split(',')\r
if HexList[3].startswith('{') and \\r
not [Index for Index, Hex in enumerate(HexList) if len(Hex) > HexLen[Index]]:\r
raise BadExpression(ERR_EMPTY_TOKEN)\r
\r
# PCD token\r
- if self.PcdPattern.match(self._Token):\r
+ if PcdPattern.match(self._Token):\r
if self._Token not in self._Symb:\r
Ex = BadExpression(ERR_PCD_RESOLVE % self._Token)\r
Ex.Pcd = self._Token\r
raise Ex\r
self._Token = ValueExpression(self._Symb[self._Token], self._Symb)(True, self._Depth+1)\r
- if type(self._Token) != type(''):\r
+ if not isinstance(self._Token, type('')):\r
self._LiteralToken = hex(self._Token)\r
return\r
\r
if self._Token.startswith('"'):\r
self._Token = self._Token[1:-1]\r
- elif self._Token in ["FALSE", "false", "False"]:\r
+ elif self._Token in {"FALSE", "false", "False"}:\r
self._Token = False\r
- elif self._Token in ["TRUE", "true", "True"]:\r
+ elif self._Token in {"TRUE", "true", "True"}:\r
self._Token = True\r
else:\r
self.__IsNumberToken()\r
self._LiteralToken.endswith('}'):\r
return True\r
\r
- if self.HexPattern.match(self._LiteralToken):\r
+ if gHexPattern.match(self._LiteralToken):\r
Token = self._LiteralToken[2:]\r
if not Token:\r
self._LiteralToken = '0x0'\r
if Ch == ')':\r
TmpValue = self._Expr[Idx :self._Idx - 1]\r
TmpValue = ValueExpression(TmpValue)(True)\r
- TmpValue = '0x%x' % int(TmpValue) if type(TmpValue) != type('') else TmpValue\r
+ TmpValue = '0x%x' % int(TmpValue) if not isinstance(TmpValue, type('')) else TmpValue\r
break\r
self._Token, Size = ParseFieldValue(Prefix + '(' + TmpValue + ')')\r
return self._Token\r
self._Token = ''\r
if Expr:\r
Ch = Expr[0]\r
- Match = self.RegGuidPattern.match(Expr)\r
+ Match = gGuidPattern.match(Expr)\r
if Match and not Expr[Match.end():Match.end()+1].isalnum() \\r
and Expr[Match.end():Match.end()+1] != '_':\r
self._Idx += Match.end()\r
# Parse operator\r
def _GetOperator(self):\r
self.__SkipWS()\r
- LegalOpLst = ['&&', '||', '!=', '==', '>=', '<='] + self.NonLetterOpLst + ['?',':']\r
+ LegalOpLst = ['&&', '||', '!=', '==', '>=', '<='] + self.NonLetterOpLst + ['?', ':']\r
\r
self._Token = ''\r
Expr = self._Expr[self._Idx:]\r
self._Token = OpToken\r
return OpToken\r
\r
- # Check if current token matches the operators given from OpList\r
- def _IsOperator(self, OpList):\r
- Idx = self._Idx\r
- self._GetOperator()\r
- if self._Token in OpList:\r
- if self._Token in self.LogicalOperators:\r
- self._Token = self.LogicalOperators[self._Token]\r
- return True\r
- self._Idx = Idx\r
- return False\r
-\r
class ValueExpressionEx(ValueExpression):\r
def __init__(self, PcdValue, PcdType, SymbolTable={}):\r
ValueExpression.__init__(self, PcdValue, SymbolTable)\r
PcdValue = self.PcdValue\r
try:\r
PcdValue = ValueExpression.__call__(self, RealValue, Depth)\r
- if self.PcdType == 'VOID*' and (PcdValue.startswith("'") or PcdValue.startswith("L'")):\r
+ if self.PcdType == TAB_VOID and (PcdValue.startswith("'") or PcdValue.startswith("L'")):\r
PcdValue, Size = ParseFieldValue(PcdValue)\r
PcdValueList = []\r
for I in range(Size):\r
PcdValueList.append('0x%02X'%(PcdValue & 0xff))\r
PcdValue = PcdValue >> 8\r
PcdValue = '{' + ','.join(PcdValueList) + '}'\r
- elif self.PcdType in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN'] and (PcdValue.startswith("'") or \\r
+ elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \\r
PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):\r
raise BadExpression\r
- except WrnExpression, Value:\r
+ except WrnExpression as Value:\r
PcdValue = Value.result\r
- except BadExpression, Value:\r
- if self.PcdType in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN']:\r
+ except BadExpression as Value:\r
+ if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
PcdValue = PcdValue.strip()\r
- if type(PcdValue) == type('') and PcdValue.startswith('{') and PcdValue.endswith('}'):\r
+ if PcdValue.startswith('{') and PcdValue.endswith('}'):\r
PcdValue = SplitPcdValueString(PcdValue[1:-1])\r
- if type(PcdValue) == type([]):\r
+ if isinstance(PcdValue, type([])):\r
TmpValue = 0\r
Size = 0\r
ValueType = ''\r
for Item in PcdValue:\r
Item = Item.strip()\r
- if Item.startswith('UINT8'):\r
+ if Item.startswith(TAB_UINT8):\r
ItemSize = 1\r
- ValueType = 'UINT8'\r
- elif Item.startswith('UINT16'):\r
+ ValueType = TAB_UINT8\r
+ elif Item.startswith(TAB_UINT16):\r
ItemSize = 2\r
- ValueType = 'UINT16'\r
- elif Item.startswith('UINT32'):\r
+ ValueType = TAB_UINT16\r
+ elif Item.startswith(TAB_UINT32):\r
ItemSize = 4\r
- ValueType = 'UINT32'\r
- elif Item.startswith('UINT64'):\r
+ ValueType = TAB_UINT32\r
+ elif Item.startswith(TAB_UINT64):\r
ItemSize = 8\r
- ValueType = 'UINT64'\r
- elif Item.startswith('"') or Item.startswith("'") or Item.startswith('L'):\r
+ ValueType = TAB_UINT64\r
+ elif Item[0] in {'"', "'", 'L'}:\r
ItemSize = 0\r
- ValueType = 'VOID*'\r
+ ValueType = TAB_VOID\r
else:\r
ItemSize = 0\r
- ValueType = 'UINT8'\r
+ ValueType = TAB_UINT8\r
Item = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
\r
if ItemSize == 0:\r
try:\r
- tmpValue = int(Item, 16) if Item.upper().startswith('0X') else int(Item, 0)\r
+ tmpValue = int(Item, 0)\r
if tmpValue > 255:\r
raise BadExpression("Byte array number %s should less than 0xFF." % Item)\r
- except BadExpression, Value:\r
+ except BadExpression as Value:\r
raise BadExpression(Value)\r
except ValueError:\r
pass\r
else:\r
ItemValue = ParseFieldValue(Item)[0]\r
\r
- if type(ItemValue) == type(''):\r
- ItemValue = int(ItemValue, 16) if ItemValue.startswith('0x') else int(ItemValue)\r
+ if isinstance(ItemValue, type('')):\r
+ ItemValue = int(ItemValue, 0)\r
\r
TmpValue = (ItemValue << (Size * 8)) | TmpValue\r
Size = Size + ItemSize\r
else:\r
try:\r
TmpValue, Size = ParseFieldValue(PcdValue)\r
- except BadExpression, Value:\r
+ except BadExpression as Value:\r
raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
- if type(TmpValue) == type(''):\r
+ if isinstance(TmpValue, type('')):\r
try:\r
TmpValue = int(TmpValue)\r
except:\r
PcdValue = '0x%0{}X'.format(Size) % (TmpValue)\r
if TmpValue < 0:\r
raise BadExpression('Type %s PCD Value is negative' % self.PcdType)\r
- if self.PcdType == 'UINT8' and Size > 1:\r
+ if self.PcdType == TAB_UINT8 and Size > 1:\r
raise BadExpression('Type %s PCD Value Size is Larger than 1 byte' % self.PcdType)\r
- if self.PcdType == 'UINT16' and Size > 2:\r
+ if self.PcdType == TAB_UINT16 and Size > 2:\r
raise BadExpression('Type %s PCD Value Size is Larger than 2 byte' % self.PcdType)\r
- if self.PcdType == 'UINT32' and Size > 4:\r
+ if self.PcdType == TAB_UINT32 and Size > 4:\r
raise BadExpression('Type %s PCD Value Size is Larger than 4 byte' % self.PcdType)\r
- if self.PcdType == 'UINT64' and Size > 8:\r
+ if self.PcdType == TAB_UINT64 and Size > 8:\r
raise BadExpression('Type %s PCD Value Size is Larger than 8 byte' % self.PcdType)\r
else:\r
try:\r
- TmpValue = long(PcdValue)\r
+ TmpValue = int(PcdValue)\r
TmpList = []\r
if TmpValue.bit_length() == 0:\r
PcdValue = '{0x00}'\r
PcdValueList = SplitPcdValueString(PcdValue.strip()[1:-1])\r
LabelDict = {}\r
NewPcdValueList = []\r
- ReLabel = re.compile('LABEL\((\w+)\)')\r
- ReOffset = re.compile('OFFSET_OF\((\w+)\)')\r
LabelOffset = 0\r
- for Index, Item in enumerate(PcdValueList):\r
+ for Item in PcdValueList:\r
# compute byte offset of every LABEL\r
- LabelList = ReLabel.findall(Item)\r
- Item = ReLabel.sub('', Item)\r
+ LabelList = _ReLabel.findall(Item)\r
+ Item = _ReLabel.sub('', Item)\r
Item = Item.strip()\r
if LabelList:\r
for Label in LabelList:\r
- if not IsValidCString(Label):\r
+ if not IsValidCName(Label):\r
raise BadExpression('%s is not a valid c variable name' % Label)\r
- if Label not in LabelDict.keys():\r
+ if Label not in LabelDict:\r
LabelDict[Label] = str(LabelOffset)\r
- if Item.startswith('UINT8'):\r
+ if Item.startswith(TAB_UINT8):\r
LabelOffset = LabelOffset + 1\r
- elif Item.startswith('UINT16'):\r
+ elif Item.startswith(TAB_UINT16):\r
LabelOffset = LabelOffset + 2\r
- elif Item.startswith('UINT32'):\r
+ elif Item.startswith(TAB_UINT32):\r
LabelOffset = LabelOffset + 4\r
- elif Item.startswith('UINT64'):\r
+ elif Item.startswith(TAB_UINT64):\r
LabelOffset = LabelOffset + 8\r
else:\r
try:\r
except:\r
LabelOffset = LabelOffset + 1\r
\r
- for Index, Item in enumerate(PcdValueList):\r
+ for Item in PcdValueList:\r
# for LABEL parse\r
Item = Item.strip()\r
try:\r
- Item = ReLabel.sub('', Item)\r
+ Item = _ReLabel.sub('', Item)\r
except:\r
pass\r
try:\r
- OffsetList = ReOffset.findall(Item)\r
+ OffsetList = _ReOffset.findall(Item)\r
except:\r
pass\r
+ # replace each offset, except errors\r
for Offset in OffsetList:\r
- if Offset in LabelDict.keys():\r
- Re = re.compile('OFFSET_OF\(%s\)' % Offset)\r
- Item = Re.sub(LabelDict[Offset], Item)\r
- else:\r
+ try:\r
+ Item = Item.replace('OFFSET_OF({})'.format(Offset), LabelDict[Offset])\r
+ except:\r
raise BadExpression('%s not defined' % Offset)\r
+\r
NewPcdValueList.append(Item)\r
\r
AllPcdValueList = []\r
Size = 0\r
ValueStr = ''\r
TokenSpaceGuidName = ''\r
- if Item.startswith('GUID') and Item.endswith(')'):\r
+ if Item.startswith(TAB_GUID) and Item.endswith(')'):\r
try:\r
TokenSpaceGuidName = re.search('GUID\((\w+)\)', Item).group(1)\r
except:\r
continue\r
else:\r
ValueType = ""\r
- if Item.startswith('UINT8'):\r
+ if Item.startswith(TAB_UINT8):\r
ItemSize = 1\r
- ValueType = "UINT8"\r
- elif Item.startswith('UINT16'):\r
+ ValueType = TAB_UINT8\r
+ elif Item.startswith(TAB_UINT16):\r
ItemSize = 2\r
- ValueType = "UINT16"\r
- elif Item.startswith('UINT32'):\r
+ ValueType = TAB_UINT16\r
+ elif Item.startswith(TAB_UINT32):\r
ItemSize = 4\r
- ValueType = "UINT32"\r
- elif Item.startswith('UINT64'):\r
+ ValueType = TAB_UINT32\r
+ elif Item.startswith(TAB_UINT64):\r
ItemSize = 8\r
- ValueType = "UINT64"\r
+ ValueType = TAB_UINT64\r
else:\r
ItemSize = 0\r
if ValueType:\r
TmpValue = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
else:\r
TmpValue = ValueExpressionEx(Item, self.PcdType, self._Symb)(True)\r
- Item = '0x%x' % TmpValue if type(TmpValue) != type('') else TmpValue\r
+ Item = '0x%x' % TmpValue if not isinstance(TmpValue, type('')) else TmpValue\r
if ItemSize == 0:\r
ItemValue, ItemSize = ParseFieldValue(Item)\r
- if not (Item.startswith('"') or Item.startswith('L') or Item.startswith('{')) and ItemSize > 1:\r
+ if Item[0] not in {'"', 'L', '{'} and ItemSize > 1:\r
raise BadExpression("Byte array number %s should less than 0xFF." % Item)\r
else:\r
ItemValue = ParseFieldValue(Item)[0]\r
if input in 'qQ':\r
break\r
try:\r
- print ValueExpression(input)(True)\r
- print ValueExpression(input)(False)\r
- except WrnExpression, Ex:\r
- print Ex.result\r
- print str(Ex)\r
- except Exception, Ex:\r
- print str(Ex)\r
+ print(ValueExpression(input)(True))\r
+ print(ValueExpression(input)(False))\r
+ except WrnExpression as Ex:\r
+ print(Ex.result)\r
+ print(str(Ex))\r
+ except Exception as Ex:\r
+ print(str(Ex))\r
projects / mirror_edk2.git / blobdiff