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

Improved the way we expand function-like macros when we can't collect all the arguments.

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-03 16:32:08 +01:00
parent 656d70fa74
commit 55d0e4f860
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -810,9 +810,8 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
++_dot; ++_dot;
} }
if (_dot->isNot(T_RPAREN)) { if (_dot->isNot(T_RPAREN))
// ### warning expected T_RPAREN _result->append(spell);
}
else else
expandFunctionLikeMacro(identifierToken, m); expandFunctionLikeMacro(identifierToken, m);

22
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -1,7 +1,7 @@
#include <QtTest> #include <QtTest>
#include <pp.h> #include <pp.h>
CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
class tst_Preprocessor: public QObject class tst_Preprocessor: public QObject
{ {
@@ -9,21 +9,35 @@ Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
void pp_with_no_client(); void pp_with_no_client();
void unfinished_function_like_macro_call();
}; };
void tst_Preprocessor::pp_with_no_client() void tst_Preprocessor::pp_with_no_client()
{ {
using namespace CPlusPlus;
Client *client = 0; // no client. Client *client = 0; // no client.
Environment env; Environment env;
Preprocessor preprocess(client, &env); Preprocessor preprocess(client, &env);
QByteArray preprocessed = preprocess("<stdin>", QByteArray preprocessed = preprocess("<stdin>",
"#define foo(a,b) a + b\nfoo(1, 2)\n"); "\n#define foo(a,b) a + b"
"\nfoo(1, 2)\n");
QByteArray expected = "1 + 2"; QByteArray expected = "1 + 2";
QCOMPARE(preprocessed.trimmed(), expected); QCOMPARE(preprocessed.trimmed(), expected);
} }
void tst_Preprocessor::unfinished_function_like_macro_call()
{
Client *client = 0; // no client.
Environment env;
Preprocessor preprocess(client, &env);
QByteArray preprocessed = preprocess("<stdin>",
"\n#define foo(a,b) a + b"
"\nfoo(1, 2\n");
QByteArray expected = "foo";
QCOMPARE(preprocessed.trimmed(), expected);
}
QTEST_APPLESS_MAIN(tst_Preprocessor) QTEST_APPLESS_MAIN(tst_Preprocessor)
#include "tst_preprocessor.moc" #include "tst_preprocessor.moc"