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

Fix internalAstError with switch/case (#4739)

This commit is contained in:
chrchr-github 2023-01-26 20:11:45 +01:00 committed by GitHub
parent 58de191b99
commit c50339804b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenlist.cpp
View File

@ -651,7 +651,7 @@ static bool iscpp11init_impl(const Token * const tok)
} }
auto isCaseStmt = [](const Token* colonTok) { auto isCaseStmt = [](const Token* colonTok) {
if (!Token::Match(colonTok->tokAt(-1), "%name%|%num% :")) if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char% :"))
return false; return false;
const Token* caseTok = colonTok->tokAt(-2); const Token* caseTok = colonTok->tokAt(-2);
while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%")) while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))

11
test/testtokenize.cpp
View File

@ -6558,6 +6558,17 @@ private:
" });\n" " });\n"
"}\n")); "}\n"));
ASSERT_NO_THROW(tokenizeAndStringify("void f(const std::vector<char>& v) {\n"
" std::for_each(v.begin(), v.end(), [&](char c) {\n"
" switch (c) {\n"
" case 'r': {\n"
" if (c) {}\n"
" }\n"
" break;\n"
" }\n"
" });\n"
"}\n"));
// #11378 // #11378
ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };")); ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };"));
} }