Fix #13451 syntaxError due to bad using simplification with continued namespace (#7121)

Author: chrchr-github

lib/token.cpp

@@ -182,14 +182,21 @@ static const std::unordered_set<std::string> stdTypes = { "bool"
                                                           , "size_t"
                                                           , "void"
                                                           , "wchar_t"
+                                                          , "signed"
+                                                          , "unsigned"
 };
 
+bool Token::isStandardType(const std::string& str)
+{
+    return stdTypes.find(str) != stdTypes.end();
+}
+
 void Token::update_property_isStandardType()
 {
     if (mStr.size() < 3 || mStr.size() > 7)
         return;
 
-    if (stdTypes.find(mStr)!=stdTypes.end()) {
+    if (isStandardType(mStr)) {
         isStandardType(true);
         tokType(eType);
     }

lib/token.h

@@ -1177,6 +1177,8 @@ class CPPCHECKLIB Token {
 
     static std::string typeStr(const Token* tok);
 
+    static bool isStandardType(const std::string& str);
+
     /**
      * @return a pointer to the Enumerator associated with this token.
      */

lib/tokenize.cpp

@@ -82,7 +82,7 @@ static bool isEnumStart(const Token* tok)
     if (!Token::simpleMatch(tok, "{"))
         return false;
     tok = tok->previous();
-    while (tok && !tok->isKeyword() && Token::Match(tok, "%name%|::|:"))
+    while (tok && (!tok->isKeyword() || Token::isStandardType(tok->str())) && Token::Match(tok, "%name%|::|:"))
         tok = tok->previous();
     if (Token::simpleMatch(tok, "class"))
         tok = tok->previous();

test/testsimplifytypedef.cpp

@@ -222,6 +222,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef154);
         TEST_CASE(simplifyTypedef155);
         TEST_CASE(simplifyTypedef156);
+        TEST_CASE(simplifyTypedef157);
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -3758,6 +3759,20 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS(exp4, tok(code4));
     }
 
+    void simplifyTypedef157() {
+        const char code[] = "namespace NS1 {\n" // #13451
+                            "    typedef NS2::Bar Bar;\n"
+                            "    using NS2::MyType;\n"
+                            "}\n"
+                            "enum E : unsigned int {\n"
+                            "    zero = 0,\n"
+                            "    MyType = 1\n"
+                            "};\n"
+                            "namespace NS1 {}\n";
+        const char exp[] = "enum E : int { zero = 0 , MyType = 1 } ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"