walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Tokenizer: better handling of bitfields. Ticket: #1956

This commit is contained in:
Robert Reif 2010-08-22 09:41:22 +02:00 committed by Daniel Marjamäki
parent 77d634127c
commit 3fcca23b53
2 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/tokenize.cpp
View File

@ -8006,7 +8006,7 @@ static bool isAllUpper(const Token *type)
static bool isBitfieldType(const Token *type) static bool isBitfieldType(const Token *type)
{ {
if (Token::Match(type, "signed|unsigned|int|long|bool|char|short") || isAllUpper(type)) if (Token::Match(type, "signed|unsigned|int|long|bool|char|short|__int64") || isAllUpper(type))
return true; return true;
return false; return false;
} }
@ -8015,14 +8015,46 @@ void Tokenizer::simplifyBitfields()
{ {
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (Token::Match(tok, ";|{|public:|protected:|private: %type% %var% : %num% ;") && isBitfieldType(tok->next())) Token *last = 0;
if (Token::Match(tok, ";|{|public:|protected:|private: %type% %var% : %num% ;|,") && isBitfieldType(tok->next()))
{
last = tok->tokAt(5);
Token::eraseTokens(tok->tokAt(2), tok->tokAt(5)); Token::eraseTokens(tok->tokAt(2), tok->tokAt(5));
else if (Token::Match(tok, ";|{|public:|protected:|private: signed|unsigned %type% %var% : %num% ;") && isBitfieldType(tok->tokAt(2))) }
else if (Token::Match(tok, ";|{|public:|protected:|private: signed|unsigned %type% %var% : %num% ;|,") && isBitfieldType(tok->tokAt(2)))
{
last = tok->tokAt(6);
Token::eraseTokens(tok->tokAt(3), tok->tokAt(6)); Token::eraseTokens(tok->tokAt(3), tok->tokAt(6));
else if (Token::Match(tok, ";|{|public:|protected:|private: const %type% %var% : %num% ;") && isBitfieldType(tok->tokAt(2))) }
else if (Token::Match(tok, ";|{|public:|protected:|private: const %type% %var% : %num% ;|,") && isBitfieldType(tok->tokAt(2)))
{
last = tok->tokAt(6);
Token::eraseTokens(tok->tokAt(3), tok->tokAt(6)); Token::eraseTokens(tok->tokAt(3), tok->tokAt(6));
else if (Token::Match(tok, ";|{|public:|protected:|private: const signed|unsigned %type% %var% : %num% ;") && isBitfieldType(tok->tokAt(3))) }
else if (Token::Match(tok, ";|{|public:|protected:|private: const signed|unsigned %type% %var% : %num% ;|,") && isBitfieldType(tok->tokAt(3)))
{
last = tok->tokAt(7);
Token::eraseTokens(tok->tokAt(4), tok->tokAt(7)); Token::eraseTokens(tok->tokAt(4), tok->tokAt(7));
}
if (last && last->str() == ",")
{
Token *tok1 = last;
tok1->str(";");
Token *tok2 = tok->next();
tok1->insertToken(tok2->str());
tok1 = tok1->next();
tok2 = tok2->next();
while (tok2->str() != last->previous()->str())
{
tok1->insertToken(tok2->str());
tok1 = tok1->next();
tok2 = tok2->next();
}
}
} }
} }

48
test/testtokenize.cpp
View File

@ -247,6 +247,7 @@ private:
TEST_CASE(bitfields2); TEST_CASE(bitfields2);
TEST_CASE(bitfields3); TEST_CASE(bitfields3);
TEST_CASE(bitfields4); // ticket #1956 TEST_CASE(bitfields4); // ticket #1956
TEST_CASE(bitfields5); // ticket #1956
TEST_CASE(microsoftMFC); TEST_CASE(microsoftMFC);
} }
@ -4312,29 +4313,38 @@ private:
const char code5[] = "struct A { long x : 3; };"; const char code5[] = "struct A { long x : 3; };";
ASSERT_EQUALS("struct A { long x ; } ;", tokenizeAndStringify(code5,false)); ASSERT_EQUALS("struct A { long x ; } ;", tokenizeAndStringify(code5,false));
const char code6[] = "struct A { unsigned char x : 3; };"; const char code6[] = "struct A { __int64 x : 3; };";
ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code6,false)); ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringify(code6,false));
const char code7[] = "struct A { unsigned short x : 3; };"; const char code7[] = "struct A { unsigned char x : 3; };";
ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code7,false)); ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code7,false));
const char code8[] = "struct A { unsigned int x : 3; };"; const char code8[] = "struct A { unsigned short x : 3; };";
ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code8,false)); ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code8,false));
const char code9[] = "struct A { unsigned long x : 3; };"; const char code9[] = "struct A { unsigned int x : 3; };";
ASSERT_EQUALS("struct A { unsigned long x ; } ;", tokenizeAndStringify(code9,false)); ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code9,false));
const char code10[] = "struct A { signed char x : 3; };"; const char code10[] = "struct A { unsigned long x : 3; };";
ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code10,false)); ASSERT_EQUALS("struct A { unsigned long x ; } ;", tokenizeAndStringify(code10,false));
const char code11[] = "struct A { signed short x : 3; };"; const char code11[] = "struct A { unsigned __int64 x : 3; };";
ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code11,false)); ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringify(code11,false));
const char code12[] = "struct A { signed int x : 3; };"; const char code12[] = "struct A { signed char x : 3; };";
ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code12,false)); ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code12,false));
const char code13[] = "struct A { signed long x : 3; };"; const char code13[] = "struct A { signed short x : 3; };";
ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringify(code13,false)); ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code13,false));
const char code14[] = "struct A { signed int x : 3; };";
ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code14,false));
const char code15[] = "struct A { signed long x : 3; };";
ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringify(code15,false));
const char code16[] = "struct A { signed __int64 x : 3; };";
ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringify(code16,false));
} }
void bitfields2() void bitfields2()
@ -4406,6 +4416,12 @@ private:
ASSERT_EQUALS("struct A { UINT64 x ; } ;", tokenizeAndStringify(code10,false)); ASSERT_EQUALS("struct A { UINT64 x ; } ;", tokenizeAndStringify(code10,false));
} }
void bitfields5() // ticket #1956
{
const char code1[] = "struct RGB { unsigned int r : 3, g : 3, b : 2; };";
ASSERT_EQUALS("struct RGB { unsigned int r ; unsigned int g ; unsigned int b ; } ;", tokenizeAndStringify(code1,false));
}
void microsoftMFC() void microsoftMFC()
{ {
const char code1[] = "class MyDialog : public CDialog { DECLARE_MESSAGE_MAP() private: CString text; };"; const char code1[] = "class MyDialog : public CDialog { DECLARE_MESSAGE_MAP() private: CString text; };";