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

one more fix for rules

This commit is contained in:
Daniel Marjamäki 2016-07-28 15:35:41 +02:00
parent 016bcaf9fe
commit 57951a2681
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/cppcheck.cpp
View File

@ -137,16 +137,17 @@ unsigned int CppCheck::processFile(const std::string& filename, std::istream& fi
if (it->tokenlist != "define")
continue;
std::string code;
const std::list<Directive> &directives = preprocessor.getDirectives();
for (std::list<Directive>::const_iterator dir = directives.begin(); dir != directives.end(); ++dir) {
if (dir->str.compare(0,8,"#define ") != 0)
continue;
Tokenizer tokenizer2(&_settings, this);
std::istringstream istr2(std::string(std::min(1U,dir->linenr)-1U,'\n') + dir->str);
tokenizer2.list.createTokens(istr2, dir->file);
executeRules("define", tokenizer2);
if (dir->str.compare(0,8,"#define ") == 0)
code += "#line " + MathLib::toString(dir->linenr) + " \"" + dir->file + "\"\n" + dir->str + '\n';
}
Tokenizer tokenizer2(&_settings, this);
std::istringstream istr2(code);
tokenizer2.list.createTokens(istr2);
executeRules("define", tokenizer2);
break;
}
if (!_settings.force && configurations.size() > _settings.maxConfigs) {