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

Parser

Browse Source 
- Modified ::findStrayModifications to use collect.
This commit is contained in:
Paul Beckingham
2014-08-17 13:24:31 -04:00
parent d7ba49084b
commit 1f0ce08042
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Parser.cpp
View File

@@ -190,8 +190,8 @@ Tree* Parser::parse ()
findIdSequence (); findIdSequence ();
findFilter (); findFilter ();
findModifications (); findModifications ();
// GOOD ^^^
findStrayModifications (); findStrayModifications ();
// GOOD ^^^
findPlainArgs (); findPlainArgs ();
findMissingOperators (); findMissingOperators ();
@@ -1579,21 +1579,30 @@ void Parser::findModifications ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findStrayModifications () void Parser::findStrayModifications ()
{ {
context.debug ("Parser::findModifications");
bool action = false;
std::string command = getCommand (); std::string command = getCommand ();
if (command == "add" || if (command == "add" ||
command == "log") command == "log")
{ {
std::vector <Tree*> nodes;
collect (nodes, false);
std::vector <Tree*>::iterator i; std::vector <Tree*>::iterator i;
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i) for (i = nodes.begin (); i != nodes.end (); ++i)
{ {
if ((*i)->hasTag ("FILTER")) if ((*i)->hasTag ("FILTER"))
{ {
(*i)->unTag ("FILTER"); (*i)->unTag ("FILTER");
(*i)->tag ("MODIFICATION"); (*i)->tag ("MODIFICATION");
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
action = true;
} }
} }
} }
if (action)
context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////