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

Merge pull request #740 from Dmitry-Me/donClearEmptyStrings 

No need to clear empty strings
This commit is contained in:
PKEuS 2015-12-24 09:37:20 +01:00
parent 81f0597316 bd45c71d8d
commit ae740e28fd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tokenlist.cpp
View File

@ -236,8 +236,8 @@ bool TokenList::createTokens(std::istream &code, const std::string& file0)
if (!CurrentToken.empty()) { if (!CurrentToken.empty()) {
addtoken(CurrentToken, lineno, FileIndex, true); addtoken(CurrentToken, lineno, FileIndex, true);
_back->isExpandedMacro(expandedMacro); _back->isExpandedMacro(expandedMacro);
CurrentToken.clear();
} }
CurrentToken.clear();
expandedMacro = true; expandedMacro = true;
continue; continue;
} }
@ -352,10 +352,9 @@ bool TokenList::createTokens(std::istream &code, const std::string& file0)
if (!CurrentToken.empty()) { if (!CurrentToken.empty()) {
_back->isExpandedMacro(expandedMacro); _back->isExpandedMacro(expandedMacro);
expandedMacro = false; expandedMacro = false;
CurrentToken.clear();
} }
CurrentToken.clear();
if (ch == '\n') { if (ch == '\n') {
if (_settings->terminated()) if (_settings->terminated())
return false; return false;