variable usage: fixed false positive when using operator '^'

This commit is contained in:
Daniel Marjamäki 2009-01-04 18:38:24 +00:00
parent 651e295343
commit 9294e20e96
2 changed files with 14 additions and 9 deletions

View File

@ -809,7 +809,7 @@ static bool isOp(const Token *tok)
tok->str() == ">" ||
tok->str() == ">=" ||
tok->str() == "<<" ||
Token::Match(tok, "[+-*/%&!~|,[])?:]")));
Token::Match(tok, "[+-*/%&!~|^,[])?:]")));
}
void CheckOther::functionVariableUsage()

View File

@ -67,7 +67,7 @@ private:
TEST_CASE( localvarStruct1 );
TEST_CASE( localvarStruct2 );
TEST_CASE( localvarMod ); // Usage with modulo
TEST_CASE( localvarOp ); // Usage with arithmetic operators
TEST_CASE( localvarInvert ); // Usage with inverted variable
TEST_CASE( localvarIf ); // Usage in if
TEST_CASE( localvarIfElse ); // return tmp1 ? tmp2 : tmp3;
@ -221,14 +221,19 @@ private:
void localvarMod()
void localvarOp()
{
functionVariableUsage( "int main()\n"
"{\n"
" int tmp = 10;\n"
" return 123 % tmp;\n"
"}\n" );
ASSERT_EQUALS( std::string(""), errout.str() );
const char op[] = "+-*/%&|^";
for (const char *p = op; *p; ++p)
{
std::string code( "int main()\n"
"{\n"
" int tmp = 10;\n"
" return 123 " + std::string(1, *p) + " tmp;\n"
"}\n" );
functionVariableUsage( code.c_str() );
ASSERT_EQUALS( std::string(""), errout.str() );
}
}
void localvarInvert()