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

C++: Re-enable macro definition line test

Browse Source 
I believe those were actually incorrect, since the # mark
from the generated tokens `int f` should be relative to <stdin>
on the line they are defined, which is 1.

Change-Id: I663ef49ad75eb8bb0a4a4b18d4899a952011536c
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-05-31 17:24:56 +02:00
committed by hjk
parent 63f0a14fe5
commit 44d8e7bef7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,6 @@ protected:
static QString simplified(QByteArray buf); static QString simplified(QByteArray buf);
private /* not corrected yet */: private /* not corrected yet */:
void macro_definition_lineno();
void param_expanding_as_multiple_params(); void param_expanding_as_multiple_params();
void macro_argument_expansion(); void macro_argument_expansion();
@@ -303,6 +302,7 @@ private slots:
void first_empty_macro_arg(); void first_empty_macro_arg();
void invalid_param_count(); void invalid_param_count();
void objmacro_expanding_as_fnmacro_notification(); void objmacro_expanding_as_fnmacro_notification();
void macro_definition_lineno();
void macro_uses(); void macro_uses();
void macro_arguments_notificatin(); void macro_arguments_notificatin();
void unfinished_function_like_macro_call(); void unfinished_function_like_macro_call();
@@ -474,30 +474,30 @@ void tst_Preprocessor::macro_definition_lineno()
QByteArray preprocessed = preprocess.run(QLatin1String("<stdin>"), QByteArray preprocessed = preprocess.run(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n" QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int a);\n")); "foo(int a);\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 \"<stdin>\"\nint f")); QVERIFY(preprocessed.contains("#gen true\n# 1 \"<stdin>\"\nint f"));
preprocessed = preprocess.run(QLatin1String("<stdin>"), preprocessed = preprocess.run(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n" QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int a)\n" "foo(int a)\n"
";\n")); ";\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 \"<stdin>\"\nint f")); QVERIFY(preprocessed.contains("#gen true\n# 1 \"<stdin>\"\nint f"));
preprocessed = preprocess.run(QLatin1String("<stdin>"), preprocessed = preprocess.run(QLatin1String("<stdin>"),
QByteArray("#define foo(ARGS) int f(ARGS)\n" QByteArray("#define foo(ARGS) int f(ARGS)\n"
"foo(int \n" "foo(int \n"
" a);\n")); " a);\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 \"<stdin>\"\nint f")); QVERIFY(preprocessed.contains("#gen true\n# 1 \"<stdin>\"\nint f"));
preprocessed = preprocess.run(QLatin1String("<stdin>"), preprocessed = preprocess.run(QLatin1String("<stdin>"),
QByteArray("#define foo int f\n" QByteArray("#define foo int f\n"
"foo;\n")); "foo;\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 \"<stdin>\"\nint f")); QVERIFY(preprocessed.contains("#gen true\n# 1 \"<stdin>\"\nint f"));
preprocessed = preprocess.run(QLatin1String("<stdin>"), preprocessed = preprocess.run(QLatin1String("<stdin>"),
QByteArray("#define foo int f\n" QByteArray("#define foo int f\n"
"foo\n" "foo\n"
";\n")); ";\n"));
QVERIFY(preprocessed.contains("#gen true\n# 2 \"<stdin>\"\nint f")); QVERIFY(preprocessed.contains("#gen true\n# 1 \"<stdin>\"\nint f"));
} }
void tst_Preprocessor::objmacro_expanding_as_fnmacro_notification() void tst_Preprocessor::objmacro_expanding_as_fnmacro_notification()