unqiue varids

Author: ludviggunne

lib/tokenize.cpp

@@ -4712,6 +4712,41 @@ void Tokenizer::setVarIdPass1()
     bool initlist = false;
     bool inlineFunction = false;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
+        if (Token::simpleMatch(tok, ") (") && Token::simpleMatch(tok->link(), "( *")) {
+            const Token *typeTok = tok->link()->previous();
+            while (Token::Match(typeTok, "*|&")) {
+                typeTok = tok->previous();
+            }
+
+            if (!Token::Match(typeTok, "%type%"))
+                continue;
+
+            // Add globally unique varids to function pointer arguments
+            variableMap.enterScope();
+
+            tok = tok->next();
+            const Token *endTok = tok->link();
+            tok = tok->next();
+
+            for (Token *argTok = tok; argTok != endTok; argTok = argTok->next()) {
+                if (Token::simpleMatch(argTok, "("))
+                    argTok = argTok->link();
+
+                if (!Token::Match(argTok, "%name%|*|&|&& %name% ,|)"))
+                    continue;
+
+                argTok = argTok->next();
+
+                if (argTok->isStandardType())
+                    continue;
+
+                variableMap.addVariable(argTok->str(), false);
+                argTok->varId(variableMap.getVarId());
+            }
+
+            variableMap.leaveScope();
+            continue;
+        }
         if (tok->isOp())
             continue;
         if (cpp && Token::simpleMatch(tok, "template <")) {