variable usage: fixed false positive when using operator '^'
This commit is contained in:
parent
651e295343
commit
9294e20e96
|
@ -809,7 +809,7 @@ static bool isOp(const Token *tok)
|
||||||
tok->str() == ">" ||
|
tok->str() == ">" ||
|
||||||
tok->str() == ">=" ||
|
tok->str() == ">=" ||
|
||||||
tok->str() == "<<" ||
|
tok->str() == "<<" ||
|
||||||
Token::Match(tok, "[+-*/%&!~|,[])?:]")));
|
Token::Match(tok, "[+-*/%&!~|^,[])?:]")));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckOther::functionVariableUsage()
|
void CheckOther::functionVariableUsage()
|
||||||
|
|
|
@ -67,7 +67,7 @@ private:
|
||||||
TEST_CASE( localvarStruct1 );
|
TEST_CASE( localvarStruct1 );
|
||||||
TEST_CASE( localvarStruct2 );
|
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( localvarInvert ); // Usage with inverted variable
|
||||||
TEST_CASE( localvarIf ); // Usage in if
|
TEST_CASE( localvarIf ); // Usage in if
|
||||||
TEST_CASE( localvarIfElse ); // return tmp1 ? tmp2 : tmp3;
|
TEST_CASE( localvarIfElse ); // return tmp1 ? tmp2 : tmp3;
|
||||||
|
@ -221,14 +221,19 @@ private:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void localvarMod()
|
void localvarOp()
|
||||||
{
|
{
|
||||||
functionVariableUsage( "int main()\n"
|
const char op[] = "+-*/%&|^";
|
||||||
"{\n"
|
for (const char *p = op; *p; ++p)
|
||||||
" int tmp = 10;\n"
|
{
|
||||||
" return 123 % tmp;\n"
|
std::string code( "int main()\n"
|
||||||
"}\n" );
|
"{\n"
|
||||||
ASSERT_EQUALS( std::string(""), errout.str() );
|
" 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()
|
void localvarInvert()
|
||||||
|
|
Loading…
Reference in New Issue