Merge branch 'master' of http://github.com/danmar/cppcheck

cli/cmdlineparser.cpp

@@ -60,6 +60,7 @@ CmdLineParser::CmdLineParser(Settings *settings)
     , _showHelp(false)
     , _showVersion(false)
     , _showErrorMessages(false)
+    , _exitAfterPrint(false)
 {
 }
 
@@ -75,6 +76,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         if (strcmp(argv[i], "--version") == 0)
         {
             _showVersion = true;
+            _exitAfterPrint = true;
             return true;
         }
         // Flag used for various purposes during debugging
@@ -362,10 +364,9 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         // print all possible error messages..
         else if (strcmp(argv[i], "--errorlist") == 0)
         {
-            //_cppcheck->getErrorMessages();
             _showErrorMessages = true;
             _settings->_xml = true;
-            return true;
+            _exitAfterPrint = true;
         }
 
         // documentation..
@@ -383,6 +384,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             while (doc2.find("\n\n\n") != std::string::npos)
                 doc2.erase(doc2.find("\n\n\n"), 1);
             std::cout << doc2;
+            _exitAfterPrint = true;
             return true;
         }
 
@@ -459,6 +461,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         {
             _pathnames.clear();
             _showHelp = true;
+            _exitAfterPrint = true;
             break;
         }
 
@@ -486,15 +489,17 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         PrintMessage("--test-2-pass doesn't work with -j option yet.");
     }
 
-
     if (argc <= 1)
         _showHelp = true;
 
     if (_showHelp)
     {
         PrintHelp();
+        return true;
     }
-    else if (_pathnames.empty())
+
+    // Print error only if we have "real" command and expect files
+    if (!_exitAfterPrint && _pathnames.empty())
     {
         PrintMessage("cppcheck: No C or C++ source files found.");
         return false;

cli/cmdlineparser.h

@@ -84,6 +84,14 @@ public:
         return _showHelp;
     }
 
