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
\r
## SplitString\r
# Split string to list according double quote\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
except:\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
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
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
elif Item.startswith('UINT64'):\r
ItemSize = 8\r
ValueType = 'UINT64'\r
- elif Item.startswith('"') or Item.startswith("'") or Item.startswith('L'):\r
+ elif Item[0] in ['"',"'",'L']:\r
ItemSize = 0\r
ValueType = 'VOID*'\r
else:\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
ItemValue = ParseFieldValue(Item)[0]\r
\r
if type(ItemValue) == type(''):\r
- ItemValue = int(ItemValue, 16) if ItemValue.startswith('0x') else int(ItemValue)\r
+ ItemValue = int(ItemValue, 0)\r
\r
TmpValue = (ItemValue << (Size * 8)) | TmpValue\r
Size = Size + ItemSize\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
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
Item = '0x%x' % TmpValue if type(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