Add correct column number to enum tokens

Author: swasti16

lib/tokenize.cpp

@@ -9222,6 +9222,7 @@ 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;

test/testtokenize.cpp

@@ -506,6 +506,8 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(dumpFallthrough);
 
         TEST_CASE(simplifyRedundantParentheses);
+
+        TEST_CASE(simplifyEnum);
     }
 
     class TokenizerTest : public Tokenizer
@@ -8810,6 +8812,16 @@ class TestTokenizer : public TestFixture {
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
         ASSERT_NO_THROW(tokenizer.tokenize(code));
     }
+
+    void simplifyEnum() {
+        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);
+    }
 };
 
 REGISTER_TEST(TestTokenizer)