auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index f5cc5efe05c71e3e154ba31eb8897af60c7d4e19..aa53da9649f8ce74de265b05cd1fa09fe67d8a1e 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -206,10 +206,6 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
 {
-       /* Remove trailing spaces, these muck up token parsing */
-       while (tokens.find_last_of(' ') == tokens.length() - 1)
-               tokens.erase(tokens.end() - 1);
-
        /* Record starting position and current position */
        last_starting_position = tokens.begin();
        n = tokens.begin();
@@ -243,7 +239,12 @@ const std::string irc::tokenstream::GetToken()
                         */
                        last_starting_position = n+1;
                        last_pushed = true;
-                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+
+                       std::string strip(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))
+                               strip.erase(strip.end() - 1);
+
+                       return strip;
                }
 
                n++;