Show line number when suggesting std::transform (#1385)

pfultz2 · amai2012 · commit d43cd56afd88 · 2018-09-21T10:38:30.000+02:00
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -1998,7 +1998,7 @@ void CheckStl::useStlAlgorithm()
                         algo = "std::copy";
                     else
                         algo = "std::transform";
-                    useStlAlgorithmError(assignTok, algo);
+                    useStlAlgorithmError(memberCallTok, algo);
                 }
                 continue;
             }
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -3321,47 +3321,47 @@ class TestStl : public TestFixture {
               "        c.push_back(x);\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(f(x));\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(x + 1);\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(x);\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(f(x));\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(x + 1);\n"
               "}\n",
               true);
-        ASSERT_EQUALS("(style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"

Original file line number	Diff line number	Diff line change
`@@ -1998,7 +1998,7 @@ void CheckStl::useStlAlgorithm()`
`1998`	`1998`	`algo = "std::copy";`
`1999`	`1999`	`else`
`2000`	`2000`	`algo = "std::transform";`
`2001`		`- useStlAlgorithmError(assignTok, algo);`
	`2001`	`+ useStlAlgorithmError(memberCallTok, algo);`
`2002`	`2002`	`}`
`2003`	`2003`	`continue;`
`2004`	`2004`	`}`