attempt to mitigate performance regression

Author: firewave

simplecpp.cpp

@@ -730,8 +730,9 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     ch = stream.readChar();
                 }
                 stream.ungetChar();
-                push_back(new Token(currentToken, location));
+                const Location l = location;
                 location.adjust(currentToken);
+                push_back(new Token(std::move(currentToken), l));
                 continue;
             }
         }
@@ -878,21 +879,26 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 newlines++;
             }
 
-            if (prefix.empty())
-                push_back(new Token(s, location, !!std::isspace(stream.peekChar()))); // push string without newlines
-            else
-                back()->setstr(prefix + s);
+            const Location l = location;
 
+            bool adjust = true;
             if (newlines > 0) {
                 const Token * const llTok = lastLineTok();
                 if (llTok && llTok->op == '#' && llTok->next && (llTok->next->str() == "define" || llTok->next->str() == "pragma") && llTok->next->next) {
                     multiline += newlines;
                     location.adjust(s);
-                    continue;
+                    adjust = false;
                 }
             }
 
-            location.adjust(currentToken);
+            if (adjust)
+                location.adjust(currentToken);
+
+            if (prefix.empty())
+                push_back(new Token(std::move(s), l, !!std::isspace(stream.peekChar()))); // push string without newlines
+            else
+                back()->setstr(prefix + s);
+
             continue;
         }
 
@@ -909,12 +915,12 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
         }
 
-        push_back(new Token(currentToken, location, !!std::isspace(stream.peekChar())));
-
+        const Location l = location;
         if (multiline)
             location.col += currentToken.size();
         else
             location.adjust(currentToken);
+        push_back(new Token(std::move(currentToken), l, !!std::isspace(stream.peekChar())));
     }
 
     combineOperators();