From a97ce45cdf8a5105bb132cd1874268df83e550e6 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 May 2014 10:15:10 -0400
Subject: [PATCH] Eval

- Debug mode can now be disabled.
---
 src/Eval.cpp   |  4 ++--
 src/Eval.h     |  2 +-
 src/Filter.cpp | 16 ++++++++++------
 src/calc.cpp   |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Eval.cpp b/src/Eval.cpp
index 88fbd237a..9fd53d1aa 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -201,9 +201,9 @@ void Eval::ambiguity (bool value)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Eval::debug ()
+void Eval::debug (bool value)
 {
-  _debug = true;
+  _debug = value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Eval.h b/src/Eval.h
index dbbb02c0e..79350caed 100644
--- a/src/Eval.h
+++ b/src/Eval.h
@@ -47,7 +47,7 @@ public:
   void compileExpression (const std::string&);
   void evaluateCompiledExpression (Variant&);
   void ambiguity (bool);
-  void debug ();
+  void debug (bool);
 
   static void getOperators (std::vector <std::string>&);
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 1b7a2140f..e85fc21d4 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -92,10 +92,12 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
     Eval eval;
     eval.addSource (namedDates);
     eval.addSource (domSource);
-    eval.compileExpression (filterExpr);
 
-    if (context.config.getBoolean ("debug"))
-      eval.debug ();
+    // Debug output from Eval during compilation is useful.  During evaluation
+    // it is mostly noise.
+    eval.debug (context.config.getBoolean ("debug"));
+    eval.compileExpression (filterExpr);
+    eval.debug (false);
 
     std::vector <Task>::const_iterator task;
     for (task = input.begin (); task != input.end (); ++task)
@@ -147,10 +149,12 @@ void Filter::subset (std::vector <Task>& output)
     Eval eval;
     eval.addSource (namedDates);
     eval.addSource (domSource);
-    eval.compileExpression (filterExpr);
 
-    if (context.config.getBoolean ("debug"))
-      eval.debug ();
+    // Debug output from Eval during compilation is useful.  During evaluation
+    // it is mostly noise.
+    eval.debug (context.config.getBoolean ("debug"));
+    eval.compileExpression (filterExpr);
+    eval.debug (false);
 
     output.clear ();
     std::vector <Task>::const_iterator task;
diff --git a/src/calc.cpp b/src/calc.cpp
index dfdb36181..d5732b330 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -120,7 +120,7 @@ int main (int argc, char** argv)
         exit (1);
       }
       else if (!strcmp (argv[i], "-d") || !strcmp (argv[i], "--debug"))
-        e.debug ();
+        e.debug (true);
       else if (!strcmp (argv[i], "-i") || !strcmp (argv[i], "--infix"))
         infix = true;
       else if (!strcmp (argv[i], "-p") || !strcmp (argv[i], "--postfix"))