i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger: Minor fix to CLanguageTokenizer.

Browse Source 
- Properly differentiate the size of a parsed hex constant in order
  to return a correspondingly sized primitive, rather than always
  returning as 64-bit.
This commit is contained in:
Rene Gollent
2014-12-11 22:17:32 -05:00
parent 1b7af39a61
commit 9d6cd8b210
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/source_language/c_family/CLanguageTokenizer.cpp
+8 -1
View File
@@ -441,8 +441,15 @@ Tokenizer::_ParseHexOperand()
fCurrentToken = Token(begin, length, _CurrentPos() - length, fCurrentToken = Token(begin, length, _CurrentPos() - length,
TOKEN_CONSTANT); TOKEN_CONSTANT);
fCurrentToken.value.SetTo((int64)strtoull( if (length <= 10) {
// including the leading 0x, a 32-bit constant will be at most
// 10 characters. Anything larger, and 64 is necessary.
fCurrentToken.value.SetTo((uint32)strtoul(
fCurrentToken.string.String(), NULL, 16)); fCurrentToken.string.String(), NULL, 16));
} else {
fCurrentToken.value.SetTo((uint64)strtoull(
fCurrentToken.string.String(), NULL, 16));
}
return fCurrentToken; return fCurrentToken;
} }