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

C++: Always skip unknown preprocessor "directives"

Browse Source 
Task-number: QTCREATORBUG-7780

Change-Id: Ie93704feff17ad8229e50fb1133048f2c7598dea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-08-29 13:21:22 +02:00
committed by hjk
parent 813cd709fb
commit d87835cc90
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1417,9 +1417,9 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk)
handleElseDirective(tk, poundToken);
else if (directive == ppElif)
handleElifDirective(tk, poundToken);
skipPreprocesorDirective(tk);
}
skipPreprocesorDirective(tk);
}

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

@@ -338,6 +338,8 @@ private slots:
void multitokens_argument_data();
void multiline_strings();
void multiline_strings_data();
void skip_unknown_directives();
void skip_unknown_directives_data();
};
// Remove all #... lines, and 'simplify' string, to allow easily comparing the result
@@ -1394,6 +1396,30 @@ void tst_Preprocessor::multiline_strings_data()
QTest::newRow("case 1") << original << expected;
}
void tst_Preprocessor::skip_unknown_directives()
{
compare_input_output();
}
void tst_Preprocessor::skip_unknown_directives_data()
{
QTest::addColumn<QByteArray>("input");
QTest::addColumn<QByteArray>("output");
QByteArray original;
QByteArray expected;
// We should skip "weird" things when preprocessing. Particularly useful when we preprocess
// a particular expression from a document which has already been processed.
original = "# foo\n"
"# 10 \"file.cpp\"\n"
"# ()\n"
"#\n";
expected = "# 1 \"<stdin>\"\n";
QTest::newRow("case 1") << original << expected;
}
void tst_Preprocessor::compare_input_output(bool keepComments)
{
QFETCH(QByteArray, input);