From 69ea8a21a832be11f3ce8344431d2cdd0d6e74e7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 3 Jun 2014 19:48:31 +0300 Subject: add rule for checking xml header. --- src/Makefile.am | 3 ++- src/rules/xml.cpp | 42 ++++++++++++++++++++++++++++++++++++ tests/testreport.txt | 3 +++ tests/testsrc/bad/avatarlistbox.xml | 6 ++++++ tests/testsrc/bad/include1.cpp | 2 ++ tests/testsrc/bad/include1.h | 2 ++ tests/testsrc/good/avatarlistbox.xml | 7 ++++++ 7 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/rules/xml.cpp create mode 100644 tests/testsrc/bad/avatarlistbox.xml create mode 100644 tests/testsrc/good/avatarlistbox.xml diff --git a/src/Makefile.am b/src/Makefile.am index 4bcbe76..14455db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,8 @@ mplint_SOURCES = \ rules/dump.cpp \ rules/final.cpp \ rules/include.cpp \ - rules/license.cpp + rules/license.cpp \ + rules/xml.cpp # set the include path found by configure AM_CPPFLAGS = $(all_includes) diff --git a/src/rules/xml.cpp b/src/rules/xml.cpp new file mode 100644 index 0000000..1736a4f --- /dev/null +++ b/src/rules/xml.cpp @@ -0,0 +1,42 @@ +/* + * 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(xml, "009", "(.+)[.](xml)") + +startRule(xml) +{ +} + +endRule(xml) +{ +} + +parseLineRule(xml) +{ + if (line == 1) + { + const std::string str = ""; + if (data != str) + print("Wrong xml header. Must be '" + str + "'"); + } +} + diff --git a/tests/testreport.txt b/tests/testreport.txt index 6297170..15249b8 100644 --- a/tests/testreport.txt +++ b/tests/testreport.txt @@ -1,3 +1,4 @@ +[testsrc/bad/avatarlistbox.xml:1]: V009: Wrong xml header. Must be '' [testsrc/bad/constructor1.cpp:25]: V007: Need add final or notfinal into class declaration [testsrc/bad/constructor1.cpp:32]: V007: Need add final or notfinal into class declaration [testsrc/bad/constructor1.cpp:34]: V006: Add space between constructor and ":". @@ -18,7 +19,9 @@ [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/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.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/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 diff --git a/tests/testsrc/bad/avatarlistbox.xml b/tests/testsrc/bad/avatarlistbox.xml new file mode 100644 index 0000000..b16e8d9 --- /dev/null +++ b/tests/testsrc/bad/avatarlistbox.xml @@ -0,0 +1,6 @@ + + + + diff --git a/tests/testsrc/bad/include1.cpp b/tests/testsrc/bad/include1.cpp index 893c186..a2ed231 100644 --- a/tests/testsrc/bad/include1.cpp +++ b/tests/testsrc/bad/include1.cpp @@ -20,6 +20,8 @@ #include "lintmanager1.h" +#include "include1.h" + #include "debug.h" class Test1 final diff --git a/tests/testsrc/bad/include1.h b/tests/testsrc/bad/include1.h index 1d87446..458a491 100644 --- a/tests/testsrc/bad/include1.h +++ b/tests/testsrc/bad/include1.h @@ -20,6 +20,8 @@ #include "lintmanager1.h" +#include "license1.h" + class Test1 final { Test1::Test1() diff --git a/tests/testsrc/good/avatarlistbox.xml b/tests/testsrc/good/avatarlistbox.xml new file mode 100644 index 0000000..1cc0199 --- /dev/null +++ b/tests/testsrc/good/avatarlistbox.xml @@ -0,0 +1,7 @@ + + + + + -- cgit v1.2.3-60-g2f50