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

Tokenizer: report syntaxError if there's nothing after 'if|for|while ()' and if there's nothing inside round brackets; 

TestTokenizer: change test cases accordingly;
TestSimplifyTokens: ditto.
This commit is contained in:
Edoardo Prezioso 2012-01-15 14:50:01 +01:00
parent a6d96f5b72
commit 963f6ce3ef
3 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -4144,6 +4144,12 @@ bool Tokenizer::simplifyIfAddBraces()
} }
if (Token::Match(tok, "if|for|while|BOOST_FOREACH (")) { if (Token::Match(tok, "if|for|while|BOOST_FOREACH (")) {
if (tok->strAt(2) == ")") {
//no arguments, abort
syntaxError(tok);
return false;
}
// don't add "{}" around ";" in "do {} while();" (#609) // don't add "{}" around ";" in "do {} while();" (#609)
const Token *prev = tok->previous(); const Token *prev = tok->previous();
if (Token::simpleMatch(prev, "} while") && if (Token::simpleMatch(prev, "} while") &&
@ -4173,9 +4179,8 @@ bool Tokenizer::simplifyIfAddBraces()
// If there is no code after the if(), abort // If there is no code after the if(), abort
if (!tok->next()) { if (!tok->next()) {
// This is a syntax error and we should call syntaxError() and return false but syntaxError(tok);
// many tokenizer tests are written with this syntax error so just ignore it. return false;
return true;
} }
// insert open brace.. // insert open brace..

44
test/testsimplifytokens.cpp
View File

@ -447,7 +447,7 @@ private:
void cast() { void cast() {
ASSERT_EQUALS("if ( ! p )", tok("if (p == (char *)0)")); ASSERT_EQUALS("if ( ! p ) { ; }", tok("if (p == (char *)0);"));
ASSERT_EQUALS("return str ;", tok("return (char *)str;")); ASSERT_EQUALS("return str ;", tok("return (char *)str;"));
{ {
@ -469,7 +469,7 @@ private:
ASSERT_EQUALS("if ( * a )", tok("if ((unsigned int)(unsigned char)*a)")); ASSERT_EQUALS("if ( * a )", tok("if ((unsigned int)(unsigned char)*a)"));
ASSERT_EQUALS("class A { A operator* ( int ) ; } ;", tok("class A { A operator *(int); };")); ASSERT_EQUALS("class A { A operator* ( int ) ; } ;", tok("class A { A operator *(int); };"));
ASSERT_EQUALS("class A { A operator* ( int ) const ; } ;", tok("class A { A operator *(int) const; };")); ASSERT_EQUALS("class A { A operator* ( int ) const ; } ;", tok("class A { A operator *(int) const; };"));
ASSERT_EQUALS("if ( ! p )", tok("if (p == (char *)(char *)0)")); ASSERT_EQUALS("if ( ! p ) { ; }", tok("if (p == (char *)(char *)0);"));
// no simplification as the cast may be important here. see #2897 for example // no simplification as the cast may be important here. see #2897 for example
ASSERT_EQUALS("; * ( ( char * ) p + 1 ) = 0 ;", tok("; *((char *)p + 1) = 0;")); ASSERT_EQUALS("; * ( ( char * ) p + 1 ) = 0 ;", tok("; *((char *)p + 1) = 0;"));
@ -2439,17 +2439,17 @@ private:
} }
void ifnot() { void ifnot() {
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(0==x)")); ASSERT_EQUALS("if ( ! x ) { ; }", simplifyIfNot("if(0==x);"));
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)")); ASSERT_EQUALS("if ( ! x ) { ; }", simplifyIfNot("if(x==0);"));
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if(0==(a=b))")); ASSERT_EQUALS("if ( ! ( a = b ) ) { ; }", simplifyIfNot("if(0==(a=b));"));
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)")); ASSERT_EQUALS("if ( ! x ) { ; }", simplifyIfNot("if(x==0);"));
ASSERT_EQUALS("if ( ! a && b ( ) )", simplifyIfNot("if( 0 == a && b() )")); ASSERT_EQUALS("if ( ! a && b ( ) ) { ; }", simplifyIfNot("if( 0 == a && b() );"));
ASSERT_EQUALS("if ( b ( ) && ! a )", simplifyIfNot("if( b() && 0 == a )")); ASSERT_EQUALS("if ( b ( ) && ! a ) { ; }", simplifyIfNot("if( b() && 0 == a );"));
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if((a=b)==0)")); ASSERT_EQUALS("if ( ! ( a = b ) ) { ; }", simplifyIfNot("if((a=b)==0);"));
ASSERT_EQUALS("if ( ! x . y )", simplifyIfNot("if(x.y==0)")); ASSERT_EQUALS("if ( ! x . y ) { ; }", simplifyIfNot("if(x.y==0);"));
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if((x==0))")); ASSERT_EQUALS("if ( ! x ) { ; }", simplifyIfNot("if((x==0));"));
ASSERT_EQUALS("if ( ( ! x ) && ! y )", simplifyIfNot("if((x==0) && y==0)")); ASSERT_EQUALS("if ( ( ! x ) && ! y ) { ; }", simplifyIfNot("if((x==0) && y==0);"));
ASSERT_EQUALS("if ( ! ( ! fclose ( fd ) ) )", simplifyIfNot("if(!(fclose(fd) == 0))")); ASSERT_EQUALS("if ( ! ( ! fclose ( fd ) ) ) { ; }", simplifyIfNot("if(!(fclose(fd) == 0));"));
} }
@ -2470,8 +2470,8 @@ private:
} }
void not1() { void not1() {
ASSERT_EQUALS("if ( ! p )", simplifyLogicalOperators("if (not p)")); ASSERT_EQUALS("if ( ! p ) { ; }", simplifyLogicalOperators("if (not p);"));
ASSERT_EQUALS("if ( p && ! q )", simplifyLogicalOperators("if (p && not q)")); ASSERT_EQUALS("if ( p && ! q ) { ; }", simplifyLogicalOperators("if (p && not q);"));
ASSERT_EQUALS("void foo ( not i )", simplifyLogicalOperators("void foo ( not i )")); ASSERT_EQUALS("void foo ( not i )", simplifyLogicalOperators("void foo ( not i )"));
} }
@ -2488,8 +2488,8 @@ private:
ASSERT_EQUALS("if ( p && bar ( ) ) { ; }", ASSERT_EQUALS("if ( p && bar ( ) ) { ; }",
simplifyLogicalOperators("if (p and bar()) ;")); simplifyLogicalOperators("if (p and bar()) ;"));
ASSERT_EQUALS("if ( p && ! q )", ASSERT_EQUALS("if ( p && ! q ) { ; }",
simplifyLogicalOperators("if (p and not q)")); simplifyLogicalOperators("if (p and not q) ;"));
} }
void or1() { void or1() {
@ -2505,8 +2505,8 @@ private:
ASSERT_EQUALS("if ( p || bar ( ) ) { ; }", ASSERT_EQUALS("if ( p || bar ( ) ) { ; }",
simplifyLogicalOperators("if (p or bar()) ;")); simplifyLogicalOperators("if (p or bar()) ;"));
ASSERT_EQUALS("if ( p || ! q )", ASSERT_EQUALS("if ( p || ! q ) { ; }",
simplifyLogicalOperators("if (p or not q)")); simplifyLogicalOperators("if (p or not q) ;"));
} }
void comma_keyword() { void comma_keyword() {
@ -2800,9 +2800,9 @@ private:
ASSERT_EQUALS(";", tok("; x = x + 0;")); ASSERT_EQUALS(";", tok("; x = x + 0;"));
ASSERT_EQUALS("if ( a == 2 )", tok("if (a==1+1)")); ASSERT_EQUALS("if ( a == 2 ) { ; }", tok("if (a==1+1);"));
ASSERT_EQUALS("if ( a + 2 != 6 )", tok("if (a+1+1!=1+2+3)")); ASSERT_EQUALS("if ( a + 2 != 6 ) { ; }", tok("if (a+1+1!=1+2+3);"));
ASSERT_EQUALS("if ( 4 < a )", tok("if (14-2*5<a*4/(2*2))")); ASSERT_EQUALS("if ( 4 < a ) { ; }", tok("if (14-2*5<a*4/(2*2));"));
ASSERT_EQUALS("( y / 2 - 2 )", tok("(y / 2 - 2)")); ASSERT_EQUALS("( y / 2 - 2 )", tok("(y / 2 - 2)"));
ASSERT_EQUALS("( y % 2 - 2 )", tok("(y % 2 - 2)")); ASSERT_EQUALS("( y % 2 - 2 )", tok("(y % 2 - 2)"));

18
test/testtokenize.cpp
View File

@ -764,7 +764,7 @@ private:
void removeCast6() { void removeCast6() {
// ticket #2103 // ticket #2103
ASSERT_EQUALS("if ( ! x )", tokenizeAndStringify("if (x == (char *) ((void *)0))", true)); ASSERT_EQUALS("if ( ! x ) { ; }", tokenizeAndStringify("if (x == (char *) ((void *)0)) ;", true));
} }
void removeCast7() { void removeCast7() {
@ -5874,14 +5874,14 @@ private:
} }
void simplifyLogicalOperators() { void simplifyLogicalOperators() {
ASSERT_EQUALS("if ( a && b )", tokenizeAndStringify("if (a and b)")); ASSERT_EQUALS("if ( a && b ) { ; }", tokenizeAndStringify("if (a and b);"));
ASSERT_EQUALS("if ( a || b )", tokenizeAndStringify("if (a or b)")); ASSERT_EQUALS("if ( a || b ) { ; }", tokenizeAndStringify("if (a or b);"));
ASSERT_EQUALS("if ( a & b )", tokenizeAndStringify("if (a bitand b)")); ASSERT_EQUALS("if ( a & b ) { ; }", tokenizeAndStringify("if (a bitand b);"));
ASSERT_EQUALS("if ( a | b )", tokenizeAndStringify("if (a bitor b)")); ASSERT_EQUALS("if ( a | b ) { ; }", tokenizeAndStringify("if (a bitor b);"));
ASSERT_EQUALS("if ( a ^ b )", tokenizeAndStringify("if (a xor b)")); ASSERT_EQUALS("if ( a ^ b ) { ; }", tokenizeAndStringify("if (a xor b);"));
ASSERT_EQUALS("if ( ~ b )", tokenizeAndStringify("if (compl b)")); ASSERT_EQUALS("if ( ~ b ) { ; }", tokenizeAndStringify("if (compl b);"));
ASSERT_EQUALS("if ( ! b )", tokenizeAndStringify("if (not b)")); ASSERT_EQUALS("if ( ! b ) { ; }", tokenizeAndStringify("if (not b);"));
ASSERT_EQUALS("if ( a != b )", tokenizeAndStringify("if (a not_eq b)")); ASSERT_EQUALS("if ( a != b ) { ; }", tokenizeAndStringify("if (a not_eq b);"));
} }
void simplifyCalculations() { void simplifyCalculations() {