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

fix location info in parsing-error messages

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-04-13 21:00:23 +02:00
parent bb6a7c3c6c
commit f26019bed8
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/shared/proparser/profileevaluator.cpp
View File

@@ -200,6 +200,7 @@ public:
}; };
bool read(ProFile *pro); bool read(ProFile *pro);
bool read(ProFile *pro, const QString &content);
bool read(ProBlock *pro, const QString &content); bool read(ProBlock *pro, const QString &content);
bool readInternal(ProBlock *pro, const QString &content, ushort *buf); bool readInternal(ProBlock *pro, const QString &content, ushort *buf);
@@ -554,14 +555,28 @@ bool ProFileEvaluator::Private::read(ProFile *pro)
QString content(QString::fromLatin1(file.readAll())); // yes, really latin1 QString content(QString::fromLatin1(file.readAll())); // yes, really latin1
file.close(); file.close();
m_lineNo = 1; m_lineNo = 1;
return readInternal(pro, content, (ushort*)content.data()); m_profileStack.push(pro);
bool ret = readInternal(pro, content, (ushort*)content.data());
m_profileStack.pop();
return ret;
}
bool ProFileEvaluator::Private::read(ProFile *pro, const QString &content)
{
QString buf;
buf.reserve(content.size());
m_lineNo = 1;
m_profileStack.push(pro);
bool ret = readInternal(pro, content, (ushort*)buf.data());
m_profileStack.pop();
return ret;
} }
bool ProFileEvaluator::Private::read(ProBlock *pro, const QString &content) bool ProFileEvaluator::Private::read(ProBlock *pro, const QString &content)
{ {
QString buf; QString buf;
buf.reserve(content.size()); buf.reserve(content.size());
m_lineNo = 1; m_lineNo = 0;
return readInternal(pro, content, (ushort*)buf.data()); return readInternal(pro, content, (ushort*)buf.data());
} }