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

Parser

Browse Source 
- Modified ::findMissingOperators to use collect.
This commit is contained in:
Paul Beckingham
2014-08-17 13:31:49 -04:00
parent f4807db6d9
commit dff7dae3bc
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Parser.cpp
View File

@@ -1659,6 +1659,7 @@ void Parser::findPlainArgs ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findMissingOperators () void Parser::findMissingOperators ()
{ {
context.debug ("Parser::findMissingOperators");
bool action = false; bool action = false;
while (insertOr ()) while (insertOr ())
@@ -1675,18 +1676,12 @@ void Parser::findMissingOperators ()
// Two consecutive ID/UUID arguments get an 'or' inserted between them. // Two consecutive ID/UUID arguments get an 'or' inserted between them.
bool Parser::insertOr () bool Parser::insertOr ()
{ {
std::vector <Tree*>::iterator prev = _tree->_branches.begin (); std::vector <Tree*> nodes;
collect (nodes, false);
std::vector <Tree*>::iterator prev = nodes.begin ();
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)
{ {
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
// Skip known args.
if ((*i)->hasTag ("?"))
continue;
if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO")) if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO"))
{ {
if (prev != _tree->_branches.begin () && if (prev != _tree->_branches.begin () &&
@@ -1720,9 +1715,11 @@ bool Parser::insertOr ()
// //
bool Parser::insertAnd () bool Parser::insertAnd ()
{ {
std::vector <Tree*>::iterator prev = _tree->_branches.begin (); std::vector <Tree*> nodes;
collect (nodes, false);
std::vector <Tree*>::iterator prev = nodes.begin ();
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") && ! (*i)->hasTag ("PSEUDO")) if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO"))
{ {
@@ -1775,8 +1772,10 @@ bool Parser::insertAnd ()
void Parser::validate () void Parser::validate ()
{ {
// Look for any unrecognized original args. // Look for any unrecognized original args.
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 ("?")) if ((*i)->hasTag ("?"))
context.debug ("Unrecognized argument '" + (*i)->attribute ("raw") + "'"); context.debug ("Unrecognized argument '" + (*i)->attribute ("raw") + "'");