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

Added macro protection.

Browse Source
This commit is contained in:
Roberto Raggi
2008-12-03 09:41:51 +01:00
parent 0fcb8131bd
commit 0d40f8a944
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/rpp/pp-engine.cpp
View File

@@ -585,15 +585,19 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
} else { } else {
if (! m->function_like) { if (! m->function_like) {
if (_dot->isNot(T_LPAREN)) { if (_dot->isNot(T_LPAREN)) {
m->hidden = true;
expand(m->definition.constBegin(), expand(m->definition.constBegin(),
m->definition.constEnd(), m->definition.constEnd(),
result); result);
m->hidden = false;
continue; continue;
} else { } else {
QByteArray tmp; QByteArray tmp;
m->hidden = true;
expand(m->definition.constBegin(), expand(m->definition.constBegin(),
m->definition.constEnd(), m->definition.constEnd(),
&tmp); &tmp);
m->hidden = false;
m = 0; // reset the active the macro m = 0; // reset the active the macro
@@ -636,7 +640,9 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
const char *beginOfText = startOfToken(*identifierToken); const char *beginOfText = startOfToken(*identifierToken);
const char *endOfText = endOfToken(*_dot); const char *endOfText = endOfToken(*_dot);
++_dot; // skip T_RPAREN ++_dot; // skip T_RPAREN
m->hidden = true;
expand(beginOfText, endOfText, result); expand(beginOfText, endOfText, result);
m->hidden = false;
} }
} }
} }