From 334eaa35ef135ddb6f84ebe6b0ac22e749237a57 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 22 Nov 2009 01:14:29 +0600 Subject: [PATCH] lib/preprocessor.cpp: clean up code. Improvements for: 092f64b77a554848db35b263bfd252f266db80f3 No functional change. --- lib/preprocessor.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp index 6b0ff26cc..9d102bd44 100644 --- a/lib/preprocessor.cpp +++ b/lib/preprocessor.cpp @@ -837,11 +837,11 @@ std::list Preprocessor::getcfgs(const std::string &filedata, const std::map varmap; for (std::set::const_iterator it = defines.begin(); it != defines.end(); ++it) { - std::string::size_type pos = (*it).find("="); + std::string::size_type pos = it->find("="); if (pos == std::string::npos) continue; - const std::string varname((*it).substr(0, pos)); - const std::string value((*it).substr(pos + 1)); + const std::string varname(it->substr(0, pos)); + const std::string value(it->substr(pos + 1)); varmap[varname] = value; } @@ -1034,9 +1034,9 @@ void Preprocessor::simplifyCondition(const std::map &v if (!tokenizer.tokens()->tokAt(3) && Token::Match(tokenizer.tokens(), "%num% ==|!=|<=|>=|<|> %num%")) { - const std::string op1(tokenizer.tokens()->str()); - const std::string cmp(tokenizer.tokens()->strAt(1)); - const std::string op2(tokenizer.tokens()->strAt(2)); + const std::string &op1(tokenizer.tokens()->str()); + const std::string &cmp(tokenizer.tokens()->tokAt(1)->str()); + const std::string &op2(tokenizer.tokens()->tokAt(2)->str()); if (cmp == "==") condition = (op1 == op2) ? "1" : "0"; else if (cmp == "!=") @@ -1049,7 +1049,6 @@ void Preprocessor::simplifyCondition(const std::map &v condition = (op1 < op2) ? "1" : "0"; else if (cmp == ">") condition = (op1 > op2) ? "1" : "0"; - return; } }