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

Parser

Browse Source 
- Made use of the other ::collect variants.
This commit is contained in:
Paul Beckingham
2014-08-22 22:37:53 -04:00
parent f59be41389
commit d4adf13b69
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Parser.cpp
View File

@@ -537,14 +537,10 @@ void Parser::getOverrides (
File& rc) File& rc)
{ {
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
collect (nodes, collectTerminated); collect (nodes, collectLeaf);
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)
{ {
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
if ((*i)->hasTag ("RC")) if ((*i)->hasTag ("RC"))
{ {
rc = File ((*i)->attribute ("file")); rc = File ((*i)->attribute ("file"));
@@ -597,14 +593,10 @@ void Parser::applyOverrides ()
context.debug ("Parse::applyOverrides"); context.debug ("Parse::applyOverrides");
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
collect (nodes, collectTerminated); collect (nodes, collectLeaf);
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)
{ {
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
if ((*i)->hasTag ("CONFIG")) if ((*i)->hasTag ("CONFIG"))
{ {
std::string name = (*i)->attribute ("name"); std::string name = (*i)->attribute ("name");