GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 22:47:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'parser2' into 2.4.0

Browse source
This commit is contained in:
Paul Beckingham 2014-10-25 19:43:13 -04:00
commit 07bb370637
9 changed files with 1771 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/commands/CmdCustom.cpp
View file

@ -81,15 +81,6 @@ int CmdCustom::execute (std::string& output)
split (sortOrder, reportSort, ',');
validateSortColumns (sortOrder);
/*
TODO Wow, this addition causes memory errors.
// Surround the command-line filter with parentheses, to protect it from
// the 'and' placed between the report filter and the command line filter.
context.parser.captureFirst ("(");
context.parser.captureLast (")");
*/
// Prepend the argument list with those from the report filter.
std::string lexeme;
Lexer::Type type;
@ -97,7 +88,10 @@ int CmdCustom::execute (std::string& output)
lex.ambiguity (false);
std::vector <std::string> filterArgs;
while (lex.token (lexeme, type))
{
filterArgs.push_back (lexeme);
context.cli.add (lexeme);
}
std::vector <std::string>::reverse_iterator arg;
for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg)