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

Parser

Browse source 
- ::findTerminator now moves branch pruning out of the iterated loop.
This commit is contained in:
Paul Beckingham 2014-08-22 23:42:58 -04:00
parent 9f9c07a955
commit 6dad8ddb1b
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Parser.cpp
View file

@ -369,7 +369,7 @@ void Parser::findTerminator ()
{
context.debug ("Parser::findTerminator");
bool found = false;
bool action = false;
std::vector <Tree*> prune;
std::vector <Tree*> nodes;
collect (nodes, collectTerminated);
@ -381,24 +381,26 @@ void Parser::findTerminator ()
(*i)->attribute ("raw") == "--")
{
(*i)->unTag ("?");
(*i)->removeAllBranches ();
(*i)->tag ("TERMINATOR");
prune.push_back (*i);
found = true;
action = true;
}
// Mark subsequent nodes.
else if (found)
{
(*i)->unTag ("?");
(*i)->removeAllBranches ();
(*i)->tag ("WORD");
(*i)->tag ("TERMINATED");
action = true;
prune.push_back (*i);
}
}
if (action)
// Prune branches outside the loop.
for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches ();
if (prune.size ())
context.debug (_tree->dump ());
}