Skip to content

Commit 5a2c31a

Browse files
firewavefirewave
authored
CmdLineParser: pass suppressions separately from settings (#5023)
1 parent 86757de commit 5a2c31a

4 files changed

Lines changed: 29 additions & 22 deletions

File tree

‎cli/cmdlineparser.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,10 @@ static bool addPathsToSet(const std::string& fileName, std::set<std::string>& se
114114
return true;
115115
}
116116

117-
CmdLineParser::CmdLineParser(Settings &settings)
117+
CmdLineParser::CmdLineParser(Settings &settings, Suppressions &suppressions, Suppressions &suppressionsNoFail)
118118
: mSettings(settings)
119+
, mSuppressions(suppressions)
120+
, mSuppressionsNoFail(suppressionsNoFail)
119121
, mShowHelp(false)
120122
, mShowVersion(false)
121123
, mShowErrorMessages(false)
@@ -406,7 +408,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
406408
printError("couldn't open the file: \"" + filename + "\".");
407409
return false;
408410
}
409-
const std::string errmsg(mSettings.nofail.parseFile(f));
411+
const std::string errmsg(mSuppressionsNoFail.parseFile(f));
410412
if (!errmsg.empty()) {
411413
printError(errmsg);
412414
return false;
@@ -858,7 +860,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
858860

859861
else if (std::strncmp(argv[i], "--suppress=", 11) == 0) {
860862
const std::string suppression = argv[i]+11;
861-
const std::string errmsg(mSettings.nomsg.addSuppressionLine(suppression));
863+
const std::string errmsg(mSuppressions.addSuppressionLine(suppression));
862864
if (!errmsg.empty()) {
863865
printError(errmsg);
864866
return false;
@@ -885,7 +887,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
885887
printError(message);
886888
return false;
887889
}
888-
const std::string errmsg(mSettings.nomsg.parseFile(f));
890+
const std::string errmsg(mSuppressions.parseFile(f));
889891
if (!errmsg.empty()) {
890892
printError(errmsg);
891893
return false;
@@ -894,7 +896,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
894896

895897
else if (std::strncmp(argv[i], "--suppress-xml=", 15) == 0) {
896898
const char * filename = argv[i] + 15;
897-
const std::string errmsg(mSettings.nomsg.parseXmlFile(filename));
899+
const std::string errmsg(mSuppressions.parseXmlFile(filename));
898900
if (!errmsg.empty()) {
899901
printError(errmsg);
900902
return false;

‎cli/cmdlineparser.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "utils.h"
2626

2727
class Settings;
28+
class Suppressions;
2829

2930
/// @addtogroup CLI
3031
/// @{
@@ -44,8 +45,10 @@ class CmdLineParser {
4445
* The constructor.
4546
* @param settings Settings instance that will be modified according to
4647
* options user has given.
48+
* @param suppressions Suppressions instance that keeps the suppressions
49+
* @param suppressionsNoFail Suppressions instance that keeps the "do not fail" suppressions
4750
*/
48-
explicit CmdLineParser(Settings &settings);
51+
CmdLineParser(Settings &settings, Suppressions &suppressions, Suppressions &suppressionsNoFail);
4952

5053
/**
5154
* Parse given command line.
@@ -141,6 +144,8 @@ class CmdLineParser {
141144
std::vector<std::string> mPathNames;
142145
std::vector<std::string> mIgnoredPaths;
143146
Settings &mSettings;
147+
Suppressions &mSuppressions;
148+
Suppressions &mSuppressionsNoFail;
144149
bool mShowHelp;
145150
bool mShowVersion;
146151
bool mShowErrorMessages;

‎cli/cppcheckexecutor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ CppCheckExecutor::~CppCheckExecutor()
8080

8181
bool CppCheckExecutor::parseFromArgs(Settings &settings, int argc, const char* const argv[])
8282
{
83-
CmdLineParser parser(settings);
83+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
8484
const bool success = parser.parseFromArgs(argc, argv);
8585

8686
if (success) {

‎test/testcmdlineparser.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TestCmdlineParser : public TestFixture {
3939
public:
4040
TestCmdlineParser()
4141
: TestFixture("TestCmdlineParser")
42-
, defParser(settings) {
42+
, defParser(settings, settings.nomsg, settings.nofail) {
4343
#if defined(_WIN64) || defined(_WIN32)
4444
CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
4545
#endif
@@ -244,7 +244,7 @@ class TestCmdlineParser : public TestFixture {
244244
void nooptions() {
245245
REDIRECT;
246246
const char * const argv[] = {"cppcheck"};
247-
CmdLineParser parser(settings);
247+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
248248
ASSERT(parser.parseFromArgs(1, argv));
249249
ASSERT_EQUALS(true, parser.getShowHelp());
250250
ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
@@ -253,7 +253,7 @@ class TestCmdlineParser : public TestFixture {
253253
void helpshort() {
254254
REDIRECT;
255255
const char * const argv[] = {"cppcheck", "-h"};
256-
CmdLineParser parser(settings);
256+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
257257
ASSERT(parser.parseFromArgs(2, argv));
258258
ASSERT_EQUALS(true, parser.getShowHelp());
259259
ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
@@ -262,7 +262,7 @@ class TestCmdlineParser : public TestFixture {
262262
void helplong() {
263263
REDIRECT;
264264
const char * const argv[] = {"cppcheck", "--help"};
265-
CmdLineParser parser(settings);
265+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
266266
ASSERT(parser.parseFromArgs(2, argv));
267267
ASSERT_EQUALS(true, parser.getShowHelp());
268268
ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
@@ -271,7 +271,7 @@ class TestCmdlineParser : public TestFixture {
271271
void showversion() {
272272
REDIRECT;
273273
const char * const argv[] = {"cppcheck", "--version"};
274-
CmdLineParser parser(settings);
274+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
275275
ASSERT(parser.parseFromArgs(2, argv));
276276
ASSERT_EQUALS(true, parser.getShowVersion());
277277
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); // version is not actually shown
@@ -280,7 +280,7 @@ class TestCmdlineParser : public TestFixture {
280280
void onefile() {
281281
REDIRECT;
282282
const char * const argv[] = {"cppcheck", "file.cpp"};
283-
CmdLineParser parser(settings);
283+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
284284
ASSERT(parser.parseFromArgs(2, argv));
285285
ASSERT_EQUALS(1, (int)parser.getPathNames().size());
286286
ASSERT_EQUALS("file.cpp", parser.getPathNames().at(0));
@@ -290,7 +290,7 @@ class TestCmdlineParser : public TestFixture {
290290
void onepath() {
291291
REDIRECT;
292292
const char * const argv[] = {"cppcheck", "src"};
293-
CmdLineParser parser(settings);
293+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
294294
ASSERT(parser.parseFromArgs(2, argv));
295295
ASSERT_EQUALS(1, (int)parser.getPathNames().size());
296296
ASSERT_EQUALS("src", parser.getPathNames().at(0));
@@ -300,7 +300,7 @@ class TestCmdlineParser : public TestFixture {
300300
void optionwithoutfile() {
301301
REDIRECT;
302302
const char * const argv[] = {"cppcheck", "-v"};
303-
CmdLineParser parser(settings);
303+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
304304
ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
305305
ASSERT_EQUALS(0, (int)parser.getPathNames().size());
306306
ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT);
@@ -1561,7 +1561,7 @@ class TestCmdlineParser : public TestFixture {
15611561
void ignorepathsnopath() {
15621562
REDIRECT;
15631563
const char * const argv[] = {"cppcheck", "-i"};
1564-
CmdLineParser parser(settings);
1564+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
15651565
// Fails since no ignored path given
15661566
ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
15671567
ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", GET_REDIRECT_OUTPUT);
@@ -1829,7 +1829,7 @@ class TestCmdlineParser : public TestFixture {
18291829
void ignorepaths1() {
18301830
REDIRECT;
18311831
const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
1832-
CmdLineParser parser(settings);
1832+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18331833
ASSERT(parser.parseFromArgs(3, argv));
18341834
ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
18351835
ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
@@ -1839,7 +1839,7 @@ class TestCmdlineParser : public TestFixture {
18391839
void ignorepaths2() {
18401840
REDIRECT;
18411841
const char * const argv[] = {"cppcheck", "-i", "src", "file.cpp"};
1842-
CmdLineParser parser(settings);
1842+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18431843
ASSERT(parser.parseFromArgs(4, argv));
18441844
ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
18451845
ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
@@ -1849,7 +1849,7 @@ class TestCmdlineParser : public TestFixture {
18491849
void ignorepaths3() {
18501850
REDIRECT;
18511851
const char * const argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
1852-
CmdLineParser parser(settings);
1852+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18531853
ASSERT(parser.parseFromArgs(4, argv));
18541854
ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
18551855
ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
@@ -1860,7 +1860,7 @@ class TestCmdlineParser : public TestFixture {
18601860
void ignorepaths4() {
18611861
REDIRECT;
18621862
const char * const argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
1863-
CmdLineParser parser(settings);
1863+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18641864
ASSERT(parser.parseFromArgs(6, argv));
18651865
ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
18661866
ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
@@ -1871,7 +1871,7 @@ class TestCmdlineParser : public TestFixture {
18711871
void ignorefilepaths1() {
18721872
REDIRECT;
18731873
const char * const argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
1874-
CmdLineParser parser(settings);
1874+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18751875
ASSERT(parser.parseFromArgs(3, argv));
18761876
ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
18771877
ASSERT_EQUALS("foo.cpp", parser.getIgnoredPaths()[0]);
@@ -1881,7 +1881,7 @@ class TestCmdlineParser : public TestFixture {
18811881
void ignorefilepaths2() {
18821882
REDIRECT;
18831883
const char * const argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
1884-
CmdLineParser parser(settings);
1884+
CmdLineParser parser(settings, settings.nomsg, settings.nofail);
18851885
ASSERT(parser.parseFromArgs(3, argv));
18861886
ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
18871887
ASSERT_EQUALS("src/foo.cpp", parser.getIgnoredPaths()[0]);

0 commit comments

Comments
 (0)