C++ casts

danmar · Apr 5, 2024 · 992494a · 992494a
1 parent 5ec0f77
commit 992494a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -5414,6 +5414,21 @@ void Tokenizer::createLinks2()
     }
 }
 
+void Tokenizer::markCppCasts()
+{
+    if (isC())
+        return;
+    for (Token* tok = list.front(); tok; tok = tok->next()) {
+        if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <")) {
+            if (!Token::simpleMatch(tok->linkAt(1), "> ("))
+                syntaxError(tok);
+            tok = tok->linkAt(1)->next();
+            tok->isCast(true);
+        }
+    }
+
+}
+
 void Tokenizer::sizeofAddParentheses()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
@@ -5807,14 +5822,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     createLinks2();
 
     // Mark C++ casts
-    for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <")) {
-            if (!Token::simpleMatch(tok->linkAt(1), "> ("))
-                syntaxError(tok);
-            tok = tok->linkAt(1)->next();
-            tok->isCast(true);
-        }
-    }
+    markCppCasts();
 
     // specify array size
     arraySize();

diff --git a/lib/tokenize.h b/lib/tokenize.h
@@ -387,6 +387,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void createLinks2();
 
+    /**
+     * Set isCast() for C++ casts
+     */
+    void markCppCasts();
+
 public:
 
     /** Syntax error */