gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI2: Obey the terminator and skip Lexing

Browse Source
This commit is contained in:
Paul Beckingham
2015-06-27 17:35:15 -04:00
parent 299ecad49f
commit 1824a542f6
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/CLI2.cpp
View File

@@ -340,15 +340,28 @@ void CLI2::lexArguments ()
{ {
// Note: Starts interating at index 1, because ::handleArg0 has already // Note: Starts interating at index 1, because ::handleArg0 has already
// processed it. // processed it.
bool terminated = false;
for (unsigned int i = 1; i < _original_args.size (); ++i) for (unsigned int i = 1; i < _original_args.size (); ++i)
{ {
std::string lexeme; if (_original_args[i] == "--")
Lexer::Type type; {
Lexer lex (_original_args[i]); terminated = true;
lex.ambiguity (false); _args.push_back (A2 (_original_args[i], Lexer::Type::separator));
}
else if (terminated)
{
_args.push_back (A2 (_original_args[i], Lexer::Type::word));
}
else
{
std::string lexeme;
Lexer::Type type;
Lexer lex (_original_args[i]);
lex.ambiguity (false);
while (lex.token (lexeme, type)) while (lex.token (lexeme, type))
_args.push_back (A2 (lexeme, type)); _args.push_back (A2 (lexeme, type));
}
} }
if (context.config.getInteger ("debug.parser") >= 3) if (context.config.getInteger ("debug.parser") >= 3)