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

preprocessor: swallow ) after defined(...

Browse Source 
Task-number: QTCREATORBUG-7256
Change-Id: I6149e56e5f50f75c9e039be9c162036a3890e2d7
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-04-24 18:50:22 +02:00
committed by hjk
parent 75ca41be18
commit feba990f6e
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/cplusplus/pp-engine.cpp
+7 -1
View File
@@ -652,7 +652,13 @@ void Preprocessor::handleDefined(PPToken *tk)
else
break;
} while (isValidToken(*tk));
pushToken(tk);
if (lparenSeen) {
while (tk->isNot(T_RPAREN))
lex(tk);
} else {
pushToken(tk);
}
QByteArray result(1, '0');
if (m_env->resolve(idToken.asByteArrayRef()))
result[0] = '1';
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+21
View File
@@ -819,6 +819,27 @@ void tst_Preprocessor::defined_data()
"#if !defined X \n#define Y\n#endif";
QTest::newRow("4c") << false << true <<
"#ifndef X \n#define Y\n#endif";
QTest::newRow("5a") << false << false <<
"#if !defined(X) && (defined(Y))\n"
"#define X\n"
"#endif\n";
QTest::newRow("5b") << false << false <<
"#if !defined(X) && defined(Y)\n"
"#define X\n"
"#endif\n";
QTest::newRow("5c") << false << false <<
"#if !defined(X) && 0"
"#define X\n"
"#endif\n";
QTest::newRow("5d") << false << false <<
"#if (!defined(X)) && defined(Y)\n"
"#define X\n"
"#endif\n";
QTest::newRow("5d") << false << false <<
"#if (define(Y))\n"
"#define X\n"
"#endif\n";
}
QTEST_APPLESS_MAIN(tst_Preprocessor)