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

Store the actual arguments of the macro expansions.

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-04 11:47:30 +01:00
parent 08d0b03e70
commit e253f39360
6 changed files with 133 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -191,7 +191,8 @@ protected:
virtual void macroAdded(const Macro &macro);
virtual void startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalText);
const QByteArray &originalText,
const QVector<MacroArgumentReference> &actuals);
virtual void stopExpandingMacro(unsigned offset, const Macro &macro);
virtual void startSkippingBlocks(unsigned offset);
virtual void stopSkippingBlocks(unsigned offset);
@@ -404,13 +405,14 @@ void CppPreprocessor::macroAdded(const Macro &macro)
void CppPreprocessor::startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalText)
const QByteArray &originalText,
const QVector<MacroArgumentReference> &actuals)
{
if (! m_currentDoc)
return;
//qDebug() << "start expanding:" << macro.name << "text:" << originalText;
m_currentDoc->addMacroUse(macro, offset, originalText.length());
m_currentDoc->addMacroUse(macro, offset, originalText.length(), actuals);
}
void CppPreprocessor::stopExpandingMacro(unsigned, const Macro &)
@@ -544,7 +546,7 @@ CppModelManager::CppModelManager(QObject *parent)
m_core = Core::ICore::instance(); // FIXME
m_dirty = true;
ProjectExplorer::ProjectExplorerPlugin *pe =
ProjectExplorer::ProjectExplorerPlugin *pe =
ProjectExplorer::ProjectExplorerPlugin::instance();
QTC_ASSERT(pe, return);