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

A3t

Browse source 
- Inserts an 'or' between ID/UUID range/lists, and inserts an 'and' between
  consecutive non-operators.
This commit is contained in:
Paul Beckingham 2014-05-21 23:38:36 -04:00
parent 1b2b110a1c
commit 6a9b95079c
2 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/A3t.cpp
View file

@ -1306,10 +1306,49 @@ void A3t::findPlainArgs ()
////////////////////////////////////////////////////////////////////////////////
void A3t::findMissingOperators ()
{
/*
while (insertMissingOperators ())
while (insertOr ())
;
*/
while (insertAnd ())
;
}
////////////////////////////////////////////////////////////////////////////////
// Two consecutive ID/UUID arguments get an 'or' inserted between them.
bool A3t::insertOr ()
{
std::vector <Tree*>::iterator prev = _tree->_branches.begin ();
std::vector <Tree*>::iterator i;
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
{
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
// Skip known args.
if ((*i)->hasTag ("?"))
continue;
if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO"))
{
if (prev != _tree->_branches.begin () &&
((*prev)->hasTag ("ID") || (*prev)->hasTag ("UUID")) &&
((*i)->hasTag ("ID") || (*i)->hasTag ("UUID")))
{
Tree* branch = new Tree ("argOp");
branch->attribute ("raw", "or");
branch->tag ("OP");
branch->tag ("FILTER");
_tree->_branches.insert (i, branch);
return true;
}
}
prev = i;
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
@ -1321,7 +1360,7 @@ void A3t::findMissingOperators ()
// ) ( --> ) and (
// <non-op> <non-op> --> <non-op> and <non-op>
//
bool A3t::insertMissingOperators ()
bool A3t::insertAnd ()
{
std::vector <Tree*>::iterator prev = _tree->_branches.begin ();
std::vector <Tree*>::iterator i;
@ -1352,6 +1391,7 @@ bool A3t::insertMissingOperators ()
Tree* branch = new Tree ("argOp");
branch->attribute ("raw", "and");
branch->tag ("OP");
branch->tag ("FILTER");
(*i)->_branches.insert (sub, branch);
return true;
}
@ -1379,6 +1419,7 @@ bool A3t::insertMissingOperators ()
Tree* branch = new Tree ("argOp");
branch->attribute ("raw", "and");
branch->tag ("OP");
branch->tag ("FILTER");
_tree->_branches.insert (i, branch);
return true;
}

3
src/A3t.h
View file

@ -73,7 +73,8 @@ private:
void findModifications ();
void findPlainArgs ();
void findMissingOperators ();
bool insertMissingOperators ();
bool insertOr ();
bool insertAnd ();
void validate ();
private: