Make simplifyBitfields() a bit more strict

danmar · danmar · commit 02402eeea411 · 2016-10-04T15:33:50.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8900,7 +8900,6 @@ void Tokenizer::simplifyBitfields()
 {
     bool goback = false;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-
         if (goback) {
             goback = false;
             tok = tok->previous();
@@ -8925,7 +8924,7 @@ void Tokenizer::simplifyBitfields()
 
                 last = tok1->next();
             }
-        } else if (Token::Match(tok->next(), "const| %type% : %any% ;") &&
+        } else if (Token::Match(tok->next(), "const| %type% : %num%|%bool% ;") &&
                    tok->next()->str() != "default") {
             const int offset = (tok->next()->str() == "const") ? 1 : 0;
 

Original file line number	Diff line number	Diff line change
`@@ -8900,7 +8900,6 @@ void Tokenizer::simplifyBitfields()`
`8900`	`8900`	`{`
`8901`	`8901`	`bool goback = false;`
`8902`	`8902`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`8903`		`-`
`8904`	`8903`	`if (goback) {`
`8905`	`8904`	`goback = false;`
`8906`	`8905`	`tok = tok->previous();`
`@@ -8925,7 +8924,7 @@ void Tokenizer::simplifyBitfields()`
`8925`	`8924`
`8926`	`8925`	`last = tok1->next();`
`8927`	`8926`	`}`
`8928`		`- } else if (Token::Match(tok->next(), "const\| %type% : %any% ;") &&`
	`8927`	`+ } else if (Token::Match(tok->next(), "const\| %type% : %num%\|%bool% ;") &&`
`8929`	`8928`	`tok->next()->str() != "default") {`
`8930`	`8929`	`const int offset = (tok->next()->str() == "const") ? 1 : 0;`
`8931`	`8930`