avoid some unnecessary copies

Author: firewave

simplecpp.cpp

@@ -1680,8 +1680,8 @@ namespace simplecpp {
         };
     private:
         /** Create new token where Token::macro is set for replaced tokens */
-        Token *newMacroToken(const TokenString &str, const Location &loc, bool replaced, const Token *expandedFromToken=nullptr) const {
-            Token *tok = new Token(str,loc);
+        Token *newMacroToken(TokenString str, const Location &loc, bool replaced, const Token *expandedFromToken=nullptr) const {
+            Token *tok = new Token(std::move(str),loc);
             if (replaced)
                 tok->macro = nameTokDef->str();
             if (expandedFromToken)
@@ -2300,7 +2300,7 @@ namespace simplecpp {
                     output->takeTokens(tokensB);
                 } else if (sameline(B, nextTok) && sameline(B, nextTok->next) && nextTok->op == '#' && nextTok->next->op == '#') {
                     TokenList output2(files);
-                    output2.push_back(new Token(strAB, tok->location));
+                    output2.push_back(new Token(std::move(strAB), tok->location));
                     nextTok = expandHashHash(&output2, loc, nextTok, macros, expandedmacros, parametertokens);
                     output->deleteToken(A);
                     output->takeTokens(output2);
@@ -3455,7 +3455,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         hdr += tok->str();
                     }
                     inc2.clear();
-                    inc2.push_back(new Token(hdr, inc1.cfront()->location));
+                    inc2.push_back(new Token(std::move(hdr), inc1.cfront()->location));
                     inc2.front()->op = '<';
                 }
 
@@ -3615,7 +3615,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 E += (E.empty() ? "" : " ") + tok->str();
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
-                            ifCond->push_back(IfCond(rawtok->location, E, result));
+                            ifCond->push_back(IfCond(rawtok->location, std::move(E), result));
                         } else {
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
@@ -3711,7 +3711,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             else if (output.back())
                 output.back()->setstr(output.cback()->str() + s);
             else
-                output.push_back(new Token(s, loc));
+                output.push_back(new Token(std::move(s), loc));
         } else {
             output.takeTokens(tokens);
         }

test.cpp

@@ -3083,11 +3083,11 @@ static void stdValid()
     outputList.clear();
 }
 
-static void assertToken(const std::string& s, bool name, bool number, bool comment, char op, int line)
+static void assertToken(std::string s, bool name, bool number, bool comment, char op, int line)
 {
     const std::vector<std::string> f;
     const simplecpp::Location l(f);
-    const simplecpp::Token t(s, l);
+    const simplecpp::Token t(std::move(s), l);
     assertEquals(name, t.name, line);
     assertEquals(number, t.number, line);
     assertEquals(comment, t.comment, line);