From 0d40f8a944cf5ffa13c4906e345b0034d9352d40 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Wed, 3 Dec 2008 09:41:51 +0100
Subject: [PATCH] Added macro protection.
---
src/plugins/cpptools/rpp/pp-engine.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/plugins/cpptools/rpp/pp-engine.cpp
index a061b2942a9..70e802c5497 100644
--- a/src/plugins/cpptools/rpp/pp-engine.cpp
+++ b/src/plugins/cpptools/rpp/pp-engine.cpp
@@ -585,15 +585,19 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
} else {
if (! m->function_like) {
if (_dot->isNot(T_LPAREN)) {
+ m->hidden = true;
expand(m->definition.constBegin(),
m->definition.constEnd(),
result);
+ m->hidden = false;
continue;
} else {
QByteArray tmp;
+ m->hidden = true;
expand(m->definition.constBegin(),
m->definition.constEnd(),
&tmp);
+ m->hidden = false;
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 *endOfText = endOfToken(*_dot);
++_dot; // skip T_RPAREN
+ m->hidden = true;
expand(beginOfText, endOfText, result);
+ m->hidden = false;
}
}
}
--
GitLab