Simplify _declspec like __declspec

PKEuS · PKEuS · commit c2ccd7d9e45d · 2015-04-11T11:02:52.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9177,7 +9177,7 @@ void Tokenizer::simplifyCallingConvention()
 void Tokenizer::simplifyDeclspec()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        while (Token::simpleMatch(tok, "__declspec (") && tok->next()->link() && tok->next()->link()->next()) {
+        while (Token::Match(tok, "__declspec|_declspec (") && tok->next()->link() && tok->next()->link()->next()) {
             if (Token::Match(tok->tokAt(2), "noreturn|nothrow")) {
                 Token *tok1 = tok->next()->link()->next();
                 while (tok1 && !Token::Match(tok1, "%name%")) {
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -5068,6 +5068,7 @@ class TestTokenizer : public TestFixture {
 
     void removedeclspec() {
         ASSERT_EQUALS("a b", tokenizeAndStringify("a __declspec ( dllexport ) b"));
+        ASSERT_EQUALS("a b", tokenizeAndStringify("a _declspec ( dllexport ) b"));
         ASSERT_EQUALS("int a ;", tokenizeAndStringify("__declspec(thread) __declspec(align(32)) int a;"));
         ASSERT_EQUALS("int i ;", tokenizeAndStringify("__declspec(allocate(\"mycode\")) int i;"));
         ASSERT_EQUALS("struct IUnknown ;", tokenizeAndStringify("struct __declspec(uuid(\"00000000-0000-0000-c000-000000000046\")) IUnknown;"));

Original file line number	Diff line number	Diff line change
`@@ -9177,7 +9177,7 @@ void Tokenizer::simplifyCallingConvention()`
`9177`	`9177`	`void Tokenizer::simplifyDeclspec()`
`9178`	`9178`	`{`
`9179`	`9179`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`9180`		`- while (Token::simpleMatch(tok, "__declspec (") && tok->next()->link() && tok->next()->link()->next()) {`
	`9180`	`+ while (Token::Match(tok, "__declspec\|_declspec (") && tok->next()->link() && tok->next()->link()->next()) {`
`9181`	`9181`	`if (Token::Match(tok->tokAt(2), "noreturn\|nothrow")) {`
`9182`	`9182`	`Token *tok1 = tok->next()->link()->next();`
`9183`	`9183`	`while (tok1 && !Token::Match(tok1, "%name%")) {`