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

remove pointless return value from QMakeParser::read()

Browse Source 
it always returned true nowadays.

an obvious followup effect is that the return value of parsedProBlock()
doesn't need to be null-checked any more as well.

Change-Id: I782785cab9b721a78a342a010921a73e642ebe7f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/030c3a6197da663e5d2df48b9130ef71ee22e86c)
This commit is contained in:
Oswald Buddenhagen
2015-02-02 18:52:24 +01:00
parent c3394ca727
commit e51acff8fa
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -1199,15 +1199,13 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
VisitReturn ret = ReturnFalse; VisitReturn ret = ReturnFalse;
ProFile *pro = m_parser->parsedProBlock(args.join(statics.field_sep), ProFile *pro = m_parser->parsedProBlock(args.join(statics.field_sep),
m_current.pro->fileName(), m_current.line); m_current.pro->fileName(), m_current.line);
if (pro) { if (m_cumulative || pro->isOk()) {
if (m_cumulative || pro->isOk()) { m_locationStack.push(m_current);
m_locationStack.push(m_current); visitProBlock(pro, pro->tokPtr());
visitProBlock(pro, pro->tokPtr()); ret = ReturnTrue; // This return value is not too useful, but that's qmake
ret = ReturnTrue; // This return value is not too useful, but that's qmake m_current = m_locationStack.pop();
m_current = m_locationStack.pop();
}
pro->deref();
} }
pro->deref();
return ret; return ret;
} }
case T_IF: { case T_IF: {

25
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1315,14 +1315,13 @@ void QMakeEvaluator::setupProject()
void QMakeEvaluator::evaluateCommand(const QString &cmds, const QString &where) void QMakeEvaluator::evaluateCommand(const QString &cmds, const QString &where)
{ {
if (!cmds.isEmpty()) { if (!cmds.isEmpty()) {
if (ProFile *pro = m_parser->parsedProBlock(cmds, where, -1)) { ProFile *pro = m_parser->parsedProBlock(cmds, where, -1);
if (pro->isOk()) { if (pro->isOk()) {
m_locationStack.push(m_current); m_locationStack.push(m_current);
visitProBlock(pro, pro->tokPtr()); visitProBlock(pro, pro->tokPtr());
m_current = m_locationStack.pop(); m_current = m_locationStack.pop();
}
pro->deref();
} }
pro->deref();
} }
} }
@@ -1802,14 +1801,12 @@ bool QMakeEvaluator::evaluateConditional(const QString &cond, const QString &whe
{ {
bool ret = false; bool ret = false;
ProFile *pro = m_parser->parsedProBlock(cond, where, line, QMakeParser::TestGrammar); ProFile *pro = m_parser->parsedProBlock(cond, where, line, QMakeParser::TestGrammar);
if (pro) { if (pro->isOk()) {
if (pro->isOk()) { m_locationStack.push(m_current);
m_locationStack.push(m_current); ret = visitProBlock(pro, pro->tokPtr()) == ReturnTrue;
ret = visitProBlock(pro, pro->tokPtr()) == ReturnTrue; m_current = m_locationStack.pop();
m_current = m_locationStack.pop();
}
pro->deref();
} }
pro->deref();
return ret; return ret;
} }

11
src/shared/proparser/qmakeparser.cpp
View File

@@ -229,10 +229,7 @@ ProFile *QMakeParser::parsedProBlock(
const QString &contents, const QString &name, int line, SubGrammar grammar) const QString &contents, const QString &name, int line, SubGrammar grammar)
{ {
ProFile *pro = new ProFile(name); ProFile *pro = new ProFile(name);
if (!read(pro, contents, line, grammar)) { read(pro, contents, line, grammar);
delete pro;
pro = 0;
}
return pro; return pro;
} }
@@ -252,7 +249,8 @@ bool QMakeParser::read(ProFile *pro, ParseFlags flags)
fL1S("Cannot read %1: %2").arg(pro->fileName(), errStr)); fL1S("Cannot read %1: %2").arg(pro->fileName(), errStr));
return false; return false;
} }
return read(pro, content, 1, FullGrammar); read(pro, content, 1, FullGrammar);
return true;
} }
void QMakeParser::putTok(ushort *&tokPtr, ushort tok) void QMakeParser::putTok(ushort *&tokPtr, ushort tok)
@@ -292,7 +290,7 @@ void QMakeParser::finalizeHashStr(ushort *buf, uint len)
buf[-2] = (ushort)(hash >> 16); buf[-2] = (ushort)(hash >> 16);
} }
bool QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar grammar) void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar grammar)
{ {
m_proFile = pro; m_proFile = pro;
m_lineNo = line; m_lineNo = line;
@@ -865,7 +863,6 @@ bool QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
leaveScope(tokPtr); leaveScope(tokPtr);
tokBuff.resize(tokPtr - (ushort *)tokBuff.constData()); // Reserved capacity stays tokBuff.resize(tokPtr - (ushort *)tokBuff.constData()); // Reserved capacity stays
*pro->itemsRef() = tokBuff; *pro->itemsRef() = tokBuff;
return true;
#undef FLUSH_VALUE_LIST #undef FLUSH_VALUE_LIST
#undef FLUSH_LITERAL #undef FLUSH_LITERAL

2
src/shared/proparser/qmakeparser.h
View File

@@ -127,7 +127,7 @@ private:
}; };
bool read(ProFile *pro, ParseFlags flags); bool read(ProFile *pro, ParseFlags flags);
bool read(ProFile *pro, const QString &content, int line, SubGrammar grammar); void read(ProFile *pro, const QString &content, int line, SubGrammar grammar);
ALWAYS_INLINE void putTok(ushort *&tokPtr, ushort tok); ALWAYS_INLINE void putTok(ushort *&tokPtr, ushort tok);
ALWAYS_INLINE void putBlockLen(ushort *&tokPtr, uint len); ALWAYS_INLINE void putBlockLen(ushort *&tokPtr, uint len);