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

Handle auto * const (#4994) 

* Handle auto as first token

* Set varid when initialized by function

* Fix TODO from #11444

* Fix function parsing

* Add parentheses

* Format

* Handle auto * const

* Fix test on different platforms

* simpleMatch

* simpleMatch
This commit is contained in:
chrchr-github 2023-04-21 14:19:28 +02:00 committed by GitHub
parent ad464c4feb
commit 5a4e43760e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/symboldatabase.cpp
View File

@ -6202,6 +6202,8 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
autoTok = var1Tok->previous(); autoTok = var1Tok->previous();
else if (Token::Match(var1Tok->tokAt(-2), "auto *|&|&&")) else if (Token::Match(var1Tok->tokAt(-2), "auto *|&|&&"))
autoTok = var1Tok->tokAt(-2); autoTok = var1Tok->tokAt(-2);
else if (Token::simpleMatch(var1Tok->tokAt(-3), "auto * const"))
autoTok = var1Tok->tokAt(-3);
if (autoTok) { if (autoTok) {
ValueType vt(*vt2); ValueType vt(*vt2);
if (vt.constness & (1 << vt.pointer)) if (vt.constness & (1 << vt.pointer))
@ -6226,6 +6228,8 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
vt2_.constness |= (1 << vt2->pointer); vt2_.constness |= (1 << vt2->pointer);
if (!Token::Match(autoTok->tokAt(1), "*|&")) if (!Token::Match(autoTok->tokAt(1), "*|&"))
vt2_.constness = vt.constness; vt2_.constness = vt.constness;
if (Token::simpleMatch(autoTok->tokAt(1), "* const"))
vt2_.constness |= (1 << vt2->pointer);
var->setValueType(vt2_); var->setValueType(vt2_);
if (vt2->typeScope && vt2->typeScope->definedType) { if (vt2->typeScope && vt2->typeScope->definedType) {
var->type(vt2->typeScope->definedType); var->type(vt2->typeScope->definedType);

18
test/testsymboldatabase.cpp
View File

@ -8401,6 +8401,24 @@ private:
ASSERT(tok && tok->valueType()); ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int", tok->valueType()->str()); ASSERT_EQUALS("signed int", tok->valueType()->str());
} }
{
GET_SYMBOL_DB("void f(const std::string& s) {\n"
" const auto* const p = s.data();\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "auto");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS(ValueType::CHAR, tok->valueType()->type);
ASSERT_EQUALS(1, tok->valueType()->constness);
ASSERT_EQUALS(0, tok->valueType()->pointer);
tok = Token::findsimplematch(tok, "p");
ASSERT(tok && tok->variable() && tok->variable()->valueType());
ASSERT_EQUALS(ValueType::CHAR, tok->variable()->valueType()->type);
ASSERT_EQUALS(3, tok->variable()->valueType()->constness);
ASSERT_EQUALS(1, tok->variable()->valueType()->pointer);
}
} }
void valueTypeThis() { void valueTypeThis() {