add originalName field

Author: ludviggunne

lib/tokenize.cpp

@@ -1119,9 +1119,12 @@ void Tokenizer::simplifyTypedef()
                 typedefInfo.filename = list.file(nameToken);
                 typedefInfo.lineNumber = nameToken->linenr();
                 typedefInfo.column = nameToken->column();
-                if (Token::Match(typedefToken->next(), "struct|enum|class|union %name% {") && typedefToken->strAt(2) == typedefInfo.name) {
-                    typedefInfo.tagLine = typedefToken->tokAt(2)->linenr();
-                    typedefInfo.tagColumn = typedefToken->tokAt(2)->column();
+                if (Token::Match(typedefToken->next(), "struct|enum|class|union %name% {")) {
+                    typedefInfo.originalName = typedefToken->tokAt(2)->str();
+                    if (typedefToken->strAt(2) == typedefInfo.name) {
+                        typedefInfo.tagLine = typedefToken->tokAt(2)->linenr();
+                        typedefInfo.tagColumn = typedefToken->tokAt(2)->column();
+                    }
                 }
                 typedefInfo.used = t.second.isUsed();
                 typedefInfo.isFunctionPointer = isFunctionPointer(t.second.nameToken());
@@ -6369,6 +6372,12 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += typedefInfo.name;
         outs += "\"";
 
+        if (!typedefInfo.originalName.empty()) {
+            outs += " originalName=\"";
+            outs += typedefInfo.originalName;
+            outs += "\"";
+        }
+
         outs += " file=\"";
         outs += ErrorLogger::toxml(typedefInfo.filename);
         outs += "\"";

lib/tokenize.h

@@ -693,6 +693,7 @@ class CPPCHECKLIB Tokenizer {
     };
     struct TypedefInfo {
         std::string name;
+        std::string originalName;
         std::string filename;
         int lineNumber;
         int column;