GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Eval

Browse source 
- Cleaned up debug FILTER diagnostics.
This commit is contained in:
Paul Beckingham 2014-05-26 12:16:44 -04:00
parent 2030df8563
commit bba0b75a3b
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Eval.cpp
View file

@ -130,15 +130,15 @@ void Eval::evaluateInfixExpression (const std::string& e, Variant& v) const
// Parse for syntax checking and operator replacement. // Parse for syntax checking and operator replacement.
if (_debug) if (_debug)
context.debug ("Infix tokens " + dump (tokens)); context.debug ("FILTER Infix " + dump (tokens));
infixParse (tokens); infixParse (tokens);
if (_debug) if (_debug)
context.debug ("Parsed tokens " + dump (tokens)); context.debug ("FILTER Infix parsed " + dump (tokens));
// Convert infix --> postfix. // Convert infix --> postfix.
infixToPostfix (tokens); infixToPostfix (tokens);
if (_debug) if (_debug)
context.debug ("Postfix tokens " + dump (tokens)); context.debug ("FILTER Postfix " + dump (tokens));
// Call the postfix evaluator. // Call the postfix evaluator.
evaluatePostfixStack (tokens, v); 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)); tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
if (_debug) if (_debug)
context.debug ("Postfix tokens " + dump (tokens)); context.debug ("FILTER Postfix " + dump (tokens));
// Call the postfix evaluator. // Call the postfix evaluator.
evaluatePostfixStack (tokens, v); evaluatePostfixStack (tokens, v);
@ -176,15 +176,15 @@ void Eval::compileExpression (const std::string& e)
// Parse for syntax checking and operator replacement. // Parse for syntax checking and operator replacement.
if (_debug) if (_debug)
context.debug ("Filter infix tokens " + dump (_compiled)); context.debug ("FILTER Infix " + dump (_compiled));
infixParse (_compiled); infixParse (_compiled);
if (_debug) if (_debug)
context.debug ("Filter parsed tokens " + dump (_compiled)); context.debug ("FILTER Infix parsed " + dump (_compiled));
// Convert infix --> postfix. // Convert infix --> postfix.
infixToPostfix (_compiled); infixToPostfix (_compiled);
if (_debug) 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); output += c.colorize (i->first);
} }
return output + "\n"; return output;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

1
src/Filter.cpp
View file

@ -24,7 +24,6 @@
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <iostream> // TODO Remove
#include <cmake.h> #include <cmake.h>
#include <Context.h> #include <Context.h>
#include <Eval.h> #include <Eval.h>