GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-01 09:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Parser

Browse source 
- Corrected indirect node insertion, which must be into _tree, not into
  nodes.
This commit is contained in:
Paul Beckingham 2014-08-17 23:39:06 -04:00
parent 293f4d6258
commit 6635cd9d84
1 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Parser.cpp
View file

@ -1759,37 +1759,18 @@ bool Parser::insertAnd ()
{ {
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
collect (nodes, true); collect (nodes, true);
std::vector <Tree*>::iterator prev = nodes.begin ();
// Subset the nodes to only the FILTER, non-PSEUDO nodes.
std::vector <Tree*> filterNodes;
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)
{
if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO")) if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO"))
{ filterNodes.push_back (*i);
if ((*i)->_branches.size ())
{
std::vector <Tree*>::iterator sub;
for (sub = (*i)->_branches.begin (); sub != (*i)->_branches.end (); ++sub)
{
if (sub != prev &&
prev != nodes.begin () &&
(! (*prev)->hasTag ("OP") || (*prev)->attribute ("raw") == ")") &&
(! (*sub)->hasTag ("OP") || (*sub)->attribute ("raw") == "("))
{
Tree* branch = new Tree ("argOp");
branch->attribute ("raw", "and");
branch->tag ("OP");
branch->tag ("FILTER");
(*i)->_branches.insert (sub, branch);
return true;
}
prev = sub; std::vector <Tree*>::iterator prev = filterNodes.begin ();
} for (i = filterNodes.begin (); i != filterNodes.end (); ++i)
}
else
{ {
if (i != prev && if (i != prev &&
prev != nodes.begin () &&
(! (*prev)->hasTag ("OP") || (*prev)->attribute ("raw") == ")") && (! (*prev)->hasTag ("OP") || (*prev)->attribute ("raw") == ")") &&
(! (*i)->hasTag ("OP") || (*i)->attribute ("raw") == "(")) (! (*i)->hasTag ("OP") || (*i)->attribute ("raw") == "("))
{ {
@ -1797,14 +1778,25 @@ bool Parser::insertAnd ()
branch->attribute ("raw", "and"); branch->attribute ("raw", "and");
branch->tag ("OP"); branch->tag ("OP");
branch->tag ("FILTER"); branch->tag ("FILTER");
_tree->_branches.insert (i, branch); branch->_trunk = (*i)->_trunk;
std::vector <Tree*>::iterator b;
for (b = (*i)->_trunk->_branches.begin ();
b != (*i)->_trunk->_branches.end ();
++b)
{
if (*b == *i)
{
(*i)->_trunk->_branches.insert (b, branch);
break;
}
}
return true; return true;
} }
prev = i; prev = i;
} }
}
}
return false; return false;
} }