From adb1ed4947cf8aecac574940f5c5cdcfa1156549 Mon Sep 17 00:00:00 2001 From: Reijo Tomperi Date: Wed, 27 May 2009 23:34:08 +0300 Subject: [PATCH] Fix ticket #319 (Function names are tagged as variables) http://apps.sourceforge.net/trac/cppcheck/ticket/319 --- src/tokenize.cpp | 28 +++++++++++++-------- test/testtokenize.cpp | 57 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/tokenize.cpp b/src/tokenize.cpp index 1bc7ed551..b27958a28 100644 --- a/src/tokenize.cpp +++ b/src/tokenize.cpp @@ -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; diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp index ea13a2bde..f974a5060 100644 --- a/test/testtokenize.cpp +++ b/test/testtokenize.cpp @@ -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"