From 98e8e69c8e558eeef9a474f0d561faa0da797896 Mon Sep 17 00:00:00 2001
From: Slava Semushin <php-coder@altlinux.ru>
Date: Sun, 2 Aug 2009 15:54:46 +0700
Subject: [PATCH] src/tokenize.cpp: don't call std::string.c_str() for
 Token::str() argument.

In 4286fdbabb64014fd6ef968e163257a977400d3e commit I introduce
Token::str() method with std::string argument and now we may get rid
of useless std::string.c_str() calls.

No functional change.
---
 src/tokenize.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/tokenize.cpp b/src/tokenize.cpp
index ce2b35bd2..60b7e2bf5 100644
--- a/src/tokenize.cpp
+++ b/src/tokenize.cpp
@@ -356,13 +356,13 @@ bool Tokenizer::tokenize(std::istream &code, const char FileName[])
     {
         if (Token::Match(tok, "[(+-*/=,] - %num%") && tok->strAt(2)[0] != '-')
         {
-            tok->next()->str((std::string("-") + tok->strAt(2)).c_str());
+            tok->next()->str(std::string("-") + tok->strAt(2));
             tok->next()->deleteNext();
         }
 
         if (Token::Match(tok, "return - %num%") && tok->strAt(2)[0] != '-')
         {
-            tok->next()->str((std::string("-") + tok->strAt(2)).c_str());
+            tok->next()->str(std::string("-") + tok->strAt(2));
             tok->next()->deleteNext();
         }
     }
@@ -714,7 +714,7 @@ void Tokenizer::simplifyTemplates()
             {
                 if (Token::simpleMatch(tok4, s.c_str()))
                 {
-                    tok4->str(name2.c_str());
+                    tok4->str(name2);
                     while (tok4->next()->str() != ">")
                         tok4->deleteNext();
                     tok4->deleteNext();
@@ -1080,7 +1080,7 @@ void Tokenizer::simplifyTokenList()
         while (tok->str() == "L" && tok->next() && tok->next()->str()[0] == '"')
         {
             // Combine 'L "string"'
-            tok->str(tok->next()->str().c_str());
+            tok->str(tok->next()->str());
             tok->deleteNext();
         }
     }
@@ -2766,7 +2766,7 @@ bool Tokenizer::simplifyKnownVariables()
                     if (Token::Match(tok3, "(|!|==|!=|<|<=|>|>= %varid% )|==|!=|<|<=|>|>=", varid))
                     {
                         tok3 = tok3->next();
-                        tok3->str(value.c_str());
+                        tok3->str(value);
                         ret = true;
                     }
 
@@ -2774,7 +2774,7 @@ bool Tokenizer::simplifyKnownVariables()
                     if (Token::Match(tok3, "[=+-*/[] %varid% [+-*/;]]", varid))
                     {
                         tok3 = tok3->next();
-                        tok3->str(value.c_str());
+                        tok3->str(value);
                         ret = true;
                     }
 
@@ -2789,18 +2789,18 @@ bool Tokenizer::simplifyKnownVariables()
                         else
                         {
                             tok3 = tok3->next();
-                            tok3->str(value.c_str());
+                            tok3->str(value);
                             tok3->deleteNext();
                         }
                         incdec(value, op);
-                        tok2->tokAt(2)->str(value.c_str());
+                        tok2->tokAt(2)->str(value);
                         ret = true;
                     }
 
                     if (Token::Match(tok3->next(), "++|-- %varid%", varid))
                     {
                         incdec(value, tok3->strAt(1));
-                        tok2->tokAt(2)->str(value.c_str());
+                        tok2->tokAt(2)->str(value);
                         if (Token::Match(tok3, "[;{}] %any% %any% ;"))
                         {
                             tok3->deleteNext();
@@ -2809,7 +2809,7 @@ bool Tokenizer::simplifyKnownVariables()
                         else
                         {
                             tok3->deleteNext();
-                            tok3->next()->str(value.c_str());
+                            tok3->next()->str(value);
                         }
                         tok3 = tok3->next();
                         ret = true;
@@ -2949,16 +2949,16 @@ bool Tokenizer::simplifyCalculations()
             switch (*(tok->strAt(1)))
             {
             case '+':
-                tok->str(MathLib::add(tok->str(), tok->strAt(2)).c_str());
+                tok->str(MathLib::add(tok->str(), tok->strAt(2)));
                 break;
             case '-':
-                tok->str(MathLib::subtract(tok->str(), tok->strAt(2)).c_str());
+                tok->str(MathLib::subtract(tok->str(), tok->strAt(2)));
                 break;
             case '*':
-                tok->str(MathLib::multiply(tok->str(), tok->strAt(2)).c_str());
+                tok->str(MathLib::multiply(tok->str(), tok->strAt(2)));
                 break;
             case '/':
-                tok->str(MathLib::divide(tok->str(), tok->strAt(2)).c_str());
+                tok->str(MathLib::divide(tok->str(), tok->strAt(2)));
                 break;
             }