More GUI parser advancements.

libs/parser/CodeTokeniser.h

@@ -688,11 +688,6 @@ class CodeTokeniser :
 					_tokenBuffer.pop_front();
 					_tokenBuffer.insert(_tokenBuffer.begin(), expanded.begin(), expanded.end());
 				}
-				else
-				{
-					rWarning() << "Macro expansion yields empty token list: " << _tokenBuffer.front() <<
-						" in " << (*_curNode)->archive->getName()  << std::endl;
-				}
 			}
 
 			return; // got a token

plugins/dm.gui/gui/GuiExpression.cpp

@@ -391,6 +391,11 @@ class GuiExpressionTokeniser :
 		// No items in the buffer, take a peek in the underlying stream
 		std::string rawToken = _tokeniser.peek();
 
+		if (rawToken.empty())
+		{
+			return rawToken; // don't tokenise empty strings, just return it as it is
+		}
+
 		// Split up the token by using a sub-tokeniser, keeping all delimiters
 		parser::BasicDefTokeniser<std::string> subtokeniser(rawToken, "", _delims);
 
@@ -605,6 +610,11 @@ class GuiExpressionParser
 	// Helper routines
 	BinaryExpressionPtr getOperator()
 	{
+		if (!_tokeniser.hasMoreTokens())
+		{
+			return BinaryExpressionPtr();
+		}
+
 		std::string token = _tokeniser.peek();
 
 		if (token == "+")

plugins/dm.gui/gui/GuiWindowDef.cpp

@@ -169,7 +169,7 @@ void GuiWindowDef::constructFromTokens(parser::DefTokeniser& tokeniser)
 	// The windowDef keyword has already been parsed, so expect a name plus an opening brace here
 	name = tokeniser.nextToken();
 
-	if (name == "MainMenuModeSelect")
+	if (name == "NewGameRefreshAction")
 	{
 		int i = 6;
 	}