Move check

Author: ludviggunne

lib/tokenize.cpp

@@ -5040,19 +5040,22 @@ void Tokenizer::setVarIdPass1()
                 }
             }
 
-            bool isFuncPointerArg = false;
-            const Token *fpTok = tok;
-            while (Token::Match(fpTok, "%name%|&|*|,"))
-                fpTok = fpTok->previous();
-            if (fpTok && fpTok->str() == "(" && (fpTok = fpTok->previous()) && (fpTok = fpTok->link()))
-                isFuncPointerArg = Token::Match(fpTok->previous(), "%type% ( *");
-
-            if (tok->varId() == 0 && !isFuncPointerArg && (!scopeStack.top().isEnum || !(Token::Match(tok->previous(), "{|,") && Token::Match(tok->next(), ",|=|}"))) &&
+            if (tok->varId() == 0 && (!scopeStack.top().isEnum || !(Token::Match(tok->previous(), "{|,") && Token::Match(tok->next(), ",|=|}"))) &&
                 !Token::simpleMatch(tok->next(), ": ;") && !(tok->tokAt(-1) && Token::Match(tok->tokAt(-2), "{|, ."))) {
-                const auto it = variableMap.map(globalNamespace).find(tok->str());
-                if (it != variableMap.map(globalNamespace).end()) {
-                    tok->varId(it->second);
-                    setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+
+                bool isFuncPointerArg = false;
+                const Token *fpTok = tok;
+                while (Token::Match(fpTok, "%name%|&|*|,"))
+                    fpTok = fpTok->previous();
+                if (fpTok && fpTok->str() == "(" && (fpTok = fpTok->previous()) && (fpTok = fpTok->link()))
+                    isFuncPointerArg = Token::Match(fpTok->previous(), "%type% ( *");
+
+                if (!isFuncPointerArg) {
+                    const auto it = variableMap.map(globalNamespace).find(tok->str());
+                    if (it != variableMap.map(globalNamespace).end()) {
+                        tok->varId(it->second);
+                        setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    }
                 }
             }
         } else if (Token::Match(tok, "::|. %name%") && Token::Match(tok->previous(), ")|]|>|%name%")) {