From bba0b75a3bfc9844f025fe49c65ad0212031a6ab Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 26 May 2014 12:16:44 -0400
Subject: [PATCH] Eval

- Cleaned up debug FILTER diagnostics.
---
 src/Eval.cpp   | 16 ++++++++--------
 src/Filter.cpp |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Eval.cpp b/src/Eval.cpp
index 5c55b2327..efabfa601 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -130,15 +130,15 @@ void Eval::evaluateInfixExpression (const std::string& e, Variant& v) const
 
   // Parse for syntax checking and operator replacement.
   if (_debug)
-    context.debug ("Infix tokens " + dump (tokens));
+    context.debug ("FILTER Infix        " + dump (tokens));
   infixParse (tokens);
   if (_debug)
-    context.debug ("Parsed tokens " + dump (tokens));
+    context.debug ("FILTER Infix parsed " + dump (tokens));
 
   // Convert infix --> postfix.
   infixToPostfix (tokens);
   if (_debug)
-    context.debug ("Postfix tokens " + dump (tokens));
+    context.debug ("FILTER Postfix      " + dump (tokens));
 
   // Call the postfix evaluator.
   evaluatePostfixStack (tokens, v);
@@ -157,7 +157,7 @@ void Eval::evaluatePostfixExpression (const std::string& e, Variant& v) const
     tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
 
   if (_debug)
-    context.debug ("Postfix tokens       " + dump (tokens));
+    context.debug ("FILTER Postfix      " + dump (tokens));
 
   // Call the postfix evaluator.
   evaluatePostfixStack (tokens, v);
@@ -176,15 +176,15 @@ void Eval::compileExpression (const std::string& e)
 
   // Parse for syntax checking and operator replacement.
   if (_debug)
-    context.debug ("Filter infix tokens  " + dump (_compiled));
+    context.debug ("FILTER Infix        " + dump (_compiled));
   infixParse (_compiled);
   if (_debug)
-    context.debug ("Filter parsed tokens " + dump (_compiled));
+    context.debug ("FILTER Infix parsed " + dump (_compiled));
 
   // Convert infix --> postfix.
   infixToPostfix (_compiled);
   if (_debug)
-    context.debug ("Postfix tokens       " + dump (_compiled));
+    context.debug ("FILTER Postfix      " + dump (_compiled));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -840,7 +840,7 @@ std::string Eval::dump (
     output += c.colorize (i->first);
   }
 
-  return output + "\n";
+  return output;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Filter.cpp b/src/Filter.cpp
index ab11bb8a5..edf621d9c 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -24,7 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iostream> // TODO Remove
 #include <cmake.h>
 #include <Context.h>
 #include <Eval.h>