Fixed cppcheck-opensource#5069 (sizeof(void) when variable name is override)

IOBYTE · danmar · commit 44559a1fb2d6 · 2013-10-05T07:40:59.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9246,7 +9246,7 @@ void Tokenizer::simplifyKeyword()
 
     if (_settings->standards.cpp >= Standards::CPP11) {
         for (Token *tok = list.front(); tok; tok = tok->next()) {
-            while (Token::Match(tok, "constexpr|override")) {
+            while (tok->str() == "constexpr") {
                 tok->deleteThis();
             }
 
@@ -9255,6 +9255,13 @@ void Tokenizer::simplifyKeyword()
             // struct name final { };   <- struct is final
             if (Token::Match(tok, ") final [{;]") || Token::Match(tok, "%type% final [:{]"))
                 tok->deleteNext();
+
+            // override
+            // void f() override;
+            else if (Token::Match(tok, ") override [{;]"))
+                tok->deleteNext();
+            else if (Token::Match(tok, ") const override [{;]"))
+                tok->next()->deleteNext();
         }
     }
 }
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -447,6 +447,7 @@ class TestSimplifyTokens : public TestFixture {
 
         TEST_CASE(simplifyArrayAddress);  // Replace "&str[num]" => "(str + num)"
         TEST_CASE(simplifyCharAt);
+        TEST_CASE(simplifyOverride); // ticket #5069
     }
 
     std::string tok(const char code[], bool simplify = true, Settings::PlatformType type = Settings::Unspecified) {
@@ -8237,6 +8238,16 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("int evallex ( ) { int c ; int t ; do { c = macroid ( c ) ; if ( c == EOF_CHAR || c == '\n' ) { } t = type [ c ] ; } while ( t == LET && catenate ( ) ) ; }",
                       tok(code, true));
     }
+
+    void simplifyOverride() { // ticket #5069
+        const char code[] = "void fun() {\n"
+                            "    unsigned char override[] = {0x01, 0x02};\n"
+                            "    doSomething(override, sizeof(override));\n"
+                            "}\n";
+        ASSERT_EQUALS("void fun ( ) { char override [ 2 ] = { 1 , 2 } ; doSomething ( override , 2 ) ; }",
+                      tok(code, true));
+    }
+
 };
 
 REGISTER_TEST(TestSimplifyTokens)

Original file line number	Diff line number	Diff line change
`@@ -9246,7 +9246,7 @@ void Tokenizer::simplifyKeyword()`
`9246`	`9246`
`9247`	`9247`	`if (_settings->standards.cpp >= Standards::CPP11) {`
`9248`	`9248`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`9249`		`- while (Token::Match(tok, "constexpr\|override")) {`
	`9249`	`+ while (tok->str() == "constexpr") {`
`9250`	`9250`	`tok->deleteThis();`
`9251`	`9251`	`}`
`9252`	`9252`
`@@ -9255,6 +9255,13 @@ void Tokenizer::simplifyKeyword()`
`9255`	`9255`	`// struct name final { }; <- struct is final`
`9256`	`9256`	`if (Token::Match(tok, ") final [{;]") \|\| Token::Match(tok, "%type% final [:{]"))`
`9257`	`9257`	`tok->deleteNext();`
	`9258`	`+`
	`9259`	`+ // override`
	`9260`	`+ // void f() override;`
	`9261`	`+ else if (Token::Match(tok, ") override [{;]"))`
	`9262`	`+ tok->deleteNext();`
	`9263`	`+ else if (Token::Match(tok, ") const override [{;]"))`
	`9264`	`+ tok->next()->deleteNext();`
`9258`	`9265`	`}`
`9259`	`9266`	`}`
`9260`	`9267`	`}`