From 3441603804b740f560f2ddddce8bc56231a1e901 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 29 Dec 2017 06:55:29 +0300 Subject: Add new check for ":" after class name and before base classes. --- src/Makefile.am | 1 + src/rules/baseclass.cpp | 43 ++++++++++++++++++++++++++++++++++++ tests/testreport.txt | 3 +++ tests/testsrc/bad/baseclass.cpp | 45 ++++++++++++++++++++++++++++++++++++++ tests/testsrc/bad/baseclass.h | 44 +++++++++++++++++++++++++++++++++++++ tests/testsrc/good/baseclass.cpp | 47 ++++++++++++++++++++++++++++++++++++++++ tests/testsrc/good/baseclass.h | 44 +++++++++++++++++++++++++++++++++++++ 7 files changed, 227 insertions(+) create mode 100644 src/rules/baseclass.cpp create mode 100644 tests/testsrc/bad/baseclass.cpp create mode 100644 tests/testsrc/bad/baseclass.h create mode 100644 tests/testsrc/good/baseclass.cpp create mode 100644 tests/testsrc/good/baseclass.h diff --git a/src/Makefile.am b/src/Makefile.am index 3557e43..28fe219 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,7 @@ mplint_SOURCES = \ stringutils.h \ stringvector.h \ template.hpp \ + rules/baseclass.cpp \ rules/brackets.cpp \ rules/constructor.cpp \ rules/constructorbrackets.cpp \ diff --git a/src/rules/baseclass.cpp b/src/rules/baseclass.cpp new file mode 100644 index 0000000..c6c06bf --- /dev/null +++ b/src/rules/baseclass.cpp @@ -0,0 +1,43 @@ +/* + * 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(baseclass, "006", "(.+)[.](cpp|h)") + +startRule(baseclass) +{ +} + +endRule(baseclass) +{ +} + +parseLineRule(baseclass) +{ + std::smatch m; + if (data.find("friend ") == std::string::npos && + isMatch(data, "(.*)(class|struct) (([a-zA-Z_0123456789]+)|" + "([a-zA-Z_0123456789 ]+)([a-zA-Z_0123456789]+))[:](.*)", + m)) + { + print("Wrong align after class name and before ':'."); + } +} diff --git a/tests/testreport.txt b/tests/testreport.txt index da80304..b71b36b 100644 --- a/tests/testreport.txt +++ b/tests/testreport.txt @@ -1,4 +1,7 @@ [testsrc/bad/avatarlistbox.xml:1]: V009: Wrong xml header. Must be '' +[testsrc/bad/baseclass.cpp:32]: V006: Wrong align after class name and before ':'. +[testsrc/bad/baseclass.cpp:37]: V006: Wrong align after class name and before ':'. +[testsrc/bad/baseclass.h:30]: V006: Wrong align after class name and before ':'. [testsrc/bad/brackets.cpp:23]: V015: Brackets formatting error. Wrong last bracket position [testsrc/bad/brackets.cpp:34]: V015: Brackets formatting error. Wrong last bracket position [testsrc/bad/brackets.cpp:45]: V015: Brackets formatting error. Wrong last bracket position diff --git a/tests/testsrc/bad/baseclass.cpp b/tests/testsrc/bad/baseclass.cpp new file mode 100644 index 0000000..88e9323 --- /dev/null +++ b/tests/testsrc/bad/baseclass.cpp @@ -0,0 +1,45 @@ +/* + * 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 2 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 "lintmanager.h" + +#include "debug.h" + +friend class CharDeleteConfirm; + +class Test1 notfinal +{ + A_DELETE_COPY(Test1) +} + +class Test2 final: public Test1 +{ + A_DELETE_COPY(Test2) +} + +struct Test2 final: public Test1, public Test3 +{ + A_DELETE_COPY(Test2) +} + + +/* + * Sets the widget being dragged. Used by the Gui class to +*/ \ No newline at end of file diff --git a/tests/testsrc/bad/baseclass.h b/tests/testsrc/bad/baseclass.h new file mode 100644 index 0000000..4227864 --- /dev/null +++ b/tests/testsrc/bad/baseclass.h @@ -0,0 +1,44 @@ +/* + * 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 2 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 "lintmanager.h" + +friend class CharDeleteConfirm; + +class Test1 notfinal +{ + A_DELETE_COPY(Test1) +} + +class Test2 final: public Test1 +{ + friend class CharDeleteConfirm; + A_DELETE_COPY(Test2) +} + +struct Test2 final : public Test1, public Test3 +{ + A_DELETE_COPY(Test2) +} + + +/* + * Sets the widget being dragged. Used by the Gui class to +*/ \ No newline at end of file diff --git a/tests/testsrc/good/baseclass.cpp b/tests/testsrc/good/baseclass.cpp new file mode 100644 index 0000000..6cad6da --- /dev/null +++ b/tests/testsrc/good/baseclass.cpp @@ -0,0 +1,47 @@ +/* + * 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 2 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 "lintmanager.h" + +#include "debug.h" + +friend class CharDeleteConfirm; + +class Test1 notfinal +{ + friend class CharDeleteConfirm; + A_DELETE_COPY(Test1) +} + +class Test2 final : public Test1 +{ + A_DELETE_COPY(Test2) +} + +struct Test2 final : public Test1, public Test3 +{ + friend class CharDeleteConfirm; + A_DELETE_COPY(Test2) +} + + +/* + * Sets the widget being dragged. Used by the Gui class to +*/ \ No newline at end of file diff --git a/tests/testsrc/good/baseclass.h b/tests/testsrc/good/baseclass.h new file mode 100644 index 0000000..06a18a2 --- /dev/null +++ b/tests/testsrc/good/baseclass.h @@ -0,0 +1,44 @@ +/* + * 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 2 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 "lintmanager.h" + +friend class CharDeleteConfirm; + +class Test1 notfinal +{ + A_DELETE_COPY(Test1) +} + +class Test2 final : public Test1 +{ + friend class CharDeleteConfirm; + A_DELETE_COPY(Test2) +} + +struct Test2 final : public Test1, public Test3 +{ + A_DELETE_COPY(Test2) +} + + +/* + * Sets the widget being dragged. Used by the Gui class to +*/ \ No newline at end of file -- cgit v1.2.3-60-g2f50