GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI

Browse source 
- ::unsweetenTags no longer clobbers non-FILTER args.
This commit is contained in:
Paul Beckingham 2014-10-19 18:18:03 -04:00
parent cd8f7ddac4
commit f862ad15e6
1 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/CLI.cpp
View file

@ -506,29 +506,34 @@ void CLI::unsweetenTags ()
std::vector <A>::iterator a;
for (a = _args.begin (); a != _args.end (); ++a)
{
Nibbler n (a->attribute ("raw"));
std::string tag;
std::string sign;
if (n.getN (1, sign) &&
(sign == "+" || sign == "-") &&
n.getUntilEOS (tag) &&
tag.find (' ') == std::string::npos)
if (a->hasTag ("FILTER"))
{
A left ("argTag", "tags");
left.tag ("ATT");
left.tag ("FILTER");
reconstructed.push_back (left);
Nibbler n (a->attribute ("raw"));
std::string tag;
std::string sign;
A op ("argTag", sign == "+" ? "_hastag_" : "_notag_");
op.tag ("OP");
op.tag ("FILTER");
reconstructed.push_back (op);
if (n.getN (1, sign) &&
(sign == "+" || sign == "-") &&
n.getUntilEOS (tag) &&
tag.find (' ') == std::string::npos)
{
A left ("argTag", "tags");
left.tag ("ATT");
left.tag ("FILTER");
reconstructed.push_back (left);
A right ("argTag", tag);
right.tag ("LITERAL");
right.tag ("FILTER");
reconstructed.push_back (right);
A op ("argTag", sign == "+" ? "_hastag_" : "_notag_");
op.tag ("OP");
op.tag ("FILTER");
reconstructed.push_back (op);
A right ("argTag", tag);
right.tag ("LITERAL");
right.tag ("FILTER");
reconstructed.push_back (right);
}
else
reconstructed.push_back (*a);
}
else
reconstructed.push_back (*a);