walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #925 from IOBYTE/master 

Fix #8020 (ValueType: no value type for iterator + constant)
This commit is contained in:
Daniel Marjamäki 2017-07-17 22:43:24 +02:00 committed by GitHub
parent 39ca654519 354a773bfe
commit 48473b5ef7
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/symboldatabase.cpp
View File

@ -4872,6 +4872,13 @@ void SymbolDatabase::setValueType(Token *tok, const ValueType &valuetype)
setValueType(parent, ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::FLOAT, 0U));
return;
}
// iterator +/- integral = iterator
if (vt1->type == ValueType::Type::ITERATOR && vt2 && vt2->isIntegral() &&
(parent->str() == "+" || parent->str() == "-")) {
setValueType(parent, *vt1);
return;
}
}
if (vt1->isIntegral() && vt1->pointer == 0U &&

17
test/testsymboldatabase.cpp
View File

@ -347,6 +347,7 @@ private:
TEST_CASE(auto7);
TEST_CASE(auto8);
TEST_CASE(auto9); // #8044 (segmentation fault)
TEST_CASE(auto10); // #8020
}
void array() {
@ -5240,6 +5241,22 @@ private:
ASSERT_EQUALS(true, db != nullptr); // not null
}
void auto10() { // #8020
GET_SYMBOL_DB("void f() {\n"
" std::vector<int> ints(4);\n"
" auto iter = ints.begin() + (ints.size() - 1);\n"
"}");
const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto iter");
ASSERT(db && autotok && autotok->valueType());
if (db && autotok && autotok->valueType()) {
ASSERT_EQUALS(0, autotok->valueType()->constness);
ASSERT_EQUALS(0, autotok->valueType()->pointer);
ASSERT_EQUALS(ValueType::UNKNOWN_SIGN, autotok->valueType()->sign);
ASSERT_EQUALS(ValueType::ITERATOR, autotok->valueType()->type);
}
}
};
REGISTER_TEST(TestSymbolDatabase)