+    /**
+     * Return if we should exit after printing version, help etc.
+     */
+    bool ExitAfterPrinting() const
+    {
+        return _exitAfterPrint;
+    }
+
 protected:
 
     /**
@@ -101,6 +109,7 @@ private:
     bool _showHelp;
     bool _showVersion;
     bool _showErrorMessages;
+    bool _exitAfterPrint;
     std::vector<std::string> _pathnames;
 };
 

cli/cppcheckexecutor.cpp

@@ -45,10 +45,9 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
 
     if (success)
     {
-        if (parser.GetShowVersion())
+        if (parser.GetShowVersion() && !parser.GetShowErrorMessages())
         {
             std::cout << "Cppcheck " << cppcheck->version() << std::endl;
-            return true;
         }
 
         if (parser.GetShowErrorMessages())
@@ -57,8 +56,10 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
             std::cout << ErrorLogger::ErrorMessage::getXMLHeader(_settings._xml_version);
             cppcheck->getErrorMessages();
             std::cout << ErrorLogger::ErrorMessage::getXMLFooter() << std::endl;
-            std::exit(0);
         }
+
+        if (parser.ExitAfterPrinting())
+            std::exit(0);
     }
 
     // Check that all include paths exist

gui/aboutdialog.cpp

@@ -27,7 +27,7 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
     mUI.setupUi(this);
 
     mUI.mVersion->setText(mUI.mVersion->text().arg(version));
-    QString url = "<a href=\"http://cppcheck.wiki.sourceforge.net/\">http://cppcheck.wiki.sourceforge.net/</a>";
+    QString url = "<a href=\"http://cppcheck.sourceforge.net/\">http://cppcheck.sourceforge.net/</a>";
     mUI.mHomepage->setText(mUI.mHomepage->text().arg(url));
     connect(mUI.mButtons, SIGNAL(accepted()), this, SLOT(accept()));
 }

gui/erroritem.cpp

@@ -43,9 +43,11 @@ ErrorItem::ErrorItem(const ErrorLine &line)
 QString ErrorItem::ToString() const
 {
     QString str = file + " - " + id + " - " + severity +"\n";
-    str += "  " + summary;
+    str += summary + "\n";
-    str += "\n" + message;
+    str += message + "\n";
     for (int i = 0; i < files.size(); i++)
-        str += "  " + files[i] + ": " + lines[i] + "\n";
+    {
+        str += "  " + files[i] + ": " + QString::number(lines[i]) + "\n";
+    }
     return str;
 }

gui/mainwindow.cpp

@@ -358,6 +358,7 @@ Settings MainWindow::GetCppcheckSettings()
 
     result.addEnabled("style");
     result.addEnabled("information");
+    result.addEnabled("missingInclude");
     result.debug = false;
     result.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool();
     result._errorsOnly = false;

lib/checkclass.cpp

@@ -140,11 +140,7 @@ void CheckClass::constructors()
                 // It's non-static and it's not initialized => error
                 if (func->type == Function::eOperatorEqual)
                 {
-                    const Token *operStart = 0;
+                    const Token *operStart = func->token->tokAt(1);
-                    if (func->token->str() == "=")
-                        operStart = func->token->tokAt(1);
-                    else
-                        operStart = func->token->tokAt(3);
 
                     bool classNameUsed = false;
                     for (const Token *operTok = operStart; operTok != operStart->link(); operTok = operTok->next())
@@ -383,7 +379,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<std::string>
             std::list<Function>::const_iterator it;
             for (it = scope->functionList.begin(); it != scope->functionList.end(); ++it)
             {
-                if (ftok->next()->str() == it->tokenDef->str() && it->type != Function::eConstructor)
+                if (ftok->str() == it->tokenDef->str() && it->type != Function::eConstructor)
                     break;
             }
 
@@ -583,11 +579,6 @@ void CheckClass::privateFunctions()
     if (Token::findmatch(_tokenizer->tokens(), "; __property ;"))
         return;
 
-    // #2407 calls from operator() is not detected
-    // TODO: Don't bailout. Detect the call.
-    if (Token::findmatch(_tokenizer->tokens(), "operator ( )"))
-        return;
-
     createSymbolDatabase();
 
     std::list<Scope *>::const_iterator i;
@@ -872,8 +863,8 @@ void CheckClass::operatorEq()
         {
             if (it->type == Function::eOperatorEqual && it->access != Private)
             {
-                if (it->token->strAt(-2) == "void")
+                if (it->token->strAt(-1) == "void")
-                    operatorEqReturnError(it->token->tokAt(-2));
+                    operatorEqReturnError(it->token->tokAt(-1));
             }
         }
     }
@@ -971,8 +962,8 @@ void CheckClass::operatorEqRetRefThis()
                 if (func->type == Function::eOperatorEqual && func->hasBody)
                 {
                     // make sure return signature is correct
-                    if (Token::Match(func->tokenDef->tokAt(-4), ";|}|{|public:|protected:|private: %type% &") &&
+                    if (Token::Match(func->tokenDef->tokAt(-3), ";|}|{|public:|protected:|private: %type% &") &&
-                        func->tokenDef->strAt(-3) == scope->className)
+                        func->tokenDef->strAt(-2) == scope->className)
                     {
                         // find the ')'
                         const Token *tok = func->token->next()->link();
@@ -1027,8 +1018,8 @@ void CheckClass::operatorEqToSelf()
             if (it->type == Function::eOperatorEqual && it->hasBody)
             {
                 // make sure return signature is correct
-                if (Token::Match(it->tokenDef->tokAt(-4), ";|}|{|public:|protected:|private: %type% &") &&
+                if (Token::Match(it->tokenDef->tokAt(-3), ";|}|{|public:|protected:|private: %type% &") &&
-                    it->tokenDef->strAt(-3) == scope->className)
+                    it->tokenDef->strAt(-2) == scope->className)
                 {
                     // check for proper function parameter signature
                     if ((Token::Match(it->tokenDef->next(), "( const %var% & )") ||

lib/symboldatabase.cpp

@@ -137,12 +137,12 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
                     function.tokenDef = funcStart;
 
                     // operator function
-                    if (function.tokenDef->previous()->str() ==  "operator")
+                    if (function.tokenDef->str().find("operator") == 0)
                     {
                         function.isOperator = true;
 
                         // 'operator =' is special
-                        if (function.tokenDef->str() == "=")
+                        if (function.tokenDef->str() == "operator=")
                             function.type = Function::eOperatorEqual;
                     }
 
@@ -578,38 +578,6 @@ bool SymbolDatabase::isFunction(const Token *tok, const Token **funcStart, const
         return true;
     }
 
-    // simple operator?
-    else if (Token::Match(tok, "operator %any% (") && Token::Match(tok->tokAt(2)->link(), ") const| ;|{|="))
-    {
-        *funcStart = tok->next();
-        *argStart = tok->tokAt(2);
-        return true;
-    }
-
-    // operator[] or operator()?
-    else if (Token::Match(tok, "operator %any% %any% (") && Token::Match(tok->tokAt(3)->link(), ") const| ;|{|="))
-    {
-        *funcStart = tok->next();
-        *argStart = tok->tokAt(3);
-        return true;
-    }
-
-    // operator new/delete []?
-    else if (Token::Match(tok, "operator %any% %any% %any% (") && Token::Match(tok->tokAt(4)->link(), ") const| ;|{|="))
-    {
-        *funcStart = tok->next();
-        *argStart = tok->tokAt(4);
-        return true;
-    }
-
-    // complex user defined operator?
-    else if (Token::Match(tok, "operator %any% %any% %any% %any% (") && Token::Match(tok->tokAt(5)->link(), ") const| ;|{|="))
-    {
-        *funcStart = tok->next();
-        *argStart = tok->tokAt(5);
-        return true;
-    }
-
     return false;
 }
 
@@ -772,18 +740,7 @@ void SymbolDatabase::addFunction(Scope **scope, const Token **tok, const Token *
             {
                 if (!func->hasBody)
                 {
-                    if (func->isOperator &&
+                    if (func->type == Function::eDestructor &&
-                        (*tok)->str() == "operator" &&
-                        func->tokenDef->str() == (*tok)->strAt(1))
-                    {
-                        if (argsMatch(scope1, func->tokenDef->tokAt(2), (*tok)->tokAt(3), path, path_length))
-                        {
-                            func->hasBody = true;
-                            func->token = (*tok)->next();
-                            func->arg = argStart;
-                        }
-                    }
-                    else if (func->type == Function::eDestructor &&
                         (*tok)->previous()->str() == "~" &&
                         func->tokenDef->str() == (*tok)->str())
                     {

lib/tokenize.cpp

@@ -513,7 +513,7 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name)
         }
         else if (end->str() == "(")
         {
-            if (tok->previous()->str() == "operator")
+            if (tok->previous()->str().find("operator")  == 0)
             {
                 // conversion operator
                 return false;
@@ -2490,6 +2490,10 @@ bool Tokenizer::tokenize(std::istream &code,
     // remove exception specifications..
     removeExceptionSpecifications(_tokens);
 
+    // Collapse operator name tokens into single token
+    // operator = => operator=
+    simplifyOperatorName();
+
     // simplify function pointers
     simplifyFunctionPointers();
 
@@ -9238,3 +9242,30 @@ const SymbolDatabase *Tokenizer::getSymbolDatabase() const
 
     return _symbolDatabase;
 }
+
+void Tokenizer::simplifyOperatorName()
+{
+    for (const Token *tok = _tokens; tok; tok = tok->next())
+    {
+        if (Token::Match(tok, ") const| {|;|="))
+        {
+            Token *tok1 = tok->link();
+            Token *tok2 = tok1;
+
+            tok1 = tok1->previous();
+            while (tok1 && !Token::Match(tok1, "operator|{|}|;|public:|private|protected:"))
+            {
+                tok1 = tok1->previous();
+            }
+
+            if (tok1 && tok1->str() == "operator")
+            {
+                while (tok1->next() != tok2)
+                {
+                    tok1->str(tok1->str() + tok1->next()->str());
+                    tok1->deleteNext();
+                }
+            }
+        }
+    }
+}

lib/tokenize.h

@@ -531,6 +531,12 @@ public:
      */
     void simplifyQtSignalsSlots();
 
