walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactoring: Made Preprocessor::match_cfg_def nonstatic

This commit is contained in:
Daniel Marjamäki 2012-01-06 08:15:48 +01:00
parent e4875178fa
commit 66472b09c0
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/preprocessor.h
View File

@ -205,7 +205,7 @@ public:
* @param def condition * @param def condition
* @return result when evaluating the condition * @return result when evaluating the condition
*/ */
static bool match_cfg_def(const std::map<std::string, std::string> &cfg, std::string def); bool match_cfg_def(const std::map<std::string, std::string> &cfg, std::string def);
static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings); static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings);

26
test/testpreprocessor.cpp
View File

@ -1002,27 +1002,29 @@ private:
void match_cfg_def() { void match_cfg_def() {
Preprocessor preprocessor(NULL, this);
{ {
std::map<std::string, std::string> cfg; std::map<std::string, std::string> cfg;
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A>1||defined(B)")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A>1||defined(B)"));
} }
{ {
std::map<std::string, std::string> cfg; std::map<std::string, std::string> cfg;
cfg["A"] = ""; cfg["A"] = "";
cfg["B"] = ""; cfg["B"] = "";
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "defined(A)&&defined(B)")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "defined(A)&&defined(B)"));
} }
{ {
std::map<std::string, std::string> cfg; std::map<std::string, std::string> cfg;
cfg["ABC"] = ""; cfg["ABC"] = "";
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "defined(A)")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "defined(A)"));
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "!defined(A)")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "!defined(A)"));
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "!defined(ABC)&&!defined(DEF)")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "!defined(ABC)&&!defined(DEF)"));
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "!defined(A)&&!defined(B)")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "!defined(A)&&!defined(B)"));
} }
{ {
@ -1030,12 +1032,12 @@ private:
cfg["A"] = "1"; cfg["A"] = "1";
cfg["B"] = "2"; cfg["B"] = "2";
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A==1")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A==1"));
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A<2")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A<2"));
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A==2")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A==2"));
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A<1")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A<1"));
ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A>=1&&B<=A")); ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A>=1&&B<=A"));
ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A==1 && A==1")); ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A==1 && A==1"));
} }
} }