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

C++: Track macro argument reference even when empty

Browse Source 
Change-Id: I6d226b4e42f94ebee41d012050c5109895f0c432
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-06-12 14:51:48 +02:00
committed by hjk
parent f9007eefc7
commit 2af60cb1bf
2 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -801,16 +801,20 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
if (m_client && !idTk.generated()) {
// Bundle each token sequence into a macro argument "reference" for notification.
// Even empty ones, which are not necessarily important on its own, but for the matter
// of couting their number - such as in foo(,)
QVector<MacroArgumentReference> argRefs;
for (int i = 0; i < allArgTks.size(); ++i) {
const QVector<PPToken> &argTks = allArgTks.at(i);
if (argTks.isEmpty())
continue;
if (argTks.isEmpty()) {
argRefs.push_back(MacroArgumentReference());
} else {
argRefs.push_back(
MacroArgumentReference(
m_state.m_offsetRef + argTks.first().begin(),
argTks.last().begin() + argTks.last().length() - argTks.first().begin()));
argRefs.push_back(MacroArgumentReference(
m_state.m_offsetRef + argTks.first().begin(),
argTks.last().begin() + argTks.last().length()
- argTks.first().begin()));
}
}
m_client->startExpandingMacro(m_state.m_offsetRef + idTk.offset, *macro, macroNameRef,