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

Preprocessor: fix line for generated code.

Browse Source 
The macro used to be at the same line as the first token after the
closing parenthesis.

Change-Id: I4c2d7317632baf612900e84572017aeb247d0585
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
This commit is contained in:
Francois Ferrand
2012-03-16 15:16:06 +01:00
committed by Erik Verbruggen
parent 558b6e08ae
commit 2386d701b6
3 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ private Q_SLOTS:
void named_va_args();
void first_empty_macro_arg();
void param_expanding_as_multiple_params();
void macro_definition_lineno();
void unfinished_function_like_macro_call();
void nasty_macro_expansion();
void tstst();
@@ -114,6 +115,40 @@ void tst_Preprocessor::param_expanding_as_multiple_params()
QVERIFY(preprocessed.contains("int f(int a,int b);"));
}
void tst_Preprocessor::macro_definition_lineno()
{
Client *client = 0; // no client.
Environment env;
Preprocessor preprocess(client, &env);
QByteArray preprocessed = preprocess(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int a);\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 "));
preprocessed = preprocess(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int a)\n"
";\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 "));
preprocessed = preprocess(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int \n"
" a);\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 "));
preprocessed = preprocess(QLatin1String("<stdin>"),
QByteArray("#define foo int f\n"
"foo;\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 "));
preprocessed = preprocess(QLatin1String("<stdin>"),
QByteArray("#define foo int f\n"
"foo\n"
";\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 "));
}
void tst_Preprocessor::unfinished_function_like_macro_call()
{
Client *client = 0; // no client.