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

Fix ticket #319 (Function names are tagged as variables) 

http://apps.sourceforge.net/trac/cppcheck/ticket/319
This commit is contained in:
Reijo Tomperi 2009-05-27 23:34:08 +03:00
parent d6a34dafb2
commit adb1ed4947
2 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tokenize.cpp
View File

@ -747,17 +747,22 @@ void Tokenizer::setVarId()
// Is it a function?
if (tok2->str() == "(")
{
bool isfunc = false;
for (const Token *tok3 = tok2; tok3; tok3 = tok3->next())
{
if (tok3->str() == ")")
{
isfunc = Token::simpleMatch(tok3, ") {");
break;
}
}
if (isfunc)
// Search for function declaration, e.g. void f();
if (Token::simpleMatch(tok2->next(), ") ;"))
continue;
// Search for function declaration, e.g. void f( int c );
if (Token::Match(tok2->next(), "%num%") ||
Token::Match(tok2->next(), "%bool%") ||
tok2->next()->str()[0] == '"' ||
tok2->next()->varId() != 0)
{
// This is not a function
}
else
{
continue;
}
}
// Variable declaration found => Set variable ids
@ -799,8 +804,11 @@ void Tokenizer::setVarId()
// Struct/Class members
for (Token *tok = _tokens; tok; tok = tok->next())
{
// str.clear is a variable
// str.clear() is a member function
if (tok->varId() != 0 &&
Token::Match(tok->next(), ". %var%") &&
!Token::Match(tok->tokAt(3), "(") &&
tok->tokAt(2)->varId() == 0)
{
++_varId;

57
test/testtokenize.cpp
View File

@ -110,6 +110,7 @@ private:
TEST_CASE(varid9);
TEST_CASE(varidStl);
TEST_CASE(varid_delete);
TEST_CASE(varid_functions);
TEST_CASE(varidclass1);
TEST_CASE(varidclass2);
@ -1119,7 +1120,7 @@ private:
"1: void func ( )\n"
"2: {\n"
"3: std :: string str@1 ( \"test\" ) ;\n"
"4: str@1 . clear@2 ( ) ;\n"
"4: str@1 . clear ( ) ;\n"
"5: }\n");
ASSERT_EQUALS(expected, actual);
@ -1189,6 +1190,50 @@ private:
ASSERT_EQUALS(expected, actual);
}
void varid_functions()
{
{
const std::string code("void f();\n"
"void f(){}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n"
"1: void f ( ) ;\n"
"2: void f ( ) { }\n");
ASSERT_EQUALS(expected, actual);
}
{
const std::string code("A f(3);\n"
"A f2(true);\n"
"A g();\n"
"A e(int c);\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n"
"1: A f@1 ( 3 ) ;\n"
"2: A f2@2 ( true ) ;\n"
"3: A g ( ) ;\n"
"4: A e ( int c@3 ) ;\n");
ASSERT_EQUALS(expected, actual);
}
}
void varidclass1()
{
@ -1223,7 +1268,7 @@ private:
"3: private:\n"
"4: int i@1 ;\n"
"5:\n"
"6: void foo1@2 ( ) ;\n"
"6: void foo1 ( ) ;\n"
"7: void foo2 ( )\n"
"8: {\n"
"9: ++ i@1 ;\n"
@ -1264,11 +1309,11 @@ private:
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n"
"1: class Fred\n"
"2: { void f@1 ( ) ; } ;\n"
"2: { void f ( ) ; } ;\n"
"3:\n"
"4: void A :: foo1 ( )\n"
"5: {\n"
"6: int i@2 ; i@2 = 0 ;\n"
"6: int i@1 ; i@1 = 0 ;\n"
"7: }\n"
"8:\n"
"9: void Fred :: f ( )\n"
@ -1305,7 +1350,7 @@ private:
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n"
"1: class Fred\n"
"2: { int i@1 ; void f@2 ( ) ; } ;\n"
"2: { int i@1 ; void f ( ) ; } ;\n"
"3:\n"
"4: void Fred :: f ( )\n"
"5: {\n"
@ -1342,7 +1387,7 @@ private:
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n"
"1: class Fred\n"
"2: { int i@1 ; void f@2 ( ) ; } ;\n"
"2: { int i@1 ; void f ( ) ; } ;\n"
"3:\n"
"4: void Fred :: f ( )\n"
"5: {\n"