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

Optimization preprocessor.cpp use string::compare for charT

This commit is contained in:
Frank Zingsheim 2014-03-09 14:26:16 +01:00 committed by Daniel Marjamäki
parent 6e9e20d5b1
commit bc1ab4c48a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/preprocessor.cpp
View File

@ -529,7 +529,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
} }
// Remove comments.. // Remove comments..
if (str.compare(i, 2, "//", 0, 2) == 0) { if (str.compare(i, 2, "//") == 0) {
std::size_t commentStart = i + 2; std::size_t commentStart = i + 2;
i = str.find('\n', i); i = str.find('\n', i);
if (i == std::string::npos) if (i == std::string::npos)
@ -554,7 +554,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
code << "\n"; code << "\n";
previous = '\n'; previous = '\n';
++lineno; ++lineno;
} else if (str.compare(i, 2, "/*", 0, 2) == 0) { } else if (str.compare(i, 2, "/*") == 0) {
std::size_t commentStart = i + 2; std::size_t commentStart = i + 2;
unsigned char chPrev = 0; unsigned char chPrev = 0;
++i; ++i;
@ -583,7 +583,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
suppressionIDs.push_back(word); suppressionIDs.push_back(word);
} }
} }
} else if ((i==0 || std::isspace(str[i-1])) && str.compare(i,5,"__asm",0,5) == 0) { } else if ((i==0 || std::isspace(str[i-1])) && str.compare(i,5,"__asm") == 0) {
while (i < str.size() && (std::isalpha(str[i]) || str[i]=='_')) while (i < str.size() && (std::isalpha(str[i]) || str[i]=='_'))
code << str[i++]; code << str[i++];
while (i < str.size() && std::isspace(str[i])) while (i < str.size() && std::isspace(str[i]))
@ -1340,12 +1340,12 @@ std::list<std::string> Preprocessor::getcfgs(const std::string &filedata, const
} }
// == // ==
if (def.compare(pos,2,"==",0,2)==0) if (def.compare(pos,2,"==")==0)
pos += 2; pos += 2;
// %num% // %num%
if (pos<def.size() && std::isdigit(def[pos])) { if (pos<def.size() && std::isdigit(def[pos])) {
if (def.compare(pos,2,"0x",0,2)==0) { if (def.compare(pos,2,"0x")==0) {
pos += 2; pos += 2;
if (pos >= def.size()) if (pos >= def.size())
pos = 0; pos = 0;