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

implement eval()

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-10-02 17:37:02 +02:00
parent 1de6a6e716
commit 8b9f29f923
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,8 +139,8 @@ public:
/////////////// Reading pro file /////////////// Reading pro file
bool read(ProFile *pro); bool read(ProFile *pro);
bool read(ProFile *pro, const QString &content); bool read(ProBlock *pro, const QString &content);
bool read(ProFile *pro, QTextStream *ts); bool read(ProBlock *pro, QTextStream *ts);
ProBlock *currentBlock(); ProBlock *currentBlock();
void updateItem(ushort *ptr); void updateItem(ushort *ptr);
@@ -288,22 +288,23 @@ bool ProFileEvaluator::Private::read(ProFile *pro)
} }
QTextStream ts(&file); QTextStream ts(&file);
m_lineNo = 1;
return read(pro, &ts); return read(pro, &ts);
} }
bool ProFileEvaluator::Private::read(ProFile *pro, const QString &content) bool ProFileEvaluator::Private::read(ProBlock *pro, const QString &content)
{ {
QString str(content); QString str(content);
QTextStream ts(&str, QIODevice::ReadOnly | QIODevice::Text); QTextStream ts(&str, QIODevice::ReadOnly | QIODevice::Text);
m_lineNo = 1;
return read(pro, &ts); return read(pro, &ts);
} }
bool ProFileEvaluator::Private::read(ProFile *pro, QTextStream *ts) bool ProFileEvaluator::Private::read(ProBlock *pro, QTextStream *ts)
{ {
// Parser state // Parser state
m_block = 0; m_block = 0;
m_commentItem = 0; m_commentItem = 0;
m_lineNo = 1;
m_blockstack.clear(); m_blockstack.clear();
m_blockstack.push(pro); m_blockstack.push(pro);
@@ -2253,8 +2254,17 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
#if 0 #if 0
case T_REQUIRES: case T_REQUIRES:
case T_EVAL:
#endif #endif
case T_EVAL: {
ProBlock *pro = new ProBlock(0);
if (!read(pro, args.join(QLatin1String(" ")))) {
delete pro;
return ProItem::ReturnFalse;
}
bool ret = pro->Accept(this);
pro->deref();
return returnBool(ret);
}
case T_FOR: { case T_FOR: {
if (m_cumulative) // This is a no-win situation, so just pretend it's no loop if (m_cumulative) // This is a no-win situation, so just pretend it's no loop
return ProItem::ReturnTrue; return ProItem::ReturnTrue;