Fixed #2693 (__declspec attribute not removed properly)

lib/tokenize.cpp

@@ -2063,9 +2063,6 @@ bool Tokenizer::tokenize(std::istream &code,
         }
     }
 
-    // remove some unhandled macros in global scope
-    removeMacrosInGlobalScope();
-
     // specify array size..
     arraySize();
 
@@ -2316,6 +2313,9 @@ bool Tokenizer::tokenize(std::istream &code,
     // Remove __declspec()
     simplifyDeclspec();
 
+    // remove some unhandled macros in global scope
+    removeMacrosInGlobalScope();
+
     // remove calling conventions __cdecl, __stdcall..
     simplifyCallingConvention();
 

test/testtokenize.cpp

@@ -5633,6 +5633,7 @@ private:
     {
         // remove some unhandled macros in the global scope.
         ASSERT_EQUALS("void f ( ) { }", tokenizeAndStringify("void f() NOTHROW { }"));
+        ASSERT_EQUALS("struct Foo { } ;", tokenizeAndStringify("struct __declspec(dllexport) Foo {};"));
     }
 
     void multipleAssignment()