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 
- ::findPattern was performing the wrong scan, and needed branch pruning outside
  the iterator loop.
This commit is contained in:
Paul Beckingham 2014-08-24 16:09:30 -04:00
parent ce7f6b6492
commit 8b904a57f4
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Parser.cpp
View file

@ -805,11 +805,14 @@ std::string Parser::getCommand () const
// /pattern/ --> description ~ pattern // /pattern/ --> description ~ pattern
void Parser::findPattern () void Parser::findPattern ()
{ {
// context.debug ("Parser::findPattern"); bool action = true;
do
{
action = false;
std::vector <Tree*> prune; std::vector <Tree*> prune;
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
collect (nodes, collectAll); collect (nodes);
std::vector <Tree*>::iterator i; std::vector <Tree*>::iterator i;
for (i = nodes.begin (); i != nodes.end (); ++i) for (i = nodes.begin (); i != nodes.end (); ++i)
{ {
@ -821,7 +824,7 @@ void Parser::findPattern ()
{ {
(*i)->unTag ("?"); (*i)->unTag ("?");
(*i)->tag ("PATTERN"); (*i)->tag ("PATTERN");
prune.push_back (*i); (*i)->removeAllBranches ();
Tree* branch = (*i)->addBranch (new Tree ("argPat")); Tree* branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "description"); branch->attribute ("raw", "description");
@ -833,15 +836,12 @@ void Parser::findPattern ()
branch = (*i)->addBranch (new Tree ("argPat")); branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", pattern); branch->attribute ("raw", pattern);
branch->tag ("STRING"); branch->tag ("STRING");
action = true;
break;
} }
} }
}
// Prune branches outside the loop. while (action);
for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches ();
// if (prune.size ())
// context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////