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

Get rid of unsigned/long suffixes before evaluating numbers.

Browse Source 
Task-number: QTCREATORBUG-1292
This commit is contained in:
Roberto Raggi
2010-04-29 12:33:05 +02:00
parent 98cdd33060
commit 2355799901
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,14 +253,24 @@ protected:
{
if ((*_lex)->is(T_NUMERIC_LITERAL)) {
int base = 10;
const QByteArray spell = tokenSpell();
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));
while (! spell.isEmpty()) {
const QChar ch = spell.at(spell.length() - 1);
if (! (ch == QLatin1Char('u') || ch == QLatin1Char('U') ||
ch == QLatin1Char('l') || ch == QLatin1Char('L')))
break;
spell.chop(1);
}
_value.set_long(spell.toLong(0, base));
++(*_lex);
} else if (isTokenDefined()) {
++(*_lex);