gnu.cfg: Define __typeof__ as typeof, fix simplifyTypedef() (cppcheck-opensource#2260)

versat · web-flow · commit 267d23f1b863 · 2019-10-14T08:20:22.000+02:00
`__typeof__` is just an alternative keyword for `typeof`, see https://gcc.gnu.org/onlinedocs/gcc/Typeof.html Since `typeof` is handled in several checkers it makes sense to define `__typeof__` as `typeof`. Tokenizer::simplifyTypedef(): Use `typeof` instead of `__typeof__` to be consistent with the rest of the code.
diff --git a/cfg/gnu.cfg b/cfg/gnu.cfg
@@ -47,6 +47,7 @@
   <define name="__builtin_nanl(str)" value="nanl(str)"/>
   <define name="__builtin_signbit(value)" value="signbit(value)"/>
   <define name="__extension__" value=""/>
+  <define name="__typeof__(T)" value="typeof(T)"/>
   <!-- void *__builtin_alloca (size_t size) -->
   <!-- alloca() is often defined as __builtin_alloca() so the define above does not work always -->
   <!-- void *alloca(size_t size); -->
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -842,8 +842,8 @@ void Tokenizer::simplifyTypedef()
             }
         }
 
-        // typeof: typedef __typeof__ ( ... ) type;
-        else if (Token::simpleMatch(tokOffset->previous(), "__typeof__ (") &&
+        // typeof: typedef typeof ( ... ) type;
+        else if (Token::simpleMatch(tokOffset->previous(), "typeof (") &&
                  Token::Match(tokOffset->link(), ") %type% ;")) {
             argStart = tokOffset;
             argEnd = tokOffset->link();
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -1626,10 +1626,10 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef64() {
-        const char code[] = "typedef __typeof__(__type1() + __type2()) __type;"
+        const char code[] = "typedef typeof(__type1() + __type2()) __type;"
                             "__type t;";
         const std::string actual(tok(code));
-        ASSERT_EQUALS("__typeof__ ( __type1 ( ) + __type2 ( ) ) t ;", actual);
+        ASSERT_EQUALS("typeof ( __type1 ( ) + __type2 ( ) ) t ;", actual);
         ASSERT_EQUALS("", errout.str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -842,8 +842,8 @@ void Tokenizer::simplifyTypedef()`
`842`	`842`	`}`
`843`	`843`	`}`
`844`	`844`
`845`		`- // typeof: typedef __typeof__ ( ... ) type;`
`846`		`- else if (Token::simpleMatch(tokOffset->previous(), "__typeof__ (") &&`
	`845`	`+ // typeof: typedef typeof ( ... ) type;`
	`846`	`+ else if (Token::simpleMatch(tokOffset->previous(), "typeof (") &&`
`847`	`847`	`Token::Match(tokOffset->link(), ") %type% ;")) {`
`848`	`848`	`argStart = tokOffset;`
`849`	`849`	`argEnd = tokOffset->link();`
Original file line number	Diff line number	Diff line change
`@@ -1626,10 +1626,10 @@ class TestSimplifyTypedef : public TestFixture {`
`1626`	`1626`	`}`
`1627`	`1627`
`1628`	`1628`	`void simplifyTypedef64() {`
`1629`		`- const char code[] = "typedef __typeof__(__type1() + __type2()) __type;"`
	`1629`	`+ const char code[] = "typedef typeof(__type1() + __type2()) __type;"`
`1630`	`1630`	`"__type t;";`
`1631`	`1631`	`const std::string actual(tok(code));`
`1632`		`- ASSERT_EQUALS("__typeof__ ( __type1 ( ) + __type2 ( ) ) t ;", actual);`
	`1632`	`+ ASSERT_EQUALS("typeof ( __type1 ( ) + __type2 ( ) ) t ;", actual);`
`1633`	`1633`	`ASSERT_EQUALS("", errout.str());`
`1634`	`1634`	`}`
`1635`	`1635`