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

CLI

Browse source 
- An arg preceded by an OP is not a plain arg.
This commit is contained in:
Paul Beckingham 2014-10-26 11:11:33 -04:00
parent 47e8ae6c02
commit 286c378180
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/CLI.cpp
View file

@ -265,7 +265,6 @@ void CLI::initialize (int argc, const char** argv)
// Capture a single argument, and recalc everything.
void CLI::add (const std::string& arg)
{
// Clean what needs to be cleaned. Most in this case.
_original_args.push_back (arg);
analyze ();
@ -1290,12 +1289,16 @@ void CLI::desugarPlainArgs ()
{
std::vector <A> reconstructed;
std::vector <A>::iterator a;
std::vector <A>::iterator prev = _args.begin ();
for (a = _args.begin (); a != _args.end (); ++a)
{
if (a->hasTag ("FILTER") &&
if (a != prev && // Not the first arg.
! prev->hasTag ("OP") && // An OP before protects the arg.
a->hasTag ("FILTER") &&
! a->hasTag ("ATTRIBUTE") &&
! a->hasTag ("ATTMOD") &&
! a->hasTag ("OP") &&
! a->hasTag ("REGEX") &&
! a->hasTag ("LITERAL"))
{
A lhs ("argPattern", "description");
@ -1315,6 +1318,8 @@ void CLI::desugarPlainArgs ()
}
else
reconstructed.push_back (*a);
prev = a;
}
_args = reconstructed;