change string of token inserted for unnamed bit-fields

Author: ludviggunne

lib/checkclass.cpp

@@ -231,7 +231,7 @@ void CheckClass::constructors()
                 if (usage.assign || usage.init || var.isStatic())
                     continue;
 
-                if (var.nameToken() && var.nameToken()->isAnonymousBitfield())
+                if (var.nameToken() && var.nameToken()->isAnonymous())
                     continue;
 
                 if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())

lib/checkunusedvar.cpp

@@ -1575,7 +1575,7 @@ void CheckUnusedVar::checkStructMemberUsage()
             if (isInherited && !var.isPrivate())
                 continue;
 
-            if (var.nameToken() && (var.nameToken()->isAttributeUnused() || var.nameToken()->isAnonymousBitfield()))
+            if (var.nameToken() && (var.nameToken()->isAttributeUnused() || var.nameToken()->isAnonymous()))
                 continue;
 
             if (mTokenizer->isVarUsedInTemplate(var.declarationId()))

lib/token.h

@@ -742,11 +742,11 @@ class CPPCHECKLIB Token {
         setFlag(fIsInitBracket, b);
     }
 
-    bool isAnonymousBitfield() const {
-        return getFlag(fIsAnonymousBitfield);
+    bool isAnonymous() const {
+        return getFlag(fIsAnonymous);
     }
-    void isAnonymousBitfield(bool b) {
-        setFlag(fIsAnonymousBitfield, b);
+    void isAnonymous(bool b) {
+        setFlag(fIsAnonymous, b);
     }
 
     // cppcheck-suppress unusedFunction
@@ -1433,7 +1433,7 @@ class CPPCHECKLIB Token {
         fIsFinalType            = (1ULL << 42), // Is this a type with final specifier
         fIsInitComma            = (1ULL << 43), // Is this comma located inside some {..}. i.e: {1,2,3,4}
         fIsInitBracket          = (1ULL << 44), // Is this bracket used as a part of variable initialization i.e: int a{5}, b(2);
-        fIsAnonymousBitfield    = (1ULL << 45), // Is this a token added for an unnamed bit-field
+        fIsAnonymous            = (1ULL << 45), // Is this a token added for an unnamed bit-field
     };
 
     enum : std::uint8_t {

lib/tokenize.cpp

@@ -10037,9 +10037,9 @@ void Tokenizer::simplifyBitfields()
         } else if (Token::Match(typeTok, "%type% : %num%|%bool% ;") &&
                    typeTok->str() != "default") {
             const std::size_t id = anonymousBitfieldCounter++;
-            const std::string name = "__cppcheck_anon_bit_field_" + std::to_string(id) + "__";
+            const std::string name = "anonymous@" + std::to_string(id);
             Token *newTok = typeTok->insertToken(name);
-            newTok->isAnonymousBitfield(true);
+            newTok->isAnonymous(true);
             if (newTok->tokAt(2)->isBoolean())
                 newTok->setBits(newTok->strAt(2) == "true");
             else

test/testtokenize.cpp

@@ -4724,7 +4724,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("struct RGB { unsigned int r ; unsigned int g ; unsigned int b ; } ;", tokenizeAndStringify(code1));
 
         const char code2[] = "struct A { int a : 3; int : 3; int c : 3; };";
-        ASSERT_EQUALS("struct A { int a ; int __cppcheck_anon_bit_field_0__ ; int c ; } ;", tokenizeAndStringify(code2));
+        ASSERT_EQUALS("struct A { int a ; int anonymous@0 ; int c ; } ;", tokenizeAndStringify(code2));
 
         const char code3[] = "struct A { virtual void f() {} int f1 : 1; };";
         ASSERT_EQUALS("struct A { virtual void f ( ) { } int f1 ; } ;", tokenizeAndStringify(code3));
@@ -4738,7 +4738,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("struct A { bool b ; bool c ; } ;", tokenizeAndStringify(code2));
 
         const char code3[] = "struct A { bool : true; };";
-        ASSERT_EQUALS("struct A { bool __cppcheck_anon_bit_field_0__ ; } ;", tokenizeAndStringify(code3));
+        ASSERT_EQUALS("struct A { bool anonymous@0 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields7() { // ticket #1987
@@ -4789,7 +4789,7 @@ class TestTokenizer : public TestFixture {
 
     void bitfields12() { // ticket #3485 (segmentation fault)
         const char code[] = "{a:1;};\n";
-        ASSERT_EQUALS("{ a __cppcheck_anon_bit_field_0__ ; } ;", tokenizeAndStringify(code));
+        ASSERT_EQUALS("{ a anonymous@0 ; } ;", tokenizeAndStringify(code));
     }
 
     void bitfields13() { // ticket #3502 (segmentation fault)
@@ -4829,9 +4829,9 @@ class TestTokenizer : public TestFixture {
                             "};\n";
         const char expected[] = "struct S {\n"
                                 "volatile uint32_t a ;\n"
-                                "volatile uint32_t __cppcheck_anon_bit_field_0__ ;\n"
+                                "volatile uint32_t anonymous@0 ;\n"
                                 "volatile uint32_t b ;\n"
-                                "volatile uint32_t __cppcheck_anon_bit_field_1__ ;\n"
+                                "volatile uint32_t anonymous@1 ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
 
@@ -4841,7 +4841,7 @@ class TestTokenizer : public TestFixture {
                              "};\n";
         const char expected2[] = "struct S {\n"
                                  "const volatile uint32_t a ;\n"
-                                 "const volatile uint32_t __cppcheck_anon_bit_field_0__ ;\n"
+                                 "const volatile uint32_t anonymous@0 ;\n"
                                  "} ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }