make some messages less ambiguous
Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
parent
bec885380a
commit
7dcc2b3246
@ -672,7 +672,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
|
||||
FLUSH_LHS_LITERAL();
|
||||
finalizeCond(tokPtr, buf, ptr, wordCount);
|
||||
if (m_state == StNew)
|
||||
parseError(fL1S("And operator without prior condition."));
|
||||
parseError(fL1S("AND operator without prior condition."));
|
||||
else
|
||||
m_operator = AndOperator;
|
||||
nextItem:
|
||||
@ -682,7 +682,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
|
||||
FLUSH_LHS_LITERAL();
|
||||
finalizeCond(tokPtr, buf, ptr, wordCount);
|
||||
if (m_state != StCond)
|
||||
parseError(fL1S("Or operator without prior condition."));
|
||||
parseError(fL1S("OR operator without prior condition."));
|
||||
else
|
||||
m_operator = OrOperator;
|
||||
goto nextItem;
|
||||
@ -1062,7 +1062,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg
|
||||
defType = TokTestDef;
|
||||
deffunc:
|
||||
if (m_invert) {
|
||||
bogusTest(tokPtr, fL1S("Unexpected operator in front of function definition."));
|
||||
bogusTest(tokPtr, fL1S("Unexpected NOT operator in front of function definition."));
|
||||
return;
|
||||
}
|
||||
flushScopes(tokPtr);
|
||||
|
Loading…
Reference in New Issue
Block a user