remove type signatures from AST in generic selections

Author: ludviggunne

lib/tokenlist.cpp

@@ -1804,6 +1804,7 @@ void TokenList::createAst() const
             throw InternalError(tok, "Syntax Error: Infinite loop when creating AST.", InternalError::AST);
         tok = nextTok;
     }
+    removeGenericTypes();
 }
 
 namespace {
@@ -2245,3 +2246,25 @@ void TokenList::setLang(Standards::Language lang, bool force)
 
     mLang = lang;
 }
+
+void TokenList::removeGenericTypes() const
+{
+    for (Token *tok = mTokensFrontBack.front; tok != mTokensFrontBack.back; tok = tok->next()) {
+        if (!Token::simpleMatch(tok, "_Generic"))
+            continue;
+        tok = tok->next();
+        Token *link = tok->link();
+        tok = tok->astOperand2();
+
+        while (tok) {
+            if (Token::simpleMatch(tok->astOperand2(), ":")) {
+                Token *tok2 = tok->astOperand2()->astOperand2();
+                tok2->astParent(nullptr);
+                tok->astOperand2(tok2);
+            }
+            tok = tok->astOperand1();
+        }
+
+        tok = link;
+    }
+}

lib/tokenlist.h

@@ -206,6 +206,8 @@ class CPPCHECKLIB TokenList {
 
     bool createTokensInternal(std::istream &code, const std::string& file0);
 
+    void removeGenericTypes() const;
+
     /** Token list */
     TokensFrontBack mTokensFrontBack;
 

test/testtokenize.cpp

@@ -8394,7 +8394,7 @@ class TestTokenizer : public TestFixture {
 
     void genericInIf() { // #13561
         const char code[] = "  if (_Generic(s, char * : 1, const float * : 2, volatile int * : 3, default : 0)) {}";
-        const char ast[] = "(( if (( _Generic (, (, (, (, s (: char 1)) (: float 2)) (: int 3)) (: default 0))))";
+        const char ast[] = "(( if (( _Generic (, (, (, (, s 1) 2) 3) 0)))";
         ASSERT_EQUALS(ast, testAst(code, AstStyle::Z3));
     }
 };