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

C++: Handle C++ style comments in macro expansion

Browse Source 
Notice that a similar problem still exists for which we
need to fix the lexer when there's a C style commend which
 ends with a backslash-newline.

Task-number: QTCREATORBUG-7713

Change-Id: I0f6d561703984f917fa5ed29de020ad0bdc5aaf0
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-08-15 16:06:22 +02:00
committed by hjk
parent 08cc1e7d6a
commit 009d6b1e2f
2 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1349,7 +1349,21 @@ void Preprocessor::scanActualArgument(PPToken *tk, QVector<PPToken> *tokens)
break; break;
} }
if (m_keepComments
&& (tk->is(T_CPP_COMMENT) || tk->is(T_CPP_DOXY_COMMENT))) {
// Even in keep comments mode, we cannot preserve C++ style comments inside the
// expansion. We stick with GCC's approach which is to replace them by C style
// comments (currently clang just gets rid of them) and transform internals */
// into *|.
QByteArray text = m_state.m_source.mid(tk->begin() + 2, tk->end() - tk->begin() - 2);
const QByteArray &comment = "/*" + text.replace("*/", "*|") + "*/";
tokens->append(generateToken(T_COMMENT,
comment.constData(), comment.size(),
tk->lineno, false));
} else {
tokens->append(*tk); tokens->append(*tk);
}
lex(tk); lex(tk);
} }
} }

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

@@ -1181,6 +1181,42 @@ void tst_Preprocessor::comments_within_data()
"# 10 \"<stdin>\"\n" "# 10 \"<stdin>\"\n"
"x = 10\n"; "x = 10\n";
QTest::newRow("case 4") << original << expected; QTest::newRow("case 4") << original << expected;
original = "#define FOO(x, y) { (void)x; (void)y; }\n"
"\n"
"void foo() {\n"
" FOO(10,\n"
" //comment\n"
" 12\n"
"}\n";
expected =
"# 1 \"<stdin>\"\n"
"\n"
"\n"
"void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n"
"{ (void)10; (void)12}; }\n"
"# expansion end\n"
"# 8 \"<stdin>\"\n";
QTest::newRow("case 5") << original << expected;
original = "#define FOO(x, y) { (void)x; (void)y; }\n"
"\n"
"void foo() {\n"
" FOO(10,\n"
" //tricky*/comment\n"
" 12\n"
"}\n";
expected =
"# 1 \"<stdin>\"\n"
"\n"
"\n"
"void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n"
"{ (void)10; (void)12}; }\n"
"# expansion end\n"
"# 8 \"<stdin>\"\n";
QTest::newRow("case 6") << original << expected;
} }
void tst_Preprocessor::comments_within2() void tst_Preprocessor::comments_within2()
@@ -1298,6 +1334,43 @@ void tst_Preprocessor::comments_within2_data()
"*/\n" "*/\n"
"x = 10\n"; "x = 10\n";
QTest::newRow("case 4") << original << expected; QTest::newRow("case 4") << original << expected;
original = "#define FOO(x, y) { (void)x; (void)y; }\n"
"\n"
"void foo() {\n"
" FOO(10,\n"
" //comment\n"
" 12\n"
"}\n";
expected =
"# 1 \"<stdin>\"\n"
"\n"
"\n"
"void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n"
"{ (void)10; (void)/*comment*/ 12}; }\n"
"# expansion end\n"
"# 8 \"<stdin>\"\n";
QTest::newRow("case 5") << original << expected;
original = "#define FOO(x, y) { (void)x; (void)y; }\n"
"\n"
"void foo() {\n"
" FOO(10,\n"
" //tricky*/comment\n"
" 12\n"
"}\n";
expected =
"# 1 \"<stdin>\"\n"
"\n"
"\n"
"void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n"
"{ (void)10; (void)/*tricky*|comment*/ 12}; }\n"
"# expansion end\n"
"# 8 \"<stdin>\"\n";
QTest::newRow("case 6") << original << expected;
} }
void tst_Preprocessor::multiline_strings() void tst_Preprocessor::multiline_strings()