From 9c594684db380534665e3670b4bce47cf2e57093 Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Sat, 21 Aug 2010 07:55:14 +0200
Subject: [PATCH] Tokenizer: handle DECLARE_DYNAMIC. Ticket: #1956

---
 lib/tokenize.cpp      | 7 +++++++
 test/testtokenize.cpp | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 164f311af..d1e0921de 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -8037,6 +8037,13 @@ void Tokenizer::simplifyBuiltinExpect()
             tok->deleteNext();
             tok->deleteNext();
         }
+        else if (Token::Match(tok->next(), "DECLARE_DYNAMIC ( %any% )"))
+        {
+            tok->deleteNext();
+            tok->deleteNext();
+            tok->deleteNext();
+            tok->deleteNext();
+        }
     }
 }
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 4dcf46de5..064c9c4d1 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -4376,6 +4376,9 @@ private:
     {
         const char code1[] = "class MyDialog : public CDialog { DECLARE_MESSAGE_MAP() private: CString text; };";
         ASSERT_EQUALS("class MyDialog : public CDialog { private: CString text ; } ;", tokenizeAndStringify(code1,false));
+
+        const char code2[] = "class MyDialog : public CDialog { DECLARE_DYNAMIC(MyDialog) private: CString text; };";
+        ASSERT_EQUALS("class MyDialog : public CDialog { private: CString text ; } ;", tokenizeAndStringify(code2,false));
     }
 };