1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

factor out putOperator()

Browse Source 
Change-Id: I1b01e36e15dc93fc4e37597b66841d7102fa6b0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-17 20:45:08 +01:00
parent d800ac64d3
commit bb26d1da00
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/library/qmakeparser.cpp
View File

@ -908,14 +908,19 @@ void QMakeParser::flushCond(ushort *&tokPtr)
} }
} }
void QMakeParser::finalizeTest(ushort *&tokPtr) void QMakeParser::putOperator(ushort *&tokPtr)
{ {
flushScopes(tokPtr);
putLineMarker(tokPtr);
if (m_operator != NoOperator) { if (m_operator != NoOperator) {
putTok(tokPtr, (m_operator == AndOperator) ? TokAnd : TokOr); putTok(tokPtr, (m_operator == AndOperator) ? TokAnd : TokOr);
m_operator = NoOperator; m_operator = NoOperator;
} }
}
void QMakeParser::finalizeTest(ushort *&tokPtr)
{
flushScopes(tokPtr);
putLineMarker(tokPtr);
putOperator(tokPtr);
if (m_invert) { if (m_invert) {
putTok(tokPtr, TokNot); putTok(tokPtr, TokNot);
m_invert = false; m_invert = false;
@ -1059,10 +1064,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg
if (*uce == (TokLiteral|TokNewStr)) { if (*uce == (TokLiteral|TokNewStr)) {
uint nlen = uce[1]; uint nlen = uce[1];
if (uce[nlen + 2] == TokFuncTerminator) { if (uce[nlen + 2] == TokFuncTerminator) {
if (m_operator != NoOperator) { putOperator(tokPtr);
putTok(tokPtr, (m_operator == AndOperator) ? TokAnd : TokOr);
m_operator = NoOperator;
}
putTok(tokPtr, defType); putTok(tokPtr, defType);
putHashStr(tokPtr, uce + 2, nlen); putHashStr(tokPtr, uce + 2, nlen);
enterScope(tokPtr, true, StCtrl); enterScope(tokPtr, true, StCtrl);

1
qmake/library/qmakeparser.h
View File

@ -144,6 +144,7 @@ private:
const ushort *cur, const QString &in); const ushort *cur, const QString &in);
void finalizeCond(ushort *&tokPtr, ushort *uc, ushort *ptr, int wordCount); void finalizeCond(ushort *&tokPtr, ushort *uc, ushort *ptr, int wordCount);
void finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int argc); void finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int argc);
void putOperator(ushort *&tokPtr);
void finalizeTest(ushort *&tokPtr); void finalizeTest(ushort *&tokPtr);
void bogusTest(ushort *&tokPtr, const QString &msg); void bogusTest(ushort *&tokPtr, const QString &msg);
void enterScope(ushort *&tokPtr, bool special, ScopeState state); void enterScope(ushort *&tokPtr, bool special, ScopeState state);