From f06a985adff1ec54e7a6c3753d8dfd077b5dd37d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jan 2017 23:01:06 +0300 Subject: Add checks for A_DEFAULT_COPY / A_DELETE_COPY. Also fix error in detection for final/notfinal classes. --- src/Makefile.am | 1 + src/rulebase.cpp | 19 +++++++-- src/rulebase.h | 3 ++ src/rules/copyconstructor.cpp | 78 +++++++++++++++++++++++++++++++++++++ src/rules/final.cpp | 2 +- src/stringutils.cpp | 13 +++++-- src/stringutils.h | 9 ++++- src/template.hpp | 1 + tests/testreport.txt | 25 ++++++++++-- tests/testsrc/bad/final1.cpp | 1 + tests/testsrc/bad/formatting.cpp | 1 + tests/testsrc/good/constructor1.cpp | 3 ++ tests/testsrc/good/constructor1.h | 4 ++ tests/testsrc/good/final1.cpp | 3 ++ tests/testsrc/good/final1.h | 2 + tests/testsrc/good/formatting.cpp | 5 +++ tests/testsrc/good/formatting.h | 3 ++ tests/testsrc/good/formatting2.cpp | 2 + tests/testsrc/good/virtual1.cpp | 2 + tests/testsrc/good/virtual1.h | 2 + 20 files changed, 167 insertions(+), 12 deletions(-) create mode 100644 src/rules/copyconstructor.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 4992044..0375ff2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ mplint_SOURCES = \ template.hpp \ rules/brackets.cpp \ rules/constructor.cpp \ + rules/copyconstructor.cpp \ rules/debug.cpp \ rules/dump.cpp \ rules/final.cpp \ diff --git a/src/rulebase.cpp b/src/rulebase.cpp index f44421c..207d116 100644 --- a/src/rulebase.cpp +++ b/src/rulebase.cpp @@ -35,10 +35,21 @@ RuleBase::RuleBase() : void RuleBase::print(const std::string &text) const { - printf("[%s:%d]: V%s: %s\n", file.c_str(), line, - ruleName.c_str(), text.c_str()); -// printf("%s [%s:%d]: V%s: %s\n", ruleName.c_str(), -// file.c_str(), line, ruleName.c_str(), text.c_str()); + printf("[%s:%d]: V%s: %s\n", + file.c_str(), + line, + ruleName.c_str(), + text.c_str()); +} + +void RuleBase::print(const std::string &text, + const int lineNumber) const +{ + printf("[%s:%d]: V%s: %s\n", + file.c_str(), + lineNumber, + ruleName.c_str(), + text.c_str()); } void RuleBase::printRaw(const std::string &text) const diff --git a/src/rulebase.h b/src/rulebase.h index 3263a8c..e8da0d0 100644 --- a/src/rulebase.h +++ b/src/rulebase.h @@ -73,6 +73,9 @@ class RuleBase void print(const std::string &text) const; + void print(const std::string &text, + const int lineNumber) const; + void printRaw(const std::string &text) const; std::string getFile() const diff --git a/src/rules/copyconstructor.cpp b/src/rules/copyconstructor.cpp new file mode 100644 index 0000000..3aeeccb --- /dev/null +++ b/src/rules/copyconstructor.cpp @@ -0,0 +1,78 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "template.hpp" + +registerRuleExt(copyConstructor, "016", "(.+)[.](cpp|h)") + +namespace +{ + std::set mClasses; + std::map mLines; +} // namespace + +startRule(copyConstructor) +{ + if (strEndWith(file, "debug/debug_new.cpp") + || strEndWith(file, "debug/fast_mutex.h") + || strEndWith(file, "debug/debug_new.h")) + { + terminateRule(); + } +} + +endRule(copyConstructor) +{ + FOR_EACH(std::set::const_iterator, it, mClasses) + { + print("Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY" + " for class " + *it, mLines[*it]); + } + mClasses.clear(); + mLines.clear(); +} + +parseLineRule(copyConstructor) +{ + std::smatch m; + if (isMatch(data, "(.*)(class|struct) ([a-zA-Z_0123456789]+)" + " (|not)final(.*)", + m)) + { + const std::string str = m.str(3); + mClasses.insert(str); + mLines[str] = line; + } + else if (isMatch(data, "([ ]*)(A_DELETE_COPY|A_DEFAULT_COPY)[(]" + "([a-zA-Z_0123456789]+)[)](.*)", + m)) + { + const std::string str = m.str(3); + if (mClasses.find(str) != mClasses.end()) + { + mClasses.erase(str); + mLines.erase(str); + } + else + { + print("Wrong A_DELETE_COPY or A_DEFAULT_COPY marker"); + } + } +} diff --git a/src/rules/final.cpp b/src/rules/final.cpp index a3ef501..bc2acb7 100644 --- a/src/rules/final.cpp +++ b/src/rules/final.cpp @@ -38,7 +38,7 @@ endRule(finalCheck) parseLineRule(finalCheck) { - if (isMatch(data, "([ ]*)(class|struct) ([a-zA-Z_0123456789]+)" + if (isMatch(data, "([ ]*)(static |)(class|struct) ([a-zA-Z_0123456789]+)" "($|( [:])([^;]+)(.*))")) { print("Need add final or notfinal into class declaration"); diff --git a/src/stringutils.cpp b/src/stringutils.cpp index 1f5ff47..e903941 100644 --- a/src/stringutils.cpp +++ b/src/stringutils.cpp @@ -22,14 +22,12 @@ #include "stringutils.h" -#include #include #include #include #include #include #include -#include #include @@ -708,12 +706,21 @@ void secureChatCommand(std::string &str) str = "_" + str; } -bool isMatch(const std::string &str, const std::string &exp) +bool isMatch(const std::string &str, + const std::string &exp) { std::regex regExp(exp); return std::regex_match(str, regExp); } +bool isMatch(const std::string &str, + const std::string &exp, + std::smatch &m) +{ + std::regex regExp(exp); + return std::regex_match(str, m, regExp); +} + bool fileExists(const std::string &name) { struct stat statbuf; diff --git a/src/stringutils.h b/src/stringutils.h index 3cbcdb9..c34b8c7 100644 --- a/src/stringutils.h +++ b/src/stringutils.h @@ -25,9 +25,11 @@ #include "stringvector.h" +#include #include #include #include +#include #include "localconsts.h" @@ -237,7 +239,12 @@ bool isDigit(const std::string &str); void secureChatCommand(std::string &str); -bool isMatch(const std::string &str, const std::string &exp); +bool isMatch(const std::string &str, + const std::string &exp); + +bool isMatch(const std::string &str, + const std::string &exp, + std::smatch &m); bool fileExists(const std::string &name); diff --git a/src/template.hpp b/src/template.hpp index 25c7b88..cf67ebe 100644 --- a/src/template.hpp +++ b/src/template.hpp @@ -21,6 +21,7 @@ #include "rulebase.h" #include "stringutils.h" +#include #include #include "localconsts.h" diff --git a/tests/testreport.txt b/tests/testreport.txt index 22e1413..e56ac61 100644 --- a/tests/testreport.txt +++ b/tests/testreport.txt @@ -31,20 +31,35 @@ [testsrc/bad/debug1.h:23]: V003: Dont use #include "debug.h" in .h files. Probably need replace it to #include "localconsts.h" [testsrc/bad/debug2.cpp:23]: V004: Last include must be #include "debug.h" [testsrc/bad/final1.cpp:25]: V007: Need add final or notfinal into class declaration -[testsrc/bad/final1.cpp:30]: V007: Need add final or notfinal into class declaration +[testsrc/bad/final1.cpp:27]: V016: Wrong A_DELETE_COPY or A_DEFAULT_COPY marker +[testsrc/bad/final1.cpp:31]: V007: Need add final or notfinal into class declaration [testsrc/bad/final1.h:23]: V007: Need add final or notfinal into class declaration [testsrc/bad/final1.h:27]: V007: Need add final or notfinal into class declaration +[testsrc/bad/formatting2.cpp:26]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class SortPartyFunctor [testsrc/bad/formatting2.cpp:28]: V011: Wrong public/protected/private formatting. Must be align 8, but present align 9. +[testsrc/bad/formatting.cpp:25]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 [testsrc/bad/formatting.cpp:27]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 0. -[testsrc/bad/formatting.cpp:35]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 0. -[testsrc/bad/formatting.cpp:45]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 8. +[testsrc/bad/formatting.cpp:28]: V016: Wrong A_DELETE_COPY or A_DEFAULT_COPY marker +[testsrc/bad/formatting.cpp:34]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 +[testsrc/bad/formatting.cpp:36]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 0. +[testsrc/bad/formatting.cpp:44]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test3 +[testsrc/bad/formatting.cpp:46]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 8. +[testsrc/bad/formatting.h:23]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 [testsrc/bad/formatting.h:25]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 0. +[testsrc/bad/formatting.h:31]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 [testsrc/bad/formatting.h:33]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 5. +[testsrc/bad/formatting.h:41]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test3 [testsrc/bad/formatting.h:43]: V011: Wrong public/protected/private formatting. Must be align 4, but present align 1. [testsrc/bad/include1.cpp:21]: V008: Wrong include #include "lintmanager1.h". Probably you should use path from src dir, or use #include [testsrc/bad/include1.cpp:23]: V008: Wrong include #include "include1.h". Probably you should use path from src dir, or use #include +[testsrc/bad/include1.cpp:27]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 +[testsrc/bad/include1.cpp:34]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 +[testsrc/bad/include1.cpp:43]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test3 [testsrc/bad/include1.h:21]: V008: Wrong include #include "lintmanager1.h". Probably you should use path from src dir, or use #include [testsrc/bad/include1.h:23]: V008: Wrong include #include "license1.h". Probably you should use path from src dir, or use #include +[testsrc/bad/include1.h:25]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 +[testsrc/bad/include1.h:32]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 +[testsrc/bad/include1.h:41]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test3 [testsrc/bad/license1.cpp:1]: V005: Should be license header [testsrc/bad/license1.h:1]: V005: Should be license header [testsrc/bad/license2.cpp:2]: V005: Should be 'The ManaPlus Client' in header @@ -67,7 +82,11 @@ [testsrc/bad/uk.po:2269]: V010: Wrong character at start of translation line. [testsrc/bad/uk.po:2535]: V010: Wrong number of spaces at start of translation line. [testsrc/bad/uk.po:3711]: V010: Wrong character at end of translation line. +[testsrc/bad/virtual1.cpp:25]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 +[testsrc/bad/virtual1.cpp:31]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 [testsrc/bad/virtual1.cpp:33]: V013: Keywords virtual is useless if used with override or final [testsrc/bad/virtual1.cpp:36]: V013: Keywords virtual is useless if used with override or final +[testsrc/bad/virtual1.h:23]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test1 +[testsrc/bad/virtual1.h:29]: V016: Missing copy constructor marker A_DELETE_COPY / A_DEFAULT_COPY for class Test2 [testsrc/bad/virtual1.h:31]: V013: Keywords virtual is useless if used with override or final [testsrc/bad/virtual1.h:32]: V013: Keywords virtual is useless if used with override or final diff --git a/tests/testsrc/bad/final1.cpp b/tests/testsrc/bad/final1.cpp index 3e17bb2..045cf18 100644 --- a/tests/testsrc/bad/final1.cpp +++ b/tests/testsrc/bad/final1.cpp @@ -24,6 +24,7 @@ class Test1 { + A_DELETE_COPY(Test2); Test1(); } diff --git a/tests/testsrc/bad/formatting.cpp b/tests/testsrc/bad/formatting.cpp index 2f0bda5..3dab5ed 100644 --- a/tests/testsrc/bad/formatting.cpp +++ b/tests/testsrc/bad/formatting.cpp @@ -25,6 +25,7 @@ class Test1 final { public: + A_DELETE_COPY(Test3); Test1::Test1() { } diff --git a/tests/testsrc/good/constructor1.cpp b/tests/testsrc/good/constructor1.cpp index 41003b7..d300f06 100644 --- a/tests/testsrc/good/constructor1.cpp +++ b/tests/testsrc/good/constructor1.cpp @@ -24,6 +24,7 @@ class Test1 final { + A_DELETE_COPY(Test1) Test1::Test1() { } @@ -31,6 +32,8 @@ class Test1 final struct Test2 final { + A_DELETE_COPY(Test2) + Test2::Test2() : data1(), data2() diff --git a/tests/testsrc/good/constructor1.h b/tests/testsrc/good/constructor1.h index 4e5a06d..d33fadb 100644 --- a/tests/testsrc/good/constructor1.h +++ b/tests/testsrc/good/constructor1.h @@ -22,6 +22,8 @@ class Test1 final { + A_DELETE_COPY(Test1) + Test1::Test1() { } @@ -29,6 +31,8 @@ class Test1 final struct Test2 final { + A_DEFAULT_COPY(Test2) + Test2::Test2() : data1(), data2() diff --git a/tests/testsrc/good/final1.cpp b/tests/testsrc/good/final1.cpp index cdb6a1b..abac4dd 100644 --- a/tests/testsrc/good/final1.cpp +++ b/tests/testsrc/good/final1.cpp @@ -24,12 +24,15 @@ class Test1 final { + A_DELETE_COPY(Test1); Test1(); } class Test2 notfinal : public Test1 { Test2(); + + A_DEFAULT_COPY(Test2); } /* diff --git a/tests/testsrc/good/final1.h b/tests/testsrc/good/final1.h index c66c08a..913384f 100644 --- a/tests/testsrc/good/final1.h +++ b/tests/testsrc/good/final1.h @@ -22,10 +22,12 @@ class Test1 notfinal { + A_DELETE_COPY(Test1) } class Test2 final : public Test1 { + A_DELETE_COPY(Test2) } diff --git a/tests/testsrc/good/formatting.cpp b/tests/testsrc/good/formatting.cpp index 6d4d47a..5e1c6fe 100644 --- a/tests/testsrc/good/formatting.cpp +++ b/tests/testsrc/good/formatting.cpp @@ -25,6 +25,7 @@ class Test1 final { public: + A_DELETE_COPY(Test1); Test1::Test1() { } @@ -33,6 +34,7 @@ class Test1 final struct Test2 final { protected: + A_DELETE_COPY(Test2); Test2::Test2() : data1(), data2() @@ -42,6 +44,7 @@ struct Test2 final struct Test3 final { + A_DEFAULT_COPY(Test3); private: Test3::Test3() : data1(), @@ -59,6 +62,8 @@ struct ParticleTimer final { } + A_DELETE_COPY(ParticleTimer); + Particle *particle; int endTime; Particle *const particle; diff --git a/tests/testsrc/good/formatting.h b/tests/testsrc/good/formatting.h index df123d2..a6ccd4b 100644 --- a/tests/testsrc/good/formatting.h +++ b/tests/testsrc/good/formatting.h @@ -22,6 +22,7 @@ class Test1 final { + A_DELETE_COPY(Test1) public: Test1::Test1() { @@ -30,6 +31,7 @@ class Test1 final struct Test2 final { + A_DEFAULT_COPY(Test2) protected: Test2::Test2() : data1(), @@ -40,6 +42,7 @@ struct Test2 final struct Test3 final { + A_DELETE_COPY(Test3) private: Test3::Test3() : data1(), diff --git a/tests/testsrc/good/formatting2.cpp b/tests/testsrc/good/formatting2.cpp index e790ade..fc20f0c 100644 --- a/tests/testsrc/good/formatting2.cpp +++ b/tests/testsrc/good/formatting2.cpp @@ -26,6 +26,8 @@ namespace static class SortPartyFunctor final { public: + A_DELETE_COPY(SortPartyFunctor) + bool operator() (const PartyMember *const p1, const PartyMember *const p2) const { diff --git a/tests/testsrc/good/virtual1.cpp b/tests/testsrc/good/virtual1.cpp index 5314e16..6d2fad9 100644 --- a/tests/testsrc/good/virtual1.cpp +++ b/tests/testsrc/good/virtual1.cpp @@ -24,11 +24,13 @@ class Test1 final { + A_DELETE_COPY(Test1) virtual Test1finalize(); } class Test2 notfinal : public Test1 { + A_DEFAULT_COPY(Test2) Test2() override final; } diff --git a/tests/testsrc/good/virtual1.h b/tests/testsrc/good/virtual1.h index c66c08a..a82e2ec 100644 --- a/tests/testsrc/good/virtual1.h +++ b/tests/testsrc/good/virtual1.h @@ -22,10 +22,12 @@ class Test1 notfinal { + A_DEFAULT_COPY(Test1) } class Test2 final : public Test1 { + A_DEFAULT_COPY(Test2) } -- cgit v1.2.3-60-g2f50