EndPos = CurLine.find(')', StartPos+2)\r
while StartPos != -1 and EndPos != -1 and self._Token not in {TAB_IF_DEF, TAB_IF_N_DEF, TAB_IF, TAB_ELSE_IF}:\r
MacroName = CurLine[StartPos+2: EndPos]\r
- MacorValue = self._GetMacroValue(MacroName)\r
- if MacorValue is not None:\r
- CurLine = CurLine.replace('$(' + MacroName + ')', MacorValue, 1)\r
- if MacorValue.find('$(') != -1:\r
+ MacroValue = self._GetMacroValue(MacroName)\r
+ if MacroValue is not None:\r
+ CurLine = CurLine.replace('$(' + MacroName + ')', MacroValue, 1)\r
+ if MacroValue.find('$(') != -1:\r
PreIndex = StartPos\r
else:\r
- PreIndex = StartPos + len(MacorValue)\r
+ PreIndex = StartPos + len(MacroValue)\r
else:\r
PreIndex = EndPos + 1\r
StartPos = CurLine.find('$(', PreIndex)\r
\r
## _GetNextToken() method\r
#\r
- # Get next token unit before a seperator\r
+ # Get next token unit before a separator\r
# If found, the string value is put into self._Token\r
#\r
# @param self The object pointer\r
StartLine = self.CurrentLineNumber\r
while StartLine == self.CurrentLineNumber:\r
TempChar = self._CurrentChar()\r
- # Try to find the end char that is not a space and not in seperator tuple.\r
+ # Try to find the end char that is not a space and not in separator tuple.\r
# That is, when we got a space or any char in the tuple, we got the end of token.\r
if not str(TempChar).isspace() and TempChar not in SEPARATORS:\r
self._GetOneChar()\r
- # if we happen to meet a seperator as the first char, we must proceed to get it.\r
- # That is, we get a token that is a seperator char. nomally it is the boundary of other tokens.\r
+ # if we happen to meet a separator as the first char, we must proceed to get it.\r
+ # That is, we get a token that is a separator char. normally it is the boundary of other tokens.\r
elif StartPos == self.CurrentOffsetWithinLine and TempChar in SEPARATORS:\r
self._GetOneChar()\r
break\r
\r
## _GetNextGuid() method\r
#\r
- # Get next token unit before a seperator\r
+ # Get next token unit before a separator\r
# If found, the GUID string is put into self._Token\r
#\r
# @param self The object pointer\r
while CurrentLine == self.CurrentLineNumber:\r
\r
TempChar = self._CurrentChar()\r
- # Try to find the end char that is not a space and not in seperator tuple.\r
+ # Try to find the end char that is not a space and not in separator tuple.\r
# That is, when we got a space or any char in the tuple, we got the end of token.\r
if not str(TempChar).isspace() and not TempChar in SEPARATORS:\r
if not self._UndoOneChar():\r
return\r
- # if we happen to meet a seperator as the first char, we must proceed to get it.\r
- # That is, we get a token that is a seperator char. nomally it is the boundary of other tokens.\r
+ # if we happen to meet a separator as the first char, we must proceed to get it.\r
+ # That is, we get a token that is a separator char. normally it is the boundary of other tokens.\r
elif StartPos == self.CurrentOffsetWithinLine and TempChar in SEPARATORS:\r
return\r
else:\r
\r
## _GetNextHexNumber() method\r
#\r
- # Get next HEX data before a seperator\r
+ # Get next HEX data before a separator\r
# If found, the HEX data is put into self._Token\r
#\r
# @param self The object pointer\r
\r
## _GetNextDecimalNumber() method\r
#\r
- # Get next decimal data before a seperator\r
+ # Get next decimal data before a separator\r
# If found, the decimal data is put into self._Token\r
#\r
# @param self The object pointer\r