feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QByteArray::toLong() does not auto-detect the base and also fixed a typo in

Browse Source 
the evaluator of bit-or expressions.
This commit is contained in:
Roberto Raggi
2008-12-10 10:47:26 +01:00
parent ae3fda8b84
commit 9c9308b91b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/cplusplus/pp-engine.cpp
View File

@@ -164,7 +164,15 @@ protected:
bool process_primary()
{
if ((*_lex)->is(T_INT_LITERAL)) {
_value.set_long(tokenSpell().toLong());
int base = 10;
const QByteArray spell = tokenSpell();
if (spell.at(0) == '0') {
if (spell.size() > 1 && (spell.at(1) == 'x' || spell.at(1) == 'X'))
base = 16;
else
base = 8;
}
_value.set_long(tokenSpell().toLong(0, base));
++(*_lex);
return true;
} else if (isTokenDefined()) {
@@ -367,7 +375,7 @@ protected:
{
process_xor();
while ((*_lex)->is(T_CARET)) {
while ((*_lex)->is(T_PIPE)) {
const Token op = *(*_lex);
++(*_lex);