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

Introduced expandBuiltinMacro().

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-03 17:18:12 +01:00
parent 3c689f7880
commit 5bbb882b3d
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -726,44 +726,33 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
const QByteArray spell = tokenSpell(*identifierToken);
if (env->isBuiltinMacro(spell)) {
const Macro trivial;
if (env->isBuiltinMacro(spell))
expandBuiltinMacro(identifierToken, spell);
if (client)
client->startExpandingMacro(identifierToken->offset,
trivial, spell);
else {
if (Macro *m = env->resolve(spell)) {
if (! m->isFunctionLike()) {
if (0 == (m = processObjectLikeMacro(identifierToken, spell, m)))
continue;
expand(spell, _result);
// the macro expansion generated something that looks like
// a function-like macro.
}
if (client)
client->stopExpandingMacro(_dot->offset, trivial);
// `m' is function-like macro.
if (_dot->is(T_LPAREN)) {
skipActualArguments();
continue;
}
if (Macro *m = env->resolve(spell)) {
if (! m->isFunctionLike()) {
if (0 == (m = processObjectLikeMacro(identifierToken, spell, m)))
continue;
// the macro expansion generated something that looks like
// a function-like macro.
}
// `m' is function-like macro.
if (_dot->is(T_LPAREN)) {
skipActualArguments();
if (_dot->is(T_RPAREN)) {
expandFunctionLikeMacro(identifierToken, m);
continue;
if (_dot->is(T_RPAREN)) {
expandFunctionLikeMacro(identifierToken, m);
continue;
}
}
}
}
// it's not a function or object-like macro.
_result->append(spell);
// it's not a function or object-like macro.
_result->append(spell);
}
}
}
}
@@ -825,6 +814,21 @@ Macro *Preprocessor::processObjectLikeMacro(TokenIterator identifierToken,
return 0;
}
void Preprocessor::expandBuiltinMacro(TokenIterator identifierToken,
const QByteArray &spell)
{
const Macro trivial;
if (client)
client->startExpandingMacro(identifierToken->offset,
trivial, spell);
expand(spell, _result);
if (client)
client->stopExpandingMacro(_dot->offset, trivial);
}
void Preprocessor::expandObjectLikeMacro(TokenIterator identifierToken,
const QByteArray &spell,
Macro *m,