Partial fix for #12486 Improve simplification of using statements

danmar · Mar 4, 2024 · afeb3fc · afeb3fc
1 parent 779141c
commit afeb3fc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2845,13 +2845,21 @@ bool Tokenizer::simplifyUsing()
         if (!Token::Match(tok, "using ::| %name% ::"))
             continue;
         Token* end = tok->tokAt(3);
-        while (end && end->str() != ";")
-            end = end->next();
+        while (end && !Token::Match(end, "[;,]")) {
+            if (end->str() == "<" && end->link()) // skip template args
+                end =end->link()->next();
+            else
+                end = end->next();
+        }
         if (!end)
             continue;
         if (!end->tokAt(-1)->isNameOnly()) // e.g. operator=
             continue;
         tok->insertToken(end->strAt(-1))->insertToken("=");
+        if (end->str() == ",") { // comma-separated list
+            end->str(";");
+            end->insertToken("using");
+        }
         tok = end;
     }
 

diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -683,14 +683,23 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
-    void simplifyUsing30() { // #8454
-        const char code[] = "using std::to_string;\n"
-                            "void f() {\n"
-                            "    std::string str = to_string(1);\n"
-                            "}\n";
-        const char expected[] = "void f ( ) { std :: string str ; str = std :: to_string ( 1 ) ; }";
-        ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
-        ASSERT_EQUALS("", errout.str());
+    void simplifyUsing30() {
+        {
+            const char code[] = "using std::to_string;\n" // #8454
+                                "void f() {\n"
+                                "    std::string str = to_string(1);\n"
+                                "}\n";
+            const char expected[] = "void f ( ) { std :: string str ; str = std :: to_string ( 1 ) ; }";
+            ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
+            ASSERT_EQUALS("", errout.str());
+        }
+        {
+            const char code[] = "using std::cout, std::endl, std::cerr, std::ostringstream;\n"
+                                "cerr << \"abc\";\n";
+            const char expected[] = "std :: cerr << \"abc\" ;";
+            ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
+            ASSERT_EQUALS("", errout.str());
+        }
     }
 
     void simplifyUsing8970() {