Tokenizer: Use 'podtype' info from library. Partial fix for cppcheck-opensource#5623

danmar · danmar · commit a41f6077e154 · 2014-06-08T13:28:15.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2457,8 +2457,12 @@ static bool isInitList(const Token *tok)
 void Tokenizer::setVarId()
 {
     // Clear all variable ids
-    for (Token *tok = list.front(); tok; tok = tok->next())
-        tok->varId(0);
+    for (Token *tok = list.front(); tok; tok = tok->next()) {
+        if (tok->isName())
+            tok->varId(0);
+    }
+
+    setPodTypes();
 
     // Variable declarations can't start with "return" etc.
     std::set<std::string> notstart;
@@ -10519,3 +10523,24 @@ void Tokenizer::reportError(const std::list<const Token*>& callstack, Severity::
     else
         Check::reportError(errmsg);
 }
+
+void Tokenizer::setPodTypes()
+{
+    if (_settings) {
+        for (Token *tok = list.front(); tok; tok = tok->next()) {
+            if (!tok->isName())
+                continue;
+
+            // pod type
+            const struct Library::PodType *podType = _settings->library.podtype(tok->str());
+            if (podType) {
+                const Token *prev = tok->previous();
+                while (prev && prev->isName())
+                    prev = prev->previous();
+                if (prev && !Token::Match(prev, ";|{|}|,|("))
+                    continue;
+                tok->isStandardType(true);
+            }
+        }
+    }
+}
diff --git a/lib/tokenize.h b/lib/tokenize.h
@@ -798,6 +798,9 @@ class CPPCHECKLIB Tokenizer {
         return const_cast<Token*>(startOfExecutableScope(const_cast<const Token *>(tok)));
     }
 
+    /** Set pod types */
+    void setPodTypes();
+
     /** settings */
     const Settings * _settings;
 

Original file line number	Diff line number	Diff line change
`@@ -798,6 +798,9 @@ class CPPCHECKLIB Tokenizer {`
`798`	`798`	`return const_cast<Token>(startOfExecutableScope(const_cast<const Token >(tok)));`
`799`	`799`	`}`
`800`	`800`
	`801`	`+ /** Set pod types */`
	`802`	`+ void setPodTypes();`
	`803`	`+`
`801`	`804`	`/** settings */`
`802`	`805`	`const Settings * _settings;`
`803`	`806`