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

tokenizer : updated simplifyKnownVariables

This commit is contained in:
Daniel Marjamäki 2008-12-13 20:22:45 +00:00
parent 538f259911
commit 6269c3cbbd
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testtokenize.cpp
View File

@ -233,13 +233,14 @@ private:
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList(); tokenizer.setVarId();
tokenizer.simplifyKnownVariables();
std::ostringstream ostr; std::ostringstream ostr;
for (const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next()) for (const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next())
ostr << " " << tok->str(); ostr << " " << tok->str();
// TODO, the actual string should be " void f ( ) { int a ; a = 10 ; if ( true ) ; }" // TODO, the actual string should be " void f ( ) { int a ; a = 10 ; if ( true ) ; }"
ASSERT_EQUALS( std::string(" void f ( ) { int a ; a = 10 ; if ( a ) ; }"), ostr.str() ); ASSERT_EQUALS( std::string(" void f ( ) { int a = 10 ; if ( 10 ) ; }"), ostr.str() );
} }
{ {
@ -255,12 +256,13 @@ private:
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList(); tokenizer.setVarId();
tokenizer.simplifyKnownVariables();
std::ostringstream ostr; std::ostringstream ostr;
for (const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next()) for (const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next())
ostr << " " << tok->str(); ostr << " " << tok->str();
ASSERT_EQUALS( std::string(" void f ( ) { int a ; a = 10 ; a = g ( ) ; if ( a ) ; }"), ostr.str() ); ASSERT_EQUALS( std::string(" void f ( ) { int a = 10 ; a = g ( ) ; if ( a ) ; }"), ostr.str() );
} }
} }

46
tokenize.cpp
View File

@ -1182,11 +1182,51 @@ bool Tokenizer::simplifyKnownVariables()
// TODO, this functions needs to be implemented. // TODO, this functions needs to be implemented.
// TODO, test // TODO, test
bool ret = false; bool ret = false;
for ( const TOKEN *tok = tokens(); tok; tok = tok->next() ) for ( TOKEN *tok = _tokens; tok; tok = tok->next() )
{
if ( TOKEN::Match(tok, "%var% = %num% ;") )
{ {
// Search for a block of code
if ( ! TOKEN::Match(tok, ") const| {") )
continue;
// parse the block of code..
int indentlevel = 0;
for ( TOKEN *tok2 = tok; tok2; tok2 = tok2->next() )
{
if ( tok2->str() == "{" )
++indentlevel;
else if ( tok2->str() == "}" )
{
--indentlevel;
if ( indentlevel <= 0 )
continue;
}
else if ( TOKEN::Match(tok2, "%var% = %num% ;") )
{
unsigned int varid = tok2->varId();
TOKEN *tok3 = tok2;
while ( tok3 )
{
tok3 = tok3->next();
// Perhaps it's a loop => bail out
if ( TOKEN::Match(tok3, "[{}]") )
break;
// Variable is used somehow in a non-defined pattern => bail out
if ( tok3->varId() == varid )
break;
// Replace variable with numeric constant..
if ( TOKEN::Match(tok3, "if ( %varid% )", 0, 0, varid) )
{
tok3 = tok3->next()->next();
tok3->setstr( tok2->strAt(2) );
ret = true;
}
}
}
} }
} }