+    /**
+     * Collapse operator name tokens into single token
+     * operator = => operator=
+     */
+    void simplifyOperatorName();
+
     /**
      * This will return a short name describing function parameters
      * e.g. parameters: (int a, char b) should get name "int,char,".

test/testclass.cpp

@@ -3506,7 +3506,7 @@ private:
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { };\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (information) Technically the member function 'Fred::int' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (information) Technically the member function 'Fred::operatorint**' can be const.\n", errout.str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"

test/testcmdlineparser.cpp

@@ -77,6 +77,12 @@ private:
         TEST_CASE(templatesGcc);
         TEST_CASE(templatesVs);
         TEST_CASE(xml);
+        TEST_CASE(xmlver2);
+        TEST_CASE(xmlver2both);
+        TEST_CASE(xmlver2both2);
+        TEST_CASE(errorlist1);
+        TEST_CASE(errorlistverbose1)
+        TEST_CASE(errorlistverbose2)
         TEST_CASE(unknownParam);
     }
 
@@ -533,6 +539,69 @@ private:
         CmdLineParser parser(&settings);
         ASSERT(parser.ParseFromArgs(3, argv));
         ASSERT(settings._xml);
+        ASSERT_EQUALS(1, settings._xml_version);
+    }
+
+    void xmlver2()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--xml-version=2", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT(settings._xml);
+        ASSERT_EQUALS(2, settings._xml_version);
+    }
+
+    void xmlver2both()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--xml", "--xml-version=2", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(4, argv));
+        ASSERT(settings._xml);
+        ASSERT_EQUALS(2, settings._xml_version);
+    }
+
+    void xmlver2both2()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--xml-version=2", "--xml", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(4, argv));
+        ASSERT(settings._xml);
+        ASSERT_EQUALS(2, settings._xml_version);
+    }
+
+    void errorlist1()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--errorlist"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(2, argv));
+    }
+
+    void errorlistverbose1()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--verbose", "--errorlist"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT(settings._verbose);
+    }
+
+    void errorlistverbose2()
+    {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--errorlist", "--verbose"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT(settings._verbose);
     }
 
     void unknownParam()

test/testtokenize.cpp

@@ -293,6 +293,8 @@ private:
 
         // Tokenize JAVA
         TEST_CASE(java);
+
+        TEST_CASE(simplifyOperatorName);
     }
 
 
@@ -5182,6 +5184,38 @@ private:
     {
         ASSERT_EQUALS("void f ( ) { }", javatest("void f() throws Exception { }"));
     }
+
+    void simplifyOperatorName()
+    {
+        // make sure C code doesn't get changed
+        const char code1[] = "void operator () {}"
+                             "int main()"
+                             "{"
+                             "    operator();"
+                             "}";
+
+        const char result1 [] = "void operator ( ) { } "
+                                "int main ( ) "
+                                "{ "
+                                "operator ( ) ; "
+                                "}";
+
+        ASSERT_EQUALS(result1, tokenizeAndStringify(code1,false));
+
+        const char code2[] = "class Fred"
+                             "{"
+                             "    Fred(const Fred & f) { operator = (f); }"
+                             "    operator = ();"
+                             "}";
+
+        const char result2 [] = "class Fred "
+                                "{ "
+                                "Fred ( const Fred & f ) { operator= ( f ) ; } "
+                                "operator= ( ) ; "
+                                "}";
+
+        ASSERT_EQUALS(result2, tokenizeAndStringify(code2,false));
+    }
 };
 
 REGISTER_TEST(TestTokenizer)

test/testunusedprivfunc.cpp

@@ -460,8 +460,7 @@ private:
               "    void startListening() {\n"
               "    }\n"
               "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:8]: (style) Unused private function 'Fred::startListening'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8]: (style) Unused private function 'Fred::startListening'\n", errout.str());
-        ASSERT_EQUALS("", errout.str());
     }
 
     void testDoesNotIdentifyMethodAsFirstFunctionArgument()