From 4d78a2e178d9eafb9b3e8f3bbb5dcf68ca5c1b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 19 Aug 2018 14:13:58 +0200 Subject: [PATCH] Fixed #7790 (Wrong order of XML-elements for error duplInheritedMember) --- lib/checkclass.cpp | 18 ++++++++++-------- lib/checkclass.h | 2 +- test/testclass.cpp | 10 +++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 217d036c7..34d594703 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -2435,17 +2435,19 @@ void CheckClass::checkDuplInheritedMembers() } void CheckClass::duplInheritedMembersError(const Token *tok1, const Token* tok2, - const std::string &derivedname, const std::string &basename, - const std::string &variablename, bool derivedIsStruct, bool baseIsStruct) + const std::string &derivedName, const std::string &baseName, + const std::string &variableName, bool derivedIsStruct, bool baseIsStruct) { - std::list toks = { tok1, tok2 }; + ErrorPath errorPath; + errorPath.emplace_back(tok2, "Parent variable '" + baseName + "::" + variableName + "'"); + errorPath.emplace_back(tok1, "Derived variable '" + derivedName + "::" + variableName + "'"); - const std::string symbols = "$symbol:" + derivedname + "\n$symbol:" + variablename + "\n$symbol:" + basename; + const std::string symbols = "$symbol:" + derivedName + "\n$symbol:" + variableName + "\n$symbol:" + baseName; - const std::string message = "The " + std::string(derivedIsStruct ? "struct" : "class") + " '" + derivedname + - "' defines member variable with name '" + variablename + "' also defined in its parent " + - std::string(baseIsStruct ? "struct" : "class") + " '" + basename + "'."; - reportError(toks, Severity::warning, "duplInheritedMember", symbols + '\n' + message, CWE398, false); + const std::string message = "The " + std::string(derivedIsStruct ? "struct" : "class") + " '" + derivedName + + "' defines member variable with name '" + variableName + "' also defined in its parent " + + std::string(baseIsStruct ? "struct" : "class") + " '" + baseName + "'."; + reportError(errorPath, Severity::warning, "duplInheritedMember", symbols + '\n' + message, CWE398, false); } diff --git a/lib/checkclass.h b/lib/checkclass.h index 60a1105cf..549a4ef4e 100644 --- a/lib/checkclass.h +++ b/lib/checkclass.h @@ -193,7 +193,7 @@ private: void selfInitializationError(const Token* tok, const std::string& varname); void pureVirtualFunctionCallInConstructorError(const Function * scopeFunction, const std::list & tokStack, const std::string &purefuncname); void virtualFunctionCallInConstructorError(const Function * scopeFunction, const std::list & tokStack, const std::string &funcname); - void duplInheritedMembersError(const Token* tok1, const Token* tok2, const std::string &derivedname, const std::string &basename, const std::string &variablename, bool derivedIsStruct, bool baseIsStruct); + void duplInheritedMembersError(const Token* tok1, const Token* tok2, const std::string &derivedName, const std::string &baseName, const std::string &variableName, bool derivedIsStruct, bool baseIsStruct); void copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor); void unsafeClassDivZeroError(const Token *tok, const std::string &className, const std::string &methodName, const std::string &varName); void overrideError(const Function *funcInBase, const Function *funcInDerived); diff --git a/test/testclass.cpp b/test/testclass.cpp index d29efe926..e293dcfad 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -457,7 +457,7 @@ private: "struct Derived : Base {\n" " int x;\n" "};"); - ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:3]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str()); checkDuplInheritedMembers("class Base {\n" " protected:\n" @@ -466,7 +466,7 @@ private: "struct Derived : public Base {\n" " int x;\n" "};"); - ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:3]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str()); checkDuplInheritedMembers("class Base0 {\n" " int x;\n" @@ -489,7 +489,7 @@ private: "struct Derived : Base0, Base1 {\n" " int x;\n" "};"); - ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:9]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n", errout.str()); checkDuplInheritedMembers("class Base0 {\n" " protected:\n" @@ -502,8 +502,8 @@ private: "struct Derived : Base0, Base1 {\n" " int x;\n" "};"); - ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:3]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n" - "[test.cpp:10] -> [test.cpp:7]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base1'.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n" + "[test.cpp:7] -> [test.cpp:10]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base1'.\n", errout.str()); checkDuplInheritedMembers("class Base {\n" " int x;\n"