Add correct column number to enum tokens

Author: swasti16

lib/tokenize.cpp

@@ -9222,15 +9222,18 @@ void Tokenizer::simplifyStructDecl()
                 while (!Token::Match(start, "struct|class|union|enum")) {
                     after->insertToken(start->str());
                     after = after->next();
+                    after->column(start->column());
                     start->deleteThis();
                 }
                 tok = start;
                 if (!after)
                     break; // see #4869 segmentation fault in Tokenizer::simplifyStructDecl (invalid code)
                 after->insertToken(type->str());
+                after->next()->column(type->column());
                 if (start->str() != "class") {
                     after->insertToken(start->str());
                     after = after->next();
+                    after->column(start->column());
                 }
 
                 after = after->tokAt(2);

test/testtokenize.cpp

@@ -506,6 +506,10 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(dumpFallthrough);
 
         TEST_CASE(simplifyRedundantParentheses);
+
+        TEST_CASE(simplifyEnum1);
+
+        TEST_CASE(simplifyEnum2);
     }
 
     class TokenizerTest : public Tokenizer
@@ -8810,6 +8814,30 @@ class TestTokenizer : public TestFixture {
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
         ASSERT_NO_THROW(tokenizer.tokenize(code));
     }
+
+    void simplifyEnum1() {
+        const char code[] = "static enum {A,B} ab;";
+        ASSERT_EQUALS("enum Anonymous0 { A , B } ; static enum Anonymous0 ab ;", tokenizeAndStringify(code));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        tokenizer.tokenize(code);
+        const Token* tok = Token::findsimplematch(tokenizer.tokens(), "static");
+        ASSERT(tok);
+        ASSERT_EQUALS(tok->column(), 1);
+        ASSERT_EQUALS(tok->next()->column(), 8);
+        ASSERT_EQUALS(tok->tokAt(2)->column(), 0);
+    }
+
+    void simplifyEnum2() {
+        const char code[] = "enum static E {A,B} ab;";
+        ASSERT_EQUALS("enum E { A , B } ; static enum E ab ;", tokenizeAndStringify(code));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        tokenizer.tokenize(code);
+        const Token* tok = Token::findsimplematch(tokenizer.tokens(), "static");
+        ASSERT(tok);
+        ASSERT_EQUALS(tok->column(), 0);
+        ASSERT_EQUALS(tok->next()->column(), 1);
+        ASSERT_EQUALS(tok->tokAt(2)->column(), 13);
+    }
 };
 
 REGISTER_TEST(TestTokenizer)