From e843706a72b89cac47d78998a7f89178c37bf285 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Tue, 9 Jun 2026 13:22:40 +0200 Subject: [PATCH 1/2] Update tokenize.cpp --- lib/tokenize.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index c5b001f5d32..f195cdd7ad6 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -3862,7 +3862,8 @@ void Tokenizer::simplifyRedundantConsecutiveBraces() for (Token *tok = list.front(); tok;) { if (Token::simpleMatch(tok, "= {")) { tok = tok->linkAt(1); - } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }")) { + } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }") && + !Token::Match(tok->previous(), "%name%")) { //remove internal parentheses tok->linkAt(1)->deleteThis(); tok->deleteNext(); From d58c5a5dd43b5c77e9e40f688ef50e63f57b5693 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Tue, 9 Jun 2026 13:23:25 +0200 Subject: [PATCH 2/2] Update testsimplifytokens.cpp --- test/testsimplifytokens.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp index 6077438a9cf..2f04653a379 100644 --- a/test/testsimplifytokens.cpp +++ b/test/testsimplifytokens.cpp @@ -1422,6 +1422,7 @@ class TestSimplifyTokens : public TestFixture { ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}")); ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f () { for(;;){} }")); ASSERT_EQUALS("void f ( ) { { scope_lock lock ; foo ( ) ; } { scope_lock lock ; bar ( ) ; } }", tok("void f () { {scope_lock lock; foo();} {scope_lock lock; bar();} }")); + ASSERT_EQUALS("std :: map < int , int > m { { } } ;", tok("std::map m{ {} };")); } void simplifyOverride() { // ticket #5069