parent
b8f45a5c65
commit
8fcef7ad0d
|
@ -4155,8 +4155,7 @@ struct ConditionHandler {
|
|||
ErrorLogger* errorLogger,
|
||||
const Settings* settings,
|
||||
const std::function<
|
||||
void(const Condition& cond, Token* tok, const Scope* scope, const std::vector<const Variable*>& vars)>& f) const
|
||||
{
|
||||
void(const Condition& cond, Token* tok, const Scope* scope, const std::vector<const Variable*>& vars)>& f) const {
|
||||
for (const Scope *scope : symboldatabase->functionScopes) {
|
||||
std::set<unsigned> aliased;
|
||||
for (Token *tok = const_cast<Token *>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
|
||||
|
@ -4206,8 +4205,7 @@ struct ConditionHandler {
|
|||
void afterCondition(TokenList* tokenlist,
|
||||
SymbolDatabase* symboldatabase,
|
||||
ErrorLogger* errorLogger,
|
||||
const Settings* settings) const
|
||||
{
|
||||
const Settings* settings) const {
|
||||
traverseCondition(
|
||||
tokenlist,
|
||||
symboldatabase,
|
||||
|
@ -4434,13 +4432,11 @@ struct SimpleConditionHandler : ConditionHandler {
|
|||
const Token* exprTok,
|
||||
const std::list<ValueFlow::Value>& values,
|
||||
TokenList* tokenlist,
|
||||
const Settings* settings) const OVERRIDE
|
||||
{
|
||||
const Settings* settings) const OVERRIDE {
|
||||
return valueFlowForward(start->next(), stop, exprTok, values, tokenlist, settings).isModified();
|
||||
}
|
||||
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE
|
||||
{
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE {
|
||||
Condition cond;
|
||||
ValueFlow::Value true_value;
|
||||
ValueFlow::Value false_value;
|
||||
|
@ -5943,8 +5939,7 @@ static std::list<ValueFlow::Value> getIteratorValues(std::list<ValueFlow::Value>
|
|||
}
|
||||
|
||||
struct IteratorConditionHandler : SimpleConditionHandler {
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE
|
||||
{
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE {
|
||||
Condition cond;
|
||||
|
||||
ValueFlow::Value true_value;
|
||||
|
@ -6138,8 +6133,7 @@ struct ContainerConditionHandler : ConditionHandler {
|
|||
const Token* exprTok,
|
||||
const std::list<ValueFlow::Value>& values,
|
||||
TokenList* tokenlist,
|
||||
const Settings*) const OVERRIDE
|
||||
{
|
||||
const Settings*) const OVERRIDE {
|
||||
// TODO: Forward multiple values
|
||||
if (values.empty())
|
||||
return false;
|
||||
|
@ -6149,8 +6143,7 @@ struct ContainerConditionHandler : ConditionHandler {
|
|||
return valueFlowContainerForward(start->next(), stop, var, values.front(), tokenlist).isModified();
|
||||
}
|
||||
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE
|
||||
{
|
||||
virtual Condition parse(const Token* tok, const Settings*) const OVERRIDE {
|
||||
Condition cond;
|
||||
ValueFlow::Value true_value;
|
||||
ValueFlow::Value false_value;
|
||||
|
|
Loading…
Reference in New Issue