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

Renamed the function 'removeRedundantCodeAfterReturn' with 'simplifyDeadCode'. 

This is a preparation in order to add new features to this function (see the @todo in the tokenize header file, ticket #3113 and #3175 for details).
This commit is contained in:
Edoardo Prezioso 2011-10-06 22:34:18 +02:00
parent 73fb6725e6
commit fe4ce594ce
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -2765,7 +2765,7 @@ bool Tokenizer::tokenize(std::istream &code,
} }
} }
removeRedundantCodeAfterReturn(); simplifyDeadCode();
_tokens->assignProgressValues(); _tokens->assignProgressValues();
@ -4548,7 +4548,7 @@ bool Tokenizer::simplifyTokenList()
simplifyGoto(); simplifyGoto();
removeRedundantCodeAfterReturn(); simplifyDeadCode();
// Combine wide strings // Combine wide strings
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
@ -4904,7 +4904,7 @@ void Tokenizer::removeRedundantAssignment()
} }
} }
void Tokenizer::removeRedundantCodeAfterReturn() void Tokenizer::simplifyDeadCode()
{ {
unsigned int indentlevel = 0; unsigned int indentlevel = 0;
unsigned int indentcase = 0; unsigned int indentcase = 0;

7
lib/tokenize.h
View File

@ -199,8 +199,11 @@ public:
/** Remove redundant assignment */ /** Remove redundant assignment */
void removeRedundantAssignment(); void removeRedundantAssignment();
/** Remove redudant code after return */ /**
void removeRedundantCodeAfterReturn(); * Remove redudant code placed after 'return ;' code.
* @todo Extend the functionality to code after 'break;' and 'continue;' code
*/
void simplifyDeadCode();
/** /**
* Replace sizeof() to appropriate size. * Replace sizeof() to appropriate size.

20
test/testtokenize.cpp
View File

@ -358,11 +358,11 @@ private:
TEST_CASE(simplifyIfAddBraces); // ticket # 2739 (segmentation fault) TEST_CASE(simplifyIfAddBraces); // ticket # 2739 (segmentation fault)
//remove redundant code after the 'return ;' statement //remove redundant code after the 'return ;' statement
TEST_CASE(removeRedundantCodeAfterReturn1); TEST_CASE(simplifyDeadCodereturn1);
TEST_CASE(removeRedundantCodeAfterReturn2); TEST_CASE(simplifyDeadCodereturn2);
TEST_CASE(removeRedundantCodeAfterReturn3); TEST_CASE(simplifyDeadCodereturn3);
TEST_CASE(removeRedundantCodeAfterReturn4); TEST_CASE(simplifyDeadCodereturn4);
TEST_CASE(removeRedundantCodeAfterReturn5); TEST_CASE(simplifyDeadCodereturn5);
TEST_CASE(platformWin32); TEST_CASE(platformWin32);
TEST_CASE(platformWin32A); TEST_CASE(platformWin32A);
@ -5926,7 +5926,7 @@ private:
} }
} }
void removeRedundantCodeAfterReturn1() void simplifyDeadCodereturn1()
{ {
ASSERT_EQUALS("void f ( ) { return ; }", tokenizeAndStringify("void f() { return; foo();}")); ASSERT_EQUALS("void f ( ) { return ; }", tokenizeAndStringify("void f() { return; foo();}"));
ASSERT_EQUALS("void f ( int n ) { if ( n ) { return ; } foo ( ) ; }",tokenizeAndStringify("void f(int n) { if (n) return; foo();}")); ASSERT_EQUALS("void f ( int n ) { if ( n ) { return ; } foo ( ) ; }",tokenizeAndStringify("void f(int n) { if (n) return; foo();}"));
@ -5942,7 +5942,7 @@ private:
ASSERT_EQUALS("void f ( ) { MACRO ( return ; bar2 , foo ) }",tokenizeAndStringify("void f() { MACRO(return; bar2, foo) }")); ASSERT_EQUALS("void f ( ) { MACRO ( return ; bar2 , foo ) }",tokenizeAndStringify("void f() { MACRO(return; bar2, foo) }"));
} }
void removeRedundantCodeAfterReturn2() void simplifyDeadCodereturn2()
{ {
const char code[] = "void f(){ " const char code[] = "void f(){ "
"if (k>0) goto label; " "if (k>0) goto label; "
@ -5960,7 +5960,7 @@ private:
ASSERT_EQUALS("void f ( ) { if ( 0 < k ) { goto label ; } return ; { label : ; bar ( ) ; } }",simplifyKnownVariables(code)); ASSERT_EQUALS("void f ( ) { if ( 0 < k ) { goto label ; } return ; { label : ; bar ( ) ; } }",simplifyKnownVariables(code));
} }
void removeRedundantCodeAfterReturn3() void simplifyDeadCodereturn3()
{ {
const char code[] = "int f() { " const char code[] = "int f() { "
"switch (x) { case 1: return 1; bar(); tack; { ticak(); return; } return; " "switch (x) { case 1: return 1; bar(); tack; { ticak(); return; } return; "
@ -5970,7 +5970,7 @@ private:
ASSERT_EQUALS("int f ( ) { switch ( x ) { case 1 : return 1 ; case 2 : return 2 ; } return 3 ; }",simplifyKnownVariables(code)); ASSERT_EQUALS("int f ( ) { switch ( x ) { case 1 : return 1 ; case 2 : return 2 ; } return 3 ; }",simplifyKnownVariables(code));
} }
void removeRedundantCodeAfterReturn4() void simplifyDeadCodereturn4()
{ {
const char code[] = "int f() {" const char code[] = "int f() {"
"switch (x) { case 1: return 1; bar(); tack; { ticak(); return; } return;" "switch (x) { case 1: return 1; bar(); tack; { ticak(); return; } return;"
@ -5983,7 +5983,7 @@ private:
ASSERT_EQUALS(expected,simplifyKnownVariables(code)); ASSERT_EQUALS(expected,simplifyKnownVariables(code));
} }
void removeRedundantCodeAfterReturn5() void simplifyDeadCodereturn5()
{ {
const char code[] = "void foo () {" const char code[] = "void foo () {"
" switch (i) { case 0: switch (j) { case 0: return -1; }" " switch (i) { case 0: switch (j) { case 0: return -1; }"