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

Parser

Browse Source 
- Fixed bug where ::findAttribute and ::findAttributeModifier were scanning
  all nodes, but thinking that '--' was a tag, not a raw value.
This commit is contained in:
Paul Beckingham
2014-08-26 23:26:49 -04:00
parent 3f519785d8
commit f87ead8804
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Parser.cpp
View File

@@ -969,7 +969,7 @@ void Parser::findAttribute ()
for (i = nodes.begin (); i != nodes.end (); ++i) for (i = nodes.begin (); i != nodes.end (); ++i)
{ {
std::string raw = (*i)->attribute ("raw"); std::string raw = (*i)->attribute ("raw");
if ((*i)->hasTag ("--")) if (raw == "--")
break; break;
if (! (*i)->hasTag ("?")) if (! (*i)->hasTag ("?"))
@@ -1066,11 +1066,17 @@ void Parser::findAttributeModifier ()
action = false; action = false;
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
collect (nodes); collect (nodes, collectAll);
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)
{ {
std::string raw = (*i)->attribute ("raw"); std::string raw = (*i)->attribute ("raw");
if (raw == "--")
break;
if (! (*i)->hasTag ("?"))
continue;
Nibbler n (raw); Nibbler n (raw);
std::string name; std::string name;
@@ -1280,7 +1286,6 @@ void Parser::findIdSequence ()
for (i = nodes.begin (); i != nodes.end (); ++i) for (i = nodes.begin (); i != nodes.end (); ++i)
{ {
std::string raw = (*i)->attribute ("raw"); std::string raw = (*i)->attribute ("raw");
if (raw == "--") if (raw == "--")
break; break;
@@ -1449,7 +1454,6 @@ void Parser::findUUIDList ()
for (i = nodes.begin (); i != nodes.end (); ++i) for (i = nodes.begin (); i != nodes.end (); ++i)
{ {
std::string raw = (*i)->attribute ("raw"); std::string raw = (*i)->attribute ("raw");
if (raw == "--") if (raw == "--")
break; break;