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

Get rid of "magic" patterns set 

* magic should match "knownPatterns" but it didn't
* two identical sets are of no use
This commit is contained in:
Dmitry-Me 2016-07-26 16:42:17 +03:00
parent 71f62950ed
commit 560e7d618d
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/checkinternal.cpp
View File

@ -153,7 +153,7 @@ void CheckInternal::checkTokenSimpleMatchPatterns()
}
namespace {
const std::set<std::string> magics = make_container< std::set<std::string> > ()
const std::set<std::string> knownPatterns = make_container< std::set<std::string> > ()
<< "%any%"
<< "%assign%"
<< "%bool%"
@ -167,6 +167,7 @@ namespace {
<< "%str%"
<< "%type%"
<< "%name%"
<< "%var%"
<< "%varid%";
}
@ -188,17 +189,17 @@ void CheckInternal::checkMissingPercentCharacter()
const std::string pattern = patternTok->strValue();
std::set<std::string>::const_iterator magic, magics_end = magics.end();
for (magic = magics.begin(); magic != magics_end; ++magic) {
const std::string broken_magic = (*magic).substr(0, (*magic).size() - 1);
std::set<std::string>::const_iterator knownPattern, knownPatternsEnd = knownPatterns.end();
for (knownPattern = knownPatterns.begin(); knownPattern != knownPatternsEnd; ++knownPattern) {
const std::string brokenPattern = (*knownPattern).substr(0, (*knownPattern).size() - 1);
std::string::size_type pos = 0;
while ((pos = pattern.find(broken_magic, pos)) != std::string::npos) {
while ((pos = pattern.find(brokenPattern, pos)) != std::string::npos) {
// Check if it's the full pattern
if (pattern.find(*magic, pos) != pos) {
if (pattern.find(*knownPattern, pos) != pos) {
// Known whitelist of substrings
if ((broken_magic == "%var" && pattern.find("%varid%", pos) == pos) ||
(broken_magic == "%or" && pattern.find("%oror%", pos) == pos)) {
if ((brokenPattern == "%var" && pattern.find("%varid%", pos) == pos) ||
(brokenPattern == "%or" && pattern.find("%oror%", pos) == pos)) {
++pos;
continue;
}
@ -213,25 +214,6 @@ void CheckInternal::checkMissingPercentCharacter()
}
}
namespace {
const std::set<std::string> knownPatterns = make_container< std::set<std::string> > ()
<< "%any%"
<< "%assign%"
<< "%bool%"
<< "%char%"
<< "%comp%"
<< "%name%"
<< "%num%"
<< "%op%"
<< "%cop%"
<< "%or%"
<< "%oror%"
<< "%str%"
<< "%type%"
<< "%var%"
<< "%varid%";
}
void CheckInternal::checkUnknownPattern()
{
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();