From 803ef4fee2c1c7b6f8391615a77301c3ffd99503 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Sep 2014 01:20:14 -0400
Subject: [PATCH] CmdCustom

- Report filters are now properly lexed, which includes the new typeTag.
---
 src/commands/CmdCustom.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 6124ea8bf..f39cf307f 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -95,8 +95,14 @@ int CmdCustom::execute (std::string& output)
 */
 
   // Prepend the argument list with those from the report filter.
+  std::string lexeme;
+  Lexer::Type type;
+  Lexer lex (reportFilter);
+  lex.ambiguity (false);
   std::vector <std::string> filterArgs;
-  Lexer::word_split (filterArgs, reportFilter);
+  while (lex.token (lexeme, type))
+    filterArgs.push_back (lexeme);
+
   std::vector <std::string>::reverse_iterator arg;
   for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg)
     context.parser.captureFirst (*arg);