GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-30 11:27:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI

Browse source 
- ::unsweetenAttributeModifiers no longer clobbers non-FILTER args.
This commit is contained in:
Paul Beckingham 2014-10-19 18:19:09 -04:00
parent 720cc57192
commit f809f2d819
1 changed files with 133 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CLI.cpp
View file

@ -640,6 +640,8 @@ void CLI::unsweetenAttributeModifiers ()
std::vector <A> reconstructed; std::vector <A> reconstructed;
std::vector <A>::iterator a; std::vector <A>::iterator a;
for (a = _args.begin (); a != _args.end (); ++a) for (a = _args.begin (); a != _args.end (); ++a)
{
if (a->hasTag ("FILTER"))
{ {
// Look for a valid attribute name. // Look for a valid attribute name.
bool found = false; bool found = false;
@ -760,8 +762,6 @@ void CLI::unsweetenAttributeModifiers ()
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP"); op.tag ("OP");
#if defined (DARWIN) #if defined (DARWIN)
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
#elif defined (SOLARIS) #elif defined (SOLARIS)
@ -774,7 +774,6 @@ void CLI::unsweetenAttributeModifiers ()
{ {
op.attribute ("raw", "!~"); op.attribute ("raw", "!~");
op.tag ("OP"); op.tag ("OP");
#if defined (DARWIN) #if defined (DARWIN)
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
#elif defined (SOLARIS) #elif defined (SOLARIS)
@ -799,6 +798,9 @@ void CLI::unsweetenAttributeModifiers ()
if (!found) if (!found)
reconstructed.push_back (*a); reconstructed.push_back (*a);
} }
else
reconstructed.push_back (*a);
}
_args = reconstructed; _args = reconstructed;
} }