Fix #10515 False positive for explicit one-argument constructor if co… (danmar#3718)

chrchr-github · web-flow · commit c2fc4973ad89 · 2022-01-17T20:51:23.000+01:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -2208,7 +2208,7 @@ Function::Function(const Tokenizer *mTokenizer,
         else
             type = Function::eConstructor;
 
-        isExplicit(tokenDef->previous()->str() == "explicit");
+        isExplicit(tokenDef->strAt(-1) == "explicit" || tokenDef->strAt(-2) == "explicit");
     }
 
     const Token *tok1 = setFlags(tok, scope);
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -444,6 +444,19 @@ class TestClass : public TestFixture {
                                   "    A(int, int y=2) {}"
                                   "};");
         ASSERT_EQUALS("[test.cpp:1]: (style) Struct 'A' has a constructor with 1 argument that is not explicit.\n", errout.str());
+
+        checkExplicitConstructors("struct Foo {\n"
+                                  "    template <typename T>\n"
+                                  "    explicit constexpr Foo(T) {}\n"
+                                  "};\n"
+                                  "struct Bar {\n"
+                                  "    template <typename T>\n"
+                                  "    constexpr explicit Bar(T) {}\n"
+                                  "};\n"
+                                  "struct Baz {\n"
+                                  "    explicit constexpr Baz(int) {}\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
 #define checkDuplInheritedMembers(code) checkDuplInheritedMembers_(code, __FILE__, __LINE__)

Original file line number	Diff line number	Diff line change
`@@ -2208,7 +2208,7 @@ Function::Function(const Tokenizer *mTokenizer,`
`2208`	`2208`	`else`
`2209`	`2209`	`type = Function::eConstructor;`
`2210`	`2210`
`2211`		`- isExplicit(tokenDef->previous()->str() == "explicit");`
	`2211`	`+ isExplicit(tokenDef->strAt(-1) == "explicit" \|\| tokenDef->strAt(-2) == "explicit");`
`2212`	`2212`	`}`
`2213`	`2213`
`2214`	`2214`	`const Token *tok1 = setFlags(tok, scope);`