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

Fixed macro locations.

Browse Source
This commit is contained in:
Roberto Raggi
2008-12-09 16:19:56 +01:00
parent a4ed1bc9df
commit 9653f4b7e9
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,12 +481,12 @@ void pp::operator () (const QByteArray &filename,
const QByteArray &source,
QByteArray *result)
{
const QByteArray previousFile = env.current_file;
env.current_file = filename;
const QByteArray previousFile = env.currentFile;
env.currentFile = filename;
operator () (source, result);
env.current_file = previousFile;
env.currentFile = previousFile;
}
pp::State pp::createStateFromSource(const QByteArray &source) const
@@ -518,7 +518,7 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
result->append(QByteArray::number(_dot->lineno));
result->append(' ');
result->append('"');
result->append(env.current_file);
result->append(env.currentFile);
result->append('"');
result->append('\n');
} else {
@@ -844,6 +844,8 @@ void pp::processDefine(TokenIterator firstToken, TokenIterator lastToken)
}
Macro macro;
macro.fileName = env.currentFile;
macro.line = env.currentLine;
macro.name = tokenText(*tk);
++tk; // skip T_IDENTIFIER