enable: break out 'performance' and 'portability' from the 'style' id. Ticket: danmar#3074

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit d23c58d387ee · 2011-09-03T15:30:30.000+02:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -664,6 +664,10 @@ void CmdLineParser::PrintHelp()
               "                                  Enable all checks\n"
               "                          * style\n"
               "                                  Check coding style\n"
+              "                          * performance\n"
+              "                                  Check for performance problems\n"
+              "                          * portability\n"
+              "                                  Check for portability problems\n"
               "                          * information\n"
               "                                  Enable information messages\n"
               "                          * unusedFunction\n"
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -46,7 +46,7 @@ static bool isint(const Variable *var)
 
 void Check64BitPortability::pointerassignment()
 {
-    if (!_settings->isEnabled("style"))
+    if (!_settings->isEnabled("portability"))
         return;
 
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -1057,7 +1057,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
         if (varid && Token::Match(tok, "= %varid% + %num% ;", varid))
         {
             const MathLib::bigint index = MathLib::toLongNumber(tok->strAt(3));
-            if (index > size && _settings->isEnabled("style"))
+            if (index > size && _settings->isEnabled("portability"))
                 pointerOutOfBoundsError(tok->next(), "buffer");
             if (index >= size && Token::Match(tok->tokAt(-2), "[;{}] %varid% =", varid))
                 pointerIsOutOfBounds = true;
@@ -1276,7 +1276,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo
         }
 
         // undefined behaviour: result of pointer arithmetic is out of bounds
-        if (_settings->isEnabled("style") && Token::Match(tok, "= %varid% + %num% ;", arrayInfo.varid()))
+        if (_settings->isEnabled("portability") && Token::Match(tok, "= %varid% + %num% ;", arrayInfo.varid()))
         {
             const MathLib::bigint index = MathLib::toLongNumber(tok->strAt(3));
             if (index < 0 || index > arrayInfo.num(0))
diff --git a/lib/checknonreentrantfunctions.cpp b/lib/checknonreentrantfunctions.cpp
@@ -33,7 +33,7 @@ CheckNonReentrantFunctions instance;
 
 void CheckNonReentrantFunctions::nonReentrantFunctions()
 {
-    if (!_settings->posix || !_settings->isEnabled("style"))
+    if (!_settings->posix || !_settings->isEnabled("portability"))
         return;
 
     // Don't check C# and Java code
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1576,7 +1576,7 @@ void CheckOther::variableScopeError(const Token *tok, const std::string &varname
 //---------------------------------------------------------------------------
 void CheckOther::checkConstantFunctionParameter()
 {
-    if (!_settings->isEnabled("style"))
+    if (!_settings->isEnabled("performance"))
         return;
 
     const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();
@@ -2368,7 +2368,7 @@ void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2,
 //---------------------------------------------------------------------------
 void CheckOther::checkAlwaysTrueOrFalseStringCompare()
 {
-    if (!_settings->isEnabled("style"))
+    if (!_settings->isEnabled("style") && !_settings->isEnabled("performance"))
         return;
 
     const char pattern1[] = "strcmp|stricmp|strcmpi|strcasecmp|wcscmp ( %str% , %str% )";
@@ -2403,7 +2403,7 @@ void CheckOther::alwaysTrueFalseStringCompareError(const Token *tok, const std::
                     "If the purpose is to compare these two strings, the comparison is unnecessary. "
                     "If the strings are supposed to be different, then there is a bug somewhere.");
     }
-    else
+    else if (_settings->isEnabled("performance"))
     {
         reportError(tok, Severity::performance, "staticStringCompare",
                     "Unnecessary comparison of static strings.\n"
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
@@ -35,7 +35,7 @@ CheckPostfixOperator instance;
 
 void CheckPostfixOperator::postfixOperator()
 {
-    if (!_settings->isEnabled("style"))
+    if (!_settings->isEnabled("performance"))
         return;
 
     const Token *tok = _tokenizer->tokens();
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -848,7 +848,7 @@ bool CheckStl::isStlContainer(unsigned int varid)
 
 void CheckStl::size()
 {
-    if (!_settings->isEnabled("style"))
+    if (!_settings->isEnabled("performance"))
         return;
 
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -78,9 +78,11 @@ std::string Settings::addEnabled(const std::string &str)
 
     std::set<std::string> id;
     id.insert("style");
+    id.insert("performance");
+    id.insert("portability");
+    id.insert("information");
     id.insert("missingInclude");
     id.insert("unusedFunction");
-    id.insert("information");
 
     if (str == "all")
     {
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -10179,7 +10179,8 @@ void Tokenizer::removeUnnecessaryQualification()
                         continue;
                 }
 
-                unnecessaryQualificationError(tok, qualification);
+                if (_settings && _settings->isEnabled("portability"))
+                    unnecessaryQualificationError(tok, qualification);
 
                 tok->deleteThis();
                 tok->deleteThis();
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -47,7 +47,7 @@ class Test64BitPortability : public TestFixture
         errout.str("");
 
         Settings settings;
-        settings.addEnabled("style");
+        settings.addEnabled("portability");
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -45,6 +45,7 @@ class TestBufferOverrun : public TestFixture
         settings.inconclusive = true;
         settings.experimental = experimental;
         settings.addEnabled("style");
+        settings.addEnabled("portability");
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
diff --git a/test/testnonreentrantfunctions.cpp b/test/testnonreentrantfunctions.cpp
@@ -45,7 +45,7 @@ class TestNonReentrantFunctions : public TestFixture
 
         Settings settings;
         settings.posix = true;
-        settings.addEnabled("style");
+        settings.addEnabled("portability");
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -213,6 +213,7 @@ class TestOther : public TestFixture
 
         Settings settings;
         settings.addEnabled("style");
+        settings.addEnabled("performance");
         settings.experimental = true;
 
         // Preprocess file..
@@ -840,7 +841,7 @@ class TestOther : public TestFixture
         errout.str("");
 
         Settings settings;
-        settings.addEnabled("style");
+        settings.addEnabled("performance");
 
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
@@ -41,8 +41,8 @@ class TestPostfixOperator : public TestFixture
         errout.str("");
 
         Settings settings;
-        settings.addEnabled("style");
-        settings.inconclusive = true;
+        settings.addEnabled("performance");
+        //settings.inconclusive = true;
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -383,6 +383,7 @@ class TestSimplifyTokens : public TestFixture
         errout.str("");
 
         Settings settings;
+        settings.addEnabled("portability");
         Tokenizer tokenizer(&settings, this);
 
         std::istringstream istr(code);
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -120,6 +120,7 @@ class TestStl : public TestFixture
 
         Settings settings;
         settings.addEnabled("style");
+        settings.addEnabled("performance");
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static bool isint(const Variable *var)`
`46`	`46`
`47`	`47`	`void Check64BitPortability::pointerassignment()`
`48`	`48`	`{`
`49`		`- if (!_settings->isEnabled("style"))`
	`49`	`+ if (!_settings->isEnabled("portability"))`
`50`	`50`	`return;`
`51`	`51`
`52`	`52`	`for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())`
Original file line number	Diff line number	Diff line change
`@@ -1057,7 +1057,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str`
`1057`	`1057`	`if (varid && Token::Match(tok, "= %varid% + %num% ;", varid))`
`1058`	`1058`	`{`
`1059`	`1059`	`const MathLib::bigint index = MathLib::toLongNumber(tok->strAt(3));`
`1060`		`- if (index > size && _settings->isEnabled("style"))`
	`1060`	`+ if (index > size && _settings->isEnabled("portability"))`
`1061`	`1061`	`pointerOutOfBoundsError(tok->next(), "buffer");`
`1062`	`1062`	`if (index >= size && Token::Match(tok->tokAt(-2), "[;{}] %varid% =", varid))`
`1063`	`1063`	`pointerIsOutOfBounds = true;`
`@@ -1276,7 +1276,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo`
`1276`	`1276`	`}`
`1277`	`1277`
`1278`	`1278`	`// undefined behaviour: result of pointer arithmetic is out of bounds`
`1279`		`- if (_settings->isEnabled("style") && Token::Match(tok, "= %varid% + %num% ;", arrayInfo.varid()))`
	`1279`	`+ if (_settings->isEnabled("portability") && Token::Match(tok, "= %varid% + %num% ;", arrayInfo.varid()))`
`1280`	`1280`	`{`
`1281`	`1281`	`const MathLib::bigint index = MathLib::toLongNumber(tok->strAt(3));`
`1282`	`1282`	`if (index < 0 \|\| index > arrayInfo.num(0))`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ CheckNonReentrantFunctions instance;`
`33`	`33`
`34`	`34`	`void CheckNonReentrantFunctions::nonReentrantFunctions()`
`35`	`35`	`{`
`36`		`- if (!_settings->posix \|\| !_settings->isEnabled("style"))`
	`36`	`+ if (!_settings->posix \|\| !_settings->isEnabled("portability"))`
`37`	`37`	`return;`
`38`	`38`
`39`	`39`	`// Don't check C# and Java code`
Original file line number	Diff line number	Diff line change
`@@ -1576,7 +1576,7 @@ void CheckOther::variableScopeError(const Token *tok, const std::string &varname`
`1576`	`1576`	`//---------------------------------------------------------------------------`
`1577`	`1577`	`void CheckOther::checkConstantFunctionParameter()`
`1578`	`1578`	`{`
`1579`		`- if (!_settings->isEnabled("style"))`
	`1579`	`+ if (!_settings->isEnabled("performance"))`
`1580`	`1580`	`return;`
`1581`	`1581`
`1582`	`1582`	`const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();`
`@@ -2368,7 +2368,7 @@ void CheckOther::duplicateExpressionError(const Token tok1, const Token tok2,`
`2368`	`2368`	`//---------------------------------------------------------------------------`
`2369`	`2369`	`void CheckOther::checkAlwaysTrueOrFalseStringCompare()`
`2370`	`2370`	`{`
`2371`		`- if (!_settings->isEnabled("style"))`
	`2371`	`+ if (!_settings->isEnabled("style") && !_settings->isEnabled("performance"))`
`2372`	`2372`	`return;`
`2373`	`2373`
`2374`	`2374`	`const char pattern1[] = "strcmp\|stricmp\|strcmpi\|strcasecmp\|wcscmp ( %str% , %str% )";`
`@@ -2403,7 +2403,7 @@ void CheckOther::alwaysTrueFalseStringCompareError(const Token *tok, const std::`
`2403`	`2403`	`"If the purpose is to compare these two strings, the comparison is unnecessary. "`
`2404`	`2404`	`"If the strings are supposed to be different, then there is a bug somewhere.");`
`2405`	`2405`	`}`
`2406`		`- else`
	`2406`	`+ else if (_settings->isEnabled("performance"))`
`2407`	`2407`	`{`
`2408`	`2408`	`reportError(tok, Severity::performance, "staticStringCompare",`
`2409`	`2409`	`"Unnecessary comparison of static strings.\n"`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ CheckPostfixOperator instance;`
`35`	`35`
`36`	`36`	`void CheckPostfixOperator::postfixOperator()`
`37`	`37`	`{`
`38`		`- if (!_settings->isEnabled("style"))`
	`38`	`+ if (!_settings->isEnabled("performance"))`
`39`	`39`	`return;`
`40`	`40`
`41`	`41`	`const Token *tok = _tokenizer->tokens();`
Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ bool CheckStl::isStlContainer(unsigned int varid)`
`848`	`848`
`849`	`849`	`void CheckStl::size()`
`850`	`850`	`{`
`851`		`- if (!_settings->isEnabled("style"))`
	`851`	`+ if (!_settings->isEnabled("performance"))`
`852`	`852`	`return;`
`853`	`853`
`854`	`854`	`for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())`
Original file line number	Diff line number	Diff line change
`@@ -10179,7 +10179,8 @@ void Tokenizer::removeUnnecessaryQualification()`
`10179`	`10179`	`continue;`
`10180`	`10180`	`}`
`10181`	`10181`
`10182`		`- unnecessaryQualificationError(tok, qualification);`
	`10182`	`+ if (_settings && _settings->isEnabled("portability"))`
	`10183`	`+ unnecessaryQualificationError(tok, qualification);`
`10183`	`10184`
`10184`	`10185`	`tok->deleteThis();`
`10185`	`10186`	`tok->deleteThis();`