Token: make sure calls are being match compiled (#6480)

Author: firewave

Diff for: lib/token.cpp

@@ -966,7 +966,7 @@ const Token * Token::findClosingBracket() const
         }
         // save named template parameter
         else if (templateParameter && depth == 1 && Token::Match(closing, "[,=]") &&
-                 closing->previous()->isName() && !Match(closing->previous(), "class|typename|."))
+                 closing->previous()->isName() && !Token::Match(closing->previous(), "class|typename|."))
             templateParameters.insert(closing->strAt(-1));
     }
 
@@ -2330,6 +2330,13 @@ void Token::setValueType(ValueType *vt)
     }
 }
 
+const ValueType *Token::argumentType() const {
+    const Token *top = this;
+    while (top && !Token::Match(top->astParent(), ",|("))
+        top = top->astParent();
+    return top ? top->mImpl->mValueType : nullptr;
+}
+
 void Token::type(const ::Type *t)
 {
     mImpl->mType = t;

Diff for: lib/token.h

@@ -333,12 +333,7 @@ class CPPCHECKLIB Token {
     }
     void setValueType(ValueType *vt);
 
-    const ValueType *argumentType() const {
-        const Token *top = this;
-        while (top && !Token::Match(top->astParent(), ",|("))
-            top = top->astParent();
-        return top ? top->mImpl->mValueType : nullptr;
-    }
+    const ValueType *argumentType() const;
 
     Token::Type tokType() const {
         return mTokType;