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

don't make an even number of bangs almost entirely invisible

Browse Source 
otherwise we'd silently accept this nonsensical code:
  !!defineTest(foo) {}

Change-Id: I66b59c8a89852c6451ce8d7269a3dc66a53e3b1f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-19 13:25:10 +01:00
parent 73c84fb32b
commit b7e839fbbd
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qmake/library/qmakeparser.cpp
View File

@ -320,7 +320,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
m_canElse = false; m_canElse = false;
freshLine: freshLine:
m_state = StNew; m_state = StNew;
m_invert = false; m_invert = 0;
m_operator = NoOperator; m_operator = NoOperator;
m_markLine = m_lineNo; m_markLine = m_lineNo;
m_inError = false; m_inError = false;
@ -603,7 +603,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
quote = 0; quote = 0;
goto nextChr; goto nextChr;
} else if (c == '!' && ptr == xprPtr && context == CtxTest) { } else if (c == '!' && ptr == xprPtr && context == CtxTest) {
m_invert ^= true; m_invert++;
goto nextChr; goto nextChr;
} }
} else if (c == '\'' || c == '"') { } else if (c == '\'' || c == '"') {
@ -666,7 +666,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
term = ':'; term = ':';
goto funcCall; goto funcCall;
} else if (c == '!' && ptr == xprPtr) { } else if (c == '!' && ptr == xprPtr) {
m_invert ^= true; m_invert++;
goto nextChr; goto nextChr;
} else if (c == ':') { } else if (c == ':') {
FLUSH_LHS_LITERAL(); FLUSH_LHS_LITERAL();
@ -923,7 +923,7 @@ void QMakeParser::warnOperator(const char *msg)
{ {
if (m_invert) { if (m_invert) {
languageWarning(fL1S("Stray NOT operator %1.").arg(fL1S(msg))); languageWarning(fL1S("Stray NOT operator %1.").arg(fL1S(msg)));
m_invert = false; m_invert = 0;
} }
if (m_operator == AndOperator) { if (m_operator == AndOperator) {
languageWarning(fL1S("Stray AND operator %1.").arg(fL1S(msg))); languageWarning(fL1S("Stray AND operator %1.").arg(fL1S(msg)));
@ -939,7 +939,7 @@ bool QMakeParser::failOperator(const char *msg)
bool fail = false; bool fail = false;
if (m_invert) { if (m_invert) {
parseError(fL1S("Unexpected NOT operator %1.").arg(fL1S(msg))); parseError(fL1S("Unexpected NOT operator %1.").arg(fL1S(msg)));
m_invert = false; m_invert = 0;
fail = true; fail = true;
} }
if (m_operator == AndOperator) { if (m_operator == AndOperator) {
@ -980,10 +980,9 @@ void QMakeParser::finalizeTest(ushort *&tokPtr)
flushScopes(tokPtr); flushScopes(tokPtr);
putLineMarker(tokPtr); putLineMarker(tokPtr);
putOperator(tokPtr); putOperator(tokPtr);
if (m_invert) { if (m_invert & 1)
putTok(tokPtr, TokNot); putTok(tokPtr, TokNot);
m_invert = false; m_invert = 0;
}
m_state = StCond; m_state = StCond;
m_canElse = true; m_canElse = true;
} }
@ -994,7 +993,7 @@ void QMakeParser::bogusTest(ushort *&tokPtr, const QString &msg)
parseError(msg); parseError(msg);
flushScopes(tokPtr); flushScopes(tokPtr);
m_operator = NoOperator; m_operator = NoOperator;
m_invert = false; m_invert = 0;
m_state = StCond; m_state = StCond;
m_canElse = true; m_canElse = true;
} }

2
qmake/library/qmakeparser.h
View File

@ -175,7 +175,7 @@ private:
int m_markLine; // Put marker for this line int m_markLine; // Put marker for this line
bool m_inError; // Current line had a parsing error; suppress followup error messages bool m_inError; // Current line had a parsing error; suppress followup error messages
bool m_canElse; // Conditionals met on previous line, but no scope was opened bool m_canElse; // Conditionals met on previous line, but no scope was opened
bool m_invert; // Pending conditional is negated int m_invert; // Pending conditional is negated
enum { NoOperator, AndOperator, OrOperator } m_operator; // Pending conditional is ORed/ANDed enum { NoOperator, AndOperator, OrOperator } m_operator; // Pending conditional is ORed/ANDed
QString m_tmp; // Temporary for efficient toQString QString m_tmp; // Temporary for efficient toQString