gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Filter

Browse Source 
- Removed all Parser references.
This commit is contained in:
Paul Beckingham
2014-10-31 22:53:00 -04:00
parent d36d6fc303
commit 771ec1d080
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Filter.cpp
View File

@@ -73,15 +73,9 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
_startCount = (int) input.size (); _startCount = (int) input.size ();
if (context.config.getInteger ("debug.parser") >= 1) if (context.config.getInteger ("debug.parser") >= 1)
{
context.debug (context.cli.dump ()); context.debug (context.cli.dump ());
Tree* t = context.parser.tree (); std::string filterExpr = context.cli.getFilter ();
if (t)
context.debug (t->dump ());
}
std::string filterExpr = context.parser.getFilterExpression ();
if (filterExpr.length ()) if (filterExpr.length ())
{ {
Eval eval; Eval eval;
@@ -122,16 +116,10 @@ void Filter::subset (std::vector <Task>& output)
context.timer_filter.start (); context.timer_filter.start ();
if (context.config.getInteger ("debug.parser") >= 1) if (context.config.getInteger ("debug.parser") >= 1)
{
context.debug (context.cli.dump ()); context.debug (context.cli.dump ());
Tree* t = context.parser.tree ();
if (t)
context.debug (t->dump ());
}
bool shortcut = false; bool shortcut = false;
std::string filterExpr = context.parser.getFilterExpression (); std::string filterExpr = context.cli.getFilter ();
if (filterExpr.length ()) if (filterExpr.length ())
{ {
context.timer_filter.stop (); context.timer_filter.stop ();
@@ -211,8 +199,6 @@ void Filter::subset (std::vector <Task>& output)
// term, then completed.data does not need to be loaded. // term, then completed.data does not need to be loaded.
bool Filter::pendingOnly () bool Filter::pendingOnly ()
{ {
Tree* tree = context.parser.tree ();
// To skip loading completed.data, there should be: // To skip loading completed.data, there should be:
// - 'status' in filter // - 'status' in filter
// - no 'completed' // - no 'completed'