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

Fixed #4950 (Tokenizer: order of int modifiers)

This commit is contained in:
Robert Reif 2013-08-12 06:23:01 +02:00 committed by Daniel Marjamäki
parent cd3044c808
commit d6ce072dc9
2 changed files with 117 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/tokenize.cpp
View File

@ -5570,16 +5570,22 @@ void Tokenizer::simplifyStdType()
if (tok->strAt(1) == "long") {
tok->str("long");
tok->deleteNext();
} else if (tok->strAt(1) == "short") {
tok->str("short");
tok->deleteNext();
}
if (tok->strAt(1) == "long") {
tok->isLong(true);
tok->deleteNext();
}
if (tok->strAt(1) == "unsigned") {
tok->isUnsigned(true);
if (Token::Match(tok->next(), "unsigned|signed")) {
tok->isUnsigned(tok->next()->str() == "unsigned");
tok->isSigned(tok->next()->str() == "signed");
tok->deleteNext();
if (tok->strAt(1) == "long")
tok->deleteNext();
else if (tok->strAt(1) == "short")
tok->deleteNext();
}
} else if (tok->str() == "long") {
if (tok->strAt(1) == "long") {
@ -5588,16 +5594,18 @@ void Tokenizer::simplifyStdType()
}
if (tok->strAt(1) == "int") {
tok->deleteNext();
if (tok->strAt(1) == "unsigned") {
tok->isUnsigned(true);
if (Token::Match(tok->next(), "unsigned|signed")) {
tok->isUnsigned(tok->next()->str() == "unsigned");
tok->isSigned(tok->next()->str() == "signed");
tok->deleteNext();
}
} else if (tok->strAt(1) == "double") {
tok->str("double");
tok->isLong(true);
tok->deleteNext();
} else if (tok->strAt(1) == "unsigned") {
tok->isUnsigned(true);
} else if (Token::Match(tok->next(), "unsigned|signed")) {
tok->isUnsigned(tok->next()->str() == "unsigned");
tok->isSigned(tok->next()->str() == "signed");
tok->deleteNext();
if (tok->strAt(1) == "int")
tok->deleteNext();
@ -5605,6 +5613,13 @@ void Tokenizer::simplifyStdType()
} else if (tok->str() == "short") {
if (tok->strAt(1) == "int")
tok->deleteNext();
if (Token::Match(tok->next(), "unsigned|signed")) {
tok->isUnsigned(tok->next()->str() == "unsigned");
tok->isSigned(tok->next()->str() == "signed");
tok->deleteNext();
if (tok->strAt(1) == "int")
tok->deleteNext();
}
}
}
}

98
test/testtokenize.cpp
View File

@ -386,7 +386,7 @@ private:
TEST_CASE(unsigned2);
TEST_CASE(unsigned3); // template arguments
TEST_CASE(simplifyStdType); // #4947
TEST_CASE(simplifyStdType); // #4947, #4950, #4951
TEST_CASE(createLinks);
TEST_CASE(signed1);
@ -6140,7 +6140,8 @@ private:
}
}
void simplifyStdType() { // #4947
void simplifyStdType() { // #4947, #4950, #4951
// usigned long long
{
const char code[] = "long long unsigned int x;";
const char expected[] = "unsigned long long x ;";
@ -6171,6 +6172,99 @@ private:
const char expected[] = "unsigned long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
// signed long long
{
const char code[] = "long long signed int x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "long long int signed x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "signed long long int x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "signed int long long x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int signed long long x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int long long signed x;";
const char expected[] = "signed long long x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
// usigned short
{
const char code[] = "short unsigned int x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "short int unsigned x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "unsigned short int x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "unsigned int short x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int unsigned short x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int short unsigned x;";
const char expected[] = "unsigned short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
// signed short
{
const char code[] = "short signed int x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "short int signed x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "signed short int x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "signed int short x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int signed short x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
{
const char code[] = "int short signed x;";
const char expected[] = "signed short x ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
}
void createLinks() {