Skip to content

Fix #14497 FN variableScope (else branch, regression) #8227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 6 commits into from
Feb 20, 2026
+15 −3
Merged

Fix #14497 FN variableScope (else branch, regression) #8227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c524609
Update tokenize.cpp
chrchr-github Feb 17, 2026
4be28f0
Update checkother.cpp
chrchr-github Feb 17, 2026
c1fc2d8
Update testother.cpp
chrchr-github Feb 17, 2026
7dde7e4
Update testother.cpp
chrchr-github Feb 17, 2026
e2fa36c
Merge branch 'main' into chr_14497
chrchr-github Feb 19, 2026
8f2c02d
Update testother.cpp
chrchr-github Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ void CheckOther::checkVariableScope()
tok = tok->link();

// parse else if blocks..
} else if (Token::simpleMatch(tok, "else { if (") && Token::simpleMatch(tok->linkAt(3), ") {")) {
} else if (Token::simpleMatch(tok, "else { if (") && tok->next()->isSimplifiedScope() && Token::simpleMatch(tok->linkAt(3), ") {")) {
tok = tok->next();
} else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
reduce = false;
Expand Down
4 changes: 2 additions & 2 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7964,8 +7964,8 @@ void Tokenizer::elseif()

if (Token::Match(tok2, "}|;")) {
if (tok2->next() && tok2->strAt(1) != "else") {
tok->insertToken("{");
tok2->insertToken("}");
tok->insertToken("{")->isSimplifiedScope(true);
tok2->insertToken("}")->isSimplifiedScope(true);
Token::createMutualLinks(tok->next(), tok2->next());
break;
}
Expand Down
12 changes: 12 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ class TestOther : public TestFixture {
TEST_CASE(varScope42);
TEST_CASE(varScope43);
TEST_CASE(varScope44);
TEST_CASE(varScope45);

TEST_CASE(oldStylePointerCast);
TEST_CASE(intToPointerCast);
Expand Down Expand Up @@ -1972,6 +1973,17 @@ class TestOther : public TestFixture {
errout_str());
}

void varScope45() {
check("void g(int x, int y) {\n" // #14497
" int a = x, b = y;\n"
" if (a) {}\n"
" else {\n"
" if (b) {}\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:2:16]: (style) The scope of the variable 'b' can be reduced. [variableScope]\n", errout_str());
}

#define checkOldStylePointerCast(...) checkOldStylePointerCast_(__FILE__, __LINE__, __VA_ARGS__)
template<size_t size>
void checkOldStylePointerCast_(const char* file, int line, const char (&code)[size], Standards::cppstd_t std = Standards::CPPLatest) {
Expand Down
Loading