feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

interpret '!' operator only at start of token

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-05-17 12:38:49 +02:00
parent f1b591bb06
commit a292fb1d77
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/proparser/profileevaluator.cpp
View File

@@ -674,6 +674,9 @@ bool ProFileEvaluator::Private::readInternal(ProBlock *pro, const QString &in, u
forever {
if (c == '"') {
quote = '"' - quote;
} else if (c == '!' && ptr == buf) {
insertOperator(c);
goto nextItem;
} else if (!quote) {
if (c == '(') {
++parens;
@@ -708,7 +711,7 @@ bool ProFileEvaluator::Private::readInternal(ProBlock *pro, const QString &in, u
inError = true;
goto skip;
}
if (c == '|' || c == '!') {
if (c == '|') {
updateItem(buf, ptr);
insertOperator(c);
goto nextItem;
@@ -2538,7 +2541,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
} else if (!parens) {
if (c == ':' || c == '|')
isOp = true;
else if (c == '!')
else if (c == '!' && test.isEmpty())
invert = true;
else
test += c;