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

ValueType: initial handling of new

This commit is contained in:
Daniel Marjamäki 2017-02-27 20:57:28 +01:00
parent ce3bc006e7
commit 994f6b684d
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/symboldatabase.cpp
View File

@ -4828,6 +4828,29 @@ void SymbolDatabase::setValueTypeInTokenList(Token *tokens, bool cpp, const Sett
setValueType(tok, *tok->variable(), cpp, defsign, settings);
} else if (tok->enumerator()) {
setValueType(tok, *tok->enumerator(), cpp, defsign, settings);
} else if (cpp && tok->str() == "new") {
if (Token::Match(tok, "new %type% ;|[")) {
ValueType vt;
vt.pointer = 1;
const Token * const typeTok = tok->next();
// TODO: Reuse code in parsedecl
if (typeTok->str() == "char")
vt.type = ValueType::Type::CHAR;
else if (typeTok->str() == "short")
vt.type = ValueType::Type::SHORT;
else if (typeTok->str() == "int")
vt.type = ValueType::Type::INT;
else if (typeTok->str() == "long")
vt.type = ValueType::Type::LONG;
if (typeTok->isUnsigned())
vt.sign = ValueType::Sign::UNSIGNED;
else if (typeTok->isSigned())
vt.sign = ValueType::Sign::SIGNED;
if (vt.sign == ValueType::Sign::UNKNOWN_SIGN && vt.isIntegral())
vt.sign = (vt.type == ValueType::Type::CHAR) ? defsign : ValueType::Sign::SIGNED;
if (vt.type != ValueType::Type::UNKNOWN_TYPE)
setValueType(tok, vt, cpp, defsign, settings);
}
}
}
}

1
test/testsymboldatabase.cpp
View File

@ -4242,6 +4242,7 @@ private:
// auto variables
ASSERT_EQUALS("signed int", typeOf("; auto x = 3;", "x"));
ASSERT_EQUALS("signed int *", typeOf("; auto *p = (int *)0;", "p"));
ASSERT_EQUALS("signed int *", typeOf("; auto data = new int[100];", "data"));
ASSERT_EQUALS("const signed short", typeOf("short values[10]; void f() { for (const auto *x : values); }", "x"));
}