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

Fixed #907 (Tokenizer: known result of strlen)

This commit is contained in:
Daniel Marjamäki 2009-11-07 08:25:39 +01:00
parent 2a6cde4369
commit 0c8d327809
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tokenize.cpp
View File

@ -1918,6 +1918,21 @@ void Tokenizer::simplifyTokenList()
simplifySizeof();
// replace strlen(str)
simplifyKnownVariables();
for (Token *tok = _tokens; tok; tok = tok->next())
{
if (Token::Match(tok, "strlen ( %str% )"))
{
std::ostringstream ostr;
ostr << Token::getStrLength(tok->tokAt(2));
tok->str(ostr.str());
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
}
}
// change array to pointer..
for (Token *tok = _tokens; tok; tok = tok->next())
{
@ -3355,6 +3370,7 @@ bool Tokenizer::simplifyKnownVariables()
else if (tok2->previous()->str() != "*" &&
(Token::Match(tok2, "%var% = %num% ;") ||
Token::Match(tok2, "%var% = %str% ;") ||
Token::Match(tok2, "%var% [ ] = %str% ;") ||
Token::Match(tok2, "%var% = %bool% ;") ||
Token::Match(tok2, "%var% = %var% ;")))
{
@ -3365,6 +3381,8 @@ bool Tokenizer::simplifyKnownVariables()
const bool pointeralias(tok2->tokAt(2)->isName());
std::string value(tok2->strAt(2));
if (value == "]")
value = tok2->strAt(4);
Token* bailOutFromLoop = 0;
int indentlevel3 = indentlevel; // indentlevel for tok3
for (Token *tok3 = tok2->next(); tok3; tok3 = tok3->next())

41
test/testsimplifytokens.cpp
View File

@ -71,6 +71,8 @@ private:
TEST_CASE(sizeof13);
TEST_CASE(casting);
TEST_CASE(strlen1);
TEST_CASE(template1);
TEST_CASE(template2);
TEST_CASE(template3);
@ -919,6 +921,45 @@ private:
}
void strlen1()
{
ASSERT_EQUALS("4", tok("strlen(\"abcd\")"));
{
const char code[] = "void f()\n"
"{\n"
" const char *s = \"abcd\";\n"
" strlen(s);\n"
"}\n";
const char expected[] = "void f ( ) "
"{"
" const char * s ;"
" s = \"abcd\" ;"
" 4 ; "
"}";
ASSERT_EQUALS(expected, tok(code));
}
{
const char code[] = "void f()\n"
"{\n"
" const char s [ ] = \"abcd\";\n"
" strlen(s);\n"
"}\n";
const char expected[] = "void f ( ) "
"{"
" const char * s ;"
" s = \"abcd\" ;"
" 4 ; "
"}";
ASSERT_EQUALS(expected, tok(code));
}
}
void template1()
{