AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make all parse errors invalidate the parse result

Browse Source 
they have been semi-warnings for a long enough time now.

Change-Id: I3fffd63f7b44b30d2dc18cdcd74221c10e98399d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-18 17:32:34 +01:00
parent 962c7ab6f8
commit 704aec4623
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qmake/library/qmakeparser.cpp
View File

@ -577,7 +577,6 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
parseError(fL1S("Missing %1 terminator [found %2]") parseError(fL1S("Missing %1 terminator [found %2]")
.arg(QChar(term)) .arg(QChar(term))
.arg(c ? QString(c) : QString::fromLatin1("end-of-line"))); .arg(c ? QString(c) : QString::fromLatin1("end-of-line")));
pro->setOk(false);
m_inError = true; m_inError = true;
// Just parse on, as if there was a terminator ... // Just parse on, as if there was a terminator ...
} else { } else {
@ -661,7 +660,6 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
parseError(fL1S("Extra characters after test expression.")); parseError(fL1S("Extra characters after test expression."));
else else
parseError(fL1S("Opening parenthesis without prior test name.")); parseError(fL1S("Opening parenthesis without prior test name."));
pro->setOk(false);
ptr = buf; // Put empty function name ptr = buf; // Put empty function name
} }
*ptr++ = TokTestCall; *ptr++ = TokTestCall;
@ -693,10 +691,8 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
finalizeCond(tokPtr, buf, ptr, wordCount); finalizeCond(tokPtr, buf, ptr, wordCount);
flushCond(tokPtr); flushCond(tokPtr);
++m_blockstack.top().braceLevel; ++m_blockstack.top().braceLevel;
if (grammar == TestGrammar) { if (grammar == TestGrammar)
parseError(fL1S("Opening scope not permitted in this context.")); parseError(fL1S("Opening scope not permitted in this context."));
pro->setOk(false);
}
goto nextItem; goto nextItem;
} else if (c == '}') { } else if (c == '}') {
FLUSH_LHS_LITERAL(); FLUSH_LHS_LITERAL();
@ -738,10 +734,8 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
putLineMarker(tokPtr); putLineMarker(tokPtr);
if (grammar == TestGrammar) { if (grammar == TestGrammar) {
parseError(fL1S("Assignment not permitted in this context.")); parseError(fL1S("Assignment not permitted in this context."));
pro->setOk(false);
} else if (wordCount != 1) { } else if (wordCount != 1) {
parseError(fL1S("Assignment needs exactly one word on the left hand side.")); parseError(fL1S("Assignment needs exactly one word on the left hand side."));
pro->setOk(false);
// Put empty variable name. // Put empty variable name.
} else { } else {
putBlock(tokPtr, buf, ptr - buf); putBlock(tokPtr, buf, ptr - buf);
@ -836,10 +830,8 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
} }
flushScopes(tokPtr); flushScopes(tokPtr);
if (m_blockstack.size() > 1) { if (m_blockstack.size() > 1)
parseError(fL1S("Missing closing brace(s).")); parseError(fL1S("Missing closing brace(s)."));
pro->setOk(false);
}
while (m_blockstack.size()) while (m_blockstack.size())
leaveScope(tokPtr); leaveScope(tokPtr);
tokBuff.resize(tokPtr - (ushort *)tokBuff.constData()); // Reserved capacity stays tokBuff.resize(tokPtr - (ushort *)tokBuff.constData()); // Reserved capacity stays
@ -939,7 +931,6 @@ void QMakeParser::bogusTest(ushort *&tokPtr)
m_invert = false; m_invert = false;
m_state = StCond; m_state = StCond;
m_canElse = true; m_canElse = true;
m_proFile->setOk(false);
} }
void QMakeParser::finalizeCond(ushort *&tokPtr, ushort *uc, ushort *ptr, int wordCount) void QMakeParser::finalizeCond(ushort *&tokPtr, ushort *uc, ushort *ptr, int wordCount)

5
qmake/library/qmakeparser.h
View File

@ -153,7 +153,10 @@ private:
void message(int type, const QString &msg) const; void message(int type, const QString &msg) const;
void parseError(const QString &msg) const void parseError(const QString &msg) const
{ message(QMakeParserHandler::ParserError, msg); } {
message(QMakeParserHandler::ParserError, msg);
m_proFile->setOk(false);
}
void languageWarning(const QString &msg) const void languageWarning(const QString &msg) const
{ message(QMakeParserHandler::ParserWarnLanguage, msg); } { message(QMakeParserHandler::ParserWarnLanguage, msg); }
void deprecationWarning(const QString &msg) const void deprecationWarning(const QString &msg) const