1 files changed, 40 insertions, 15 deletions

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 08fbc8e2f..351dc1fd7 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -178,19 +178,19 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 	return is;
 }
 
-irc::tokenstream::tokenstream(std::string &source)
+irc::tokenstream::tokenstream(std::string &source) : tokens(source), last_pushed(false)
 {
-	std::string::iterator last_starting_position = source.begin();
-	bool last_pushed = false;
+	last_starting_position = tokens.begin();
+	n = tokens.begin();
 
-	for (std::string::iterator n = source.begin(); n != source.end(); n++)
+	/*for (std::string::iterator n = source.begin(); n != source.end(); n++)
 	{
 		if ((last_pushed) && (*n == ':'))
 		{
-			/* If we find a token thats not the first and starts with :,
+			 * If we find a token thats not the first and starts with :,
 			 * this is the last token on the line
-			 */
-			tokens.push_back(std::string(n+1, source.end()));
+			 *
+			tokens.push_back(new std::string(n+1, source.end()));
 			break;
 		}
 
@@ -198,26 +198,51 @@ irc::tokenstream::tokenstream(std::string &source)
 
 		if ((*n == ' ') || (n+1 == source.end()))
 		{
-			/* If we find a space, or end of string, this is the end of a token.
-			 */
-			tokens.push_back(std::string(last_starting_position, n+1 == source.end() ? n+1  : n));
+			* If we find a space, or end of string, this is the end of a token.
+			
+			tokens.push_back(new std::string(last_starting_position, n+1 == source.end() ? n+1  : n));
 			last_starting_position = n+1;
 			last_pushed = true;
 		}
-	}
+	}*/
 }
 
 irc::tokenstream::~tokenstream()
 {
 }
 
-unsigned int irc::tokenstream::GetNumTokens()
+/*unsigned int irc::tokenstream::GetNumTokens()
 {
 	return tokens.size();
-}
+}*/
 
-const std::string& irc::tokenstream::GetToken(unsigned int index)
+const std::string irc::tokenstream::GetToken()
 {
-	return tokens[index];
+	std::string::iterator lsp = last_starting_position;
+
+	while (n != tokens.end())
+	{
+		if ((last_pushed) && (*n == ':'))
+		{
+			/* If we find a token thats not the first and starts with :,
+			 * this is the last token on the line
+			 */
+			return std::string(n+1, tokens.end());
+		}
+
+		last_pushed = false;
+
+		if ((*n == ' ') || (n+1 == tokens.end()))
+		{
+			/* If we find a space, or end of string, this is the end of a token.
+			 */
+			last_starting_position = n+1;
+			last_pushed = true;
+			return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+		}
+
+		n++;
+	}
+	return "";
 }