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

TW-1419: On add '-tag' is considered a tag removal, which makes no sense.

Browse source
This commit is contained in:
Paul Beckingham 2015-07-13 14:24:24 -04:00
parent 585ae52be3
commit a7eb32272c
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/CLI2.cpp
View file

@ -481,9 +481,13 @@ void CLI2::lexArguments ()
////////////////////////////////////////////////////////////////////////////////
// Until the Lexer gains access to CLI2::_entities, it can only guess at whether
// a command is a DOM reference. Scan all Lexer::Type::dom arguments, and demote
// to Lexer::Type::word any unrecognized arguments.
void CLI2::demoteDOM ()
// a command is a DOM reference.
//
// [1] Scan all Lexer::Type::dom arguments, and demote to Lexer::Type::word any
// unrecognized arguments.
// [2] Scan all MODIFICATION args for the 'add' and 'log' commands, and demote
// any Lexer::Type::Tag args with sense '-' to Lexer::Type::word.
void CLI2::demotion ()
{
bool changes = false;
@ -498,11 +502,23 @@ void CLI2::demoteDOM ()
changes = true;
}
}
if (a._lextype == Lexer::Type::tag &&
a.attribute ("sign") == "-")
{
std::string command = getCommand ();
if (command == "add" ||
command == "log")
{
a._lextype = Lexer::Type::word;
changes = true;
}
}
}
if (changes)
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (dump ("CLI2::analyze demoteDOM"));
context.debug (dump ("CLI2::analyze demotion"));
}
////////////////////////////////////////////////////////////////////////////////
@ -516,7 +532,6 @@ void CLI2::analyze ()
_args.clear ();
handleArg0 ();
lexArguments ();
demoteDOM ();
// Process _args.
aliasExpansion ();
@ -527,6 +542,7 @@ void CLI2::analyze ()
throw std::string (STRING_TRIVIAL_INPUT);
}
demotion ();
canonicalizeNames ();
}