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

Running astyle, no functional changes.

This commit is contained in:
Martin Ettl 2015-06-01 22:09:56 +02:00
parent 4b2fb4b76c
commit 0a148a9433
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/tokenize.cpp
View File

@ -1490,13 +1490,13 @@ void Tokenizer::simplifyTypedef()
} }
tok2 = copyTokens(tok2, arrayStart, arrayEnd); tok2 = copyTokens(tok2, arrayStart, arrayEnd);
if (!tok2->next()) if (!tok2->next())
syntaxError(tok2); syntaxError(tok2);
tok2 = tok2->next(); tok2 = tok2->next();
if (tok2->str() == "=") { if (tok2->str() == "=") {
if (!tok2->next()) if (!tok2->next())
syntaxError(tok2); syntaxError(tok2);
if (tok2->next()->str() == "{") if (tok2->next()->str() == "{")
tok2 = tok2->next()->link()->next(); tok2 = tok2->next()->link()->next();
else if (tok2->next()->str().at(0) == '\"') else if (tok2->next()->str().at(0) == '\"')
@ -3036,10 +3036,10 @@ bool Tokenizer::simplifySizeof()
sizeOfVar[varId] = size; sizeOfVar[varId] = size;
declTokOfVar[varId] = tok; declTokOfVar[varId] = tok;
} }
if (!tok2) { if (!tok2) {
syntaxError(tok); syntaxError(tok);
return false; return false;
} }
tok = tok2; tok = tok2;
} }

16
test/testgarbage.cpp
View File

@ -97,8 +97,8 @@ private:
TEST_CASE(garbageCode56); // #6713 TEST_CASE(garbageCode56); // #6713
TEST_CASE(garbageCode57); // #6733 TEST_CASE(garbageCode57); // #6733
TEST_CASE(garbageCode58); // #6732 TEST_CASE(garbageCode58); // #6732
TEST_CASE(garbageCode59); // #6735 TEST_CASE(garbageCode59); // #6735
TEST_CASE(garbageCode60); // #6736 TEST_CASE(garbageCode60); // #6736
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -552,13 +552,13 @@ private:
ASSERT_THROW(checkCode("{ }> {= ~A()^{} }P { }"), InternalError); ASSERT_THROW(checkCode("{ }> {= ~A()^{} }P { }"), InternalError);
} }
void garbageCode59() { // #6735 void garbageCode59() { // #6735
ASSERT_THROW(checkCode("{ { } }; char font8x8[256][8]"), InternalError); ASSERT_THROW(checkCode("{ { } }; char font8x8[256][8]"), InternalError);
} }
void garbageCode60() { // #6736 void garbageCode60() { // #6736
ASSERT_THROW(checkCode("{ } { } typedef int int_array[]; int_array &right ="), InternalError); ASSERT_THROW(checkCode("{ } { } typedef int int_array[]; int_array &right ="), InternalError);
} }
void garbageValueFlow() { void garbageValueFlow() {