Preprocessor: Use %oror% in multiCompare pattern
This commit is contained in:
parent
ec5ddb16b4
commit
e94e3eca82
|
@ -1478,8 +1478,8 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((!tok->previous() || tok->strAt(-1) == "||" || tok->strAt(-1) == "&&" || tok->strAt(-1) == "(") &&
|
else if ((!tok->previous() || Token::Match(tok->previous(), "&&|%oror%|(")) &&
|
||||||
(!tok->next() || tok->strAt(1) == "||" || tok->strAt(1) == "&&" || tok->strAt(1) == ")"))
|
(!tok->next() || Token::Match(tok->next(), "&&|%oror%|)")))
|
||||||
tok->str("1");
|
tok->str("1");
|
||||||
else
|
else
|
||||||
tok->deleteThis();
|
tok->deleteThis();
|
||||||
|
|
Loading…
Reference in New Issue