CmdCustom
- Removed redundant pair of parentheses from custom report filters. Only one pair is needed.
This commit is contained in:
@@ -81,18 +81,6 @@ int CmdCustom::execute (std::string& output)
|
|||||||
split (sortOrder, reportSort, ',');
|
split (sortOrder, reportSort, ',');
|
||||||
validateSortColumns (sortOrder);
|
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 (")");
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (reportFilter != "")
|
|
||||||
context.cli.add ("(");
|
|
||||||
|
|
||||||
// Prepend the argument list with those from the report filter.
|
// Prepend the argument list with those from the report filter.
|
||||||
std::string lexeme;
|
std::string lexeme;
|
||||||
Lexer::Type type;
|
Lexer::Type type;
|
||||||
@@ -105,9 +93,6 @@ int CmdCustom::execute (std::string& output)
|
|||||||
context.cli.add (lexeme);
|
context.cli.add (lexeme);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reportFilter != "")
|
|
||||||
context.cli.add (")");
|
|
||||||
|
|
||||||
std::vector <std::string>::reverse_iterator arg;
|
std::vector <std::string>::reverse_iterator arg;
|
||||||
for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg)
|
for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg)
|
||||||
context.parser.captureFirst (*arg);
|
context.parser.captureFirst (*arg);
|
||||||
|
|||||||
Reference in New Issue
Block a user