diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 6344cc09668..b2d4341dcb4 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -599,27 +599,23 @@ bool ProFileEvaluator::Private::read(QString *out, const QString &content) void ProFileEvaluator::Private::putTok(ushort *&tokPtr, ushort tok) { - qDebug() << currentFileName() << m_lineNo << "put token" << tok << tokPtr; *tokPtr++ = tok; } void ProFileEvaluator::Private::putBlockLen(ushort *&tokPtr, uint len) { - qDebug() << currentFileName() << m_lineNo << "put block length" << len << tokPtr; *tokPtr++ = (ushort)len; *tokPtr++ = (ushort)(len >> 16); } void ProFileEvaluator::Private::putBlock(ushort *&tokPtr, const ushort *buf, uint len) { - qDebug() << currentFileName() << m_lineNo << "put block" << len << tokPtr; memcpy(tokPtr, buf, len * 2); tokPtr += len; } void ProFileEvaluator::Private::putHashStr(ushort *&pTokPtr, const ushort *buf, uint len) { - qDebug() << currentFileName() << m_lineNo << "put hash string" << QString((QChar *)buf, len) << pTokPtr; uint hash = ProString::hash((const QChar *)buf, len); ushort *tokPtr = pTokPtr; *tokPtr++ = (ushort)hash; @@ -631,7 +627,6 @@ void ProFileEvaluator::Private::putHashStr(ushort *&pTokPtr, const ushort *buf, void ProFileEvaluator::Private::finalizeHashStr(ushort *buf, uint len) { -// qDebug() << currentFileName() << m_lineNo << "finalized hash string" << QString((QChar *)buf, len) << (buf-4); buf[-4] = TokHashLiteral; buf[-1] = len; uint hash = ProString::hash((const QChar *)buf, len); @@ -701,7 +696,6 @@ bool ProFileEvaluator::Private::readInternal(QString *out, const QString &in) ushort needSep = 0; // Complementary to putSpace: separator outside quotes ushort quote = 0; ushort term = 0; -qDebug() << "starting fresh line" << currentFileName() << m_lineNo; ushort *ptr = buf; ptr += 4; @@ -710,38 +704,30 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; #define FLUSH_LHS_LITERAL(setSep) \ do { \ if ((tlen = ptr - xprPtr)) { \ - qDebug() << "flushing lhs literal" << QString((const QChar *)xprPtr, tlen); \ if (needSep) \ goto extraChars; \ finalizeHashStr(xprPtr, tlen); \ if (setSep) \ - { qDebug() << "need separator"; needSep = TokNewStr; } \ + needSep = TokNewStr; \ } else { \ - qDebug() << "no lhs literal to flush"; \ ptr -= 4; \ if (setSep && ptr != buf) \ - { qDebug() << "need separator"; \ needSep = TokNewStr; \ - } \ } \ } while (0) #define FLUSH_RHS_LITERAL(setSep) \ do { \ if ((tlen = ptr - xprPtr)) { \ - qDebug() << "flushing rhs literal" << QString((const QChar *)xprPtr, tlen) << !!needSep; \ xprPtr[-2] = TokLiteral | needSep; \ xprPtr[-1] = tlen; \ if (setSep) \ - { qDebug() << "need separator"; needSep = TokNewStr; } \ + needSep = TokNewStr; \ litCount++; \ } else { \ - qDebug() << "no rhs literal to flush"; \ ptr -= 2; \ if (setSep && ptr != ((context == CtxValue) ? tokPtr : buf)) \ - { qDebug() << "need separator"; \ needSep = TokNewStr; \ - } \ } \ } while (0) @@ -837,28 +823,22 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; if (context == CtxTest) { if (needSep) goto extraChars; - if (tlen) { - qDebug() << "pre-expand: flushing lhs literal" << QString((const QChar *)xprPtr, tlen); + if (tlen) finalizeHashStr(xprPtr, tlen); - } else { - qDebug() << "pre-expand: no lhs literal to flush"; + else ptr -= 4; - } } else { if (tlen) { - qDebug() << "pre-expand: flushing rhs literal" << QString((const QChar *)xprPtr, tlen) << !!needSep; xprPtr[-2] = TokLiteral | needSep; xprPtr[-1] = tlen; needSep = 0; litCount++; } else { - qDebug() << "pre-expand: no rhs literal to flush"; ptr -= 2; } } if (!lineMarked) { lineMarked = true; - qDebug() << currentFileName() << m_lineNo << "putting in-expression line marker"; *ptr++ = TokLine; *ptr++ = (ushort)m_lineNo; } @@ -904,7 +884,6 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; needSep = 0; expCount++; tlen = ptr - xprPtr; - qDebug() << "putting expand" << tok << QString((const QChar *)xprPtr, tlen); if (rtok == TokVariable) { xprPtr[-4] = tok; uint hash = ProString::hash((const QChar *)xprPtr, tlen); @@ -1148,7 +1127,6 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; } if (context == CtxValue) { tokPtr[-1] = litCount ? litCount + expCount : 0; - qDebug() << currentFileName() << m_lineNo << "advancing pointer by" << (ptr - tokPtr) << "now" << ptr; tokPtr = ptr; putTok(tokPtr, TokValueTerminator); } else { @@ -1174,7 +1152,6 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; ++m_lineNo; goto freshLine; } - qDebug() << "reached line end" << currentFileName() << m_lineNo; lineMarked = false; ignore: cur = cptr; @@ -1193,7 +1170,6 @@ qDebug() << "starting fresh line" << currentFileName() << m_lineNo; void ProFileEvaluator::Private::putLineMarker(ushort *&tokPtr) { if (m_markLine) { - qDebug() << currentFileName() << m_lineNo << "putting line marker for" << m_markLine; *tokPtr++ = TokLine; *tokPtr++ = (ushort)m_markLine; m_markLine = 0; @@ -1205,7 +1181,6 @@ void ProFileEvaluator::Private::enterScope(ushort *&tokPtr, bool special, ScopeS m_blockstack.resize(m_blockstack.size() + 1); m_blockstack.top().special = special; m_blockstack.top().start = tokPtr; - qDebug() << currentFileName() << m_lineNo << "entering scope at" << tokPtr; tokPtr += 2; m_state = state; m_canElse = false; @@ -1215,16 +1190,13 @@ void ProFileEvaluator::Private::enterScope(ushort *&tokPtr, bool special, ScopeS void ProFileEvaluator::Private::leaveScope(ushort *&tokPtr) { - qDebug() << currentFileName() << m_lineNo << "leaving scope"; if (m_blockstack.top().inBranch) { // Put empty else block - qDebug() << "closing pending else"; putBlockLen(tokPtr, 0); } if (ushort *start = m_blockstack.top().start) { putTok(tokPtr, TokTerminator); uint len = tokPtr - start - 2; - qDebug() << "storing block length" << len << "at" << start; start[0] = (ushort)len; start[1] = (ushort)(len >> 16); } @@ -1234,13 +1206,11 @@ void ProFileEvaluator::Private::leaveScope(ushort *&tokPtr) void ProFileEvaluator::Private::flushScopes(ushort *&tokPtr) { if (m_state == StNew) { - qDebug() << currentFileName() << m_lineNo << "flushing scopes"; while (!m_blockstack.top().braceLevel && m_blockstack.size() > 1) leaveScope(tokPtr); if (m_blockstack.top().inBranch) { m_blockstack.top().inBranch = false; // Put empty else block - qDebug() << "closing pending else"; putBlockLen(tokPtr, 0); } m_canElse = false; @@ -1249,7 +1219,6 @@ void ProFileEvaluator::Private::flushScopes(ushort *&tokPtr) void ProFileEvaluator::Private::flushCond(ushort *&tokPtr) { - qDebug() << currentFileName() << m_lineNo << "flushing condition"; if (m_state == StCond) { putTok(tokPtr, TokBranch); m_blockstack.top().inBranch = true; @@ -1295,7 +1264,6 @@ void ProFileEvaluator::Private::finalizeCond(ushort *&tokPtr, ushort *uc, ushort if (m_canElse && (!top.special || top.braceLevel)) { putTok(tokPtr, TokBranch); // Put empty then block -qDebug() << currentFileName() << m_lineNo << "putting empty then"; putBlockLen(tokPtr, 0); enterScope(tokPtr, false, StCtrl); return; @@ -1324,20 +1292,16 @@ qDebug() << currentFileName() << m_lineNo << "putting empty then"; void ProFileEvaluator::Private::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int argc) { - qDebug() << currentFileName() << m_lineNo << "finalizing call"; // Check for magic tokens if (*uc == TokHashLiteral) { - qDebug() << "... is literal"; uint nlen = uc[3]; ushort *uce = uc + 4 + nlen; if (*uce == TokTestCall) { - qDebug() << "... directly followed by call token"; uce++; m_tmp1.setRawData((QChar *)uc + 4, nlen); const QString *defName; ushort defType; if (m_tmp1 == statics.strfor) { - qDebug() << "... is for"; flushCond(tokPtr); putLineMarker(tokPtr); if (m_invert || m_operator == OrOperator) { @@ -1380,12 +1344,10 @@ void ProFileEvaluator::Private::finalizeCall(ushort *&tokPtr, ushort *uc, ushort logMessage(format("Syntax is for(var, list), for(var, forever) or for(ever).")); return; } else if (m_tmp1 == statics.strdefineReplace) { - qDebug() << "... is defineReplace"; defName = &statics.strdefineReplace; defType = TokReplaceDef; goto deffunc; } else if (m_tmp1 == statics.strdefineTest) { - qDebug() << "... is defineTest"; defName = &statics.strdefineTest; defType = TokTestDef; deffunc: @@ -1412,8 +1374,7 @@ void ProFileEvaluator::Private::finalizeCall(ushort *&tokPtr, ushort *uc, ushort logMessage(format("%1(function) requires one literal argument.").arg(*defName)); return; } - } else qDebug() << "... directly followed by token" << *uce; - + } } finalizeTest(tokPtr); @@ -1426,7 +1387,6 @@ uint ProFileEvaluator::Private::getBlockLen(const ushort *&tokPtr) { uint len = *tokPtr++; len |= (uint)*tokPtr++ << 16; -//qDebug() << "got uint" << len; return len; } @@ -1434,7 +1394,6 @@ ProString ProFileEvaluator::Private::getStr(const ushort *&tokPtr) { const QString &str(m_stringStack.top()); uint len = *tokPtr++; -// qDebug() << "getting string" << len << QString((const QChar *)tokPtr, len); ProString ret(str, tokPtr - (const ushort *)str.constData(), len, NoHash); tokPtr += len; return ret; @@ -1445,7 +1404,6 @@ ProString ProFileEvaluator::Private::getHashStr(const ushort *&tokPtr) uint hash = getBlockLen(tokPtr); uint len = *tokPtr++; const QString &str(m_stringStack.top()); -// qDebug() << "getting hashed string" << len << QString((const QChar *)tokPtr, len) << hash; ProString ret(str, tokPtr - (const ushort *)str.constData(), len, hash); tokPtr += len; return ret; @@ -1651,7 +1609,6 @@ void ProFileEvaluator::Private::evaluateExpression( bool pending = false; forever { ushort tok = *tokPtr++; - qDebug() << currentFileName() << m_lineNo << "read expression token" << tok << "at" << (tokPtr-1); if (tok & TokNewStr) pending = false; ushort maskedTok = tok & TokMask; @@ -1734,9 +1691,7 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProBlock( bool okey = true, or_op = false, invert = false; uint blockLen; VisitReturn ret = ReturnTrue; - qDebug() << "entering block at" << tokPtr; while (ushort tok = *tokPtr++) { - qDebug() << currentFileName() << m_lineNo << "read token" << tok << "at" << (tokPtr-1); switch (tok) { case TokLine: m_lineNo = *tokPtr++; @@ -1747,7 +1702,6 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProBlock( case TokRemove: case TokReplace: visitProVariable(tok, curr, tokPtr); - qDebug() << "visited variable" << curr.first().toQString() << "now at" << tokPtr; curr.clear(); continue; case TokBranch: @@ -1876,7 +1830,6 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProBlock( if (ret != ReturnTrue && ret != ReturnFalse) break; } -qDebug() << "leaving block at" << (tokPtr-1); return ret; } @@ -2029,9 +1982,7 @@ void ProFileEvaluator::Private::visitProVariable( replaceInList(&m_filevaluemap[currentProFile()][varName], regexp, replace, global, m_tmp2); } } else { - qDebug() << "expanding at" << tokPtr << "for" << varName.toQString(); ProStringList varVal = expandVariableReferences(tokPtr, sizeHint); - qDebug() << "expanded, now at" << tokPtr; switch (tok) { default: // whatever - cannot happen case TokAssign: // = @@ -2479,8 +2430,6 @@ static inline void flushFinal(ProStringList *ret, ProStringList ProFileEvaluator::Private::expandVariableReferences( const ProString &str, int *pos, bool joined) { -//qDebug() << currentFileName() << m_lineNo << str.toQString(); - ProStringList ret; // if (ok) // *ok = true; @@ -2740,9 +2689,7 @@ ProStringList ProFileEvaluator::Private::expandVariableReferences( ProStringList ret; ret.reserve(sizeHint); forever { - qDebug() << "expandVariableReferences, tokPtr now" << tokPtr << "ret size" << ret.size(); evaluateExpression(tokPtr, &ret, joined); - qDebug() << "left evaluateExpression, tokPtr now" << tokPtr << "ret size" << ret.size(); switch (*tokPtr) { case TokValueTerminator: case TokFuncTerminator: diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 708d67f80c8..c991713ac99 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -118,20 +118,20 @@ public: // These token definitions affect both ProFileEvaluator and ProWriter enum ProToken { TokTerminator = 0, // end of stream (possibly not included in length; must be zero) - TokLine = 1, // line marker: + TokLine, // line marker: // - line (1) - TokAssign = 2, // variable = - TokAppend = 3, // variable += + TokAssign, // variable = + TokAppend, // variable += TokAppendUnique, // variable *= TokRemove, // variable -= TokReplace, // variable ~= // previous literal/expansion is a variable manipulation // - value expression + TokValueTerminator - TokValueTerminator = 7, // assignment value terminator - TokLiteral = 8, // literal string (fully dequoted) + TokValueTerminator, // assignment value terminator + TokLiteral, // literal string (fully dequoted) // - length (1) // - string data (length; unterminated) - TokHashLiteral = 9, // literal string with hash (fully dequoted) + TokHashLiteral, // literal string with hash (fully dequoted) // - hash (2) // - length (1) // - string data (length; unterminated) @@ -139,28 +139,28 @@ enum ProToken { // - hash (2) // - name length (1) // - name (name length; unterminated) - TokProperty = 11, // qmake property expansion + TokProperty, // qmake property expansion // - name length (1) // - name (name length; unterminated) TokEnvVar, // environment variable expansion // - name length (1) // - name (name length; unterminated) - TokFuncName = 13, // replace function expansion + TokFuncName, // replace function expansion // - hash (2) // - name length (1) // - name (name length; unterminated) // - ((nested expansion + TokArgSeparator)* + nested expansion)? // - TokFuncTerminator - TokArgSeparator = 14, // function argument separator - TokFuncTerminator = 15, // function argument list terminator - TokCondition = 16, // previous literal/expansion is a conditional - TokTestCall = 17, // previous literal/expansion is a test function call + TokArgSeparator, // function argument separator + TokFuncTerminator, // function argument list terminator + TokCondition, // previous literal/expansion is a conditional + TokTestCall, // previous literal/expansion is a test function call // - ((nested expansion + TokArgSeparator)* + nested expansion)? // - TokFuncTerminator - TokNot = 18, // '!' operator + TokNot, // '!' operator TokAnd, // ':' operator TokOr, // '|' operator - TokBranch = 21, // branch point: + TokBranch, // branch point: // - then block length (2) // - then block + TokTerminator (then block length) // - else block length (2) @@ -170,7 +170,7 @@ enum ProToken { // - expression: length (2), bytes + TokValueTerminator (length) // - body length (2) // - body + TokTerminator (body length) - TokTestDef = 23, // test function definition: + TokTestDef, // test function definition: TokReplaceDef, // replace function definition: // - function name: hash (2), length (1), chars (length) // - body length (2)