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

CLI

Browse Source 
- ::addArg now lexes args, and looks for embedded operators before deciding to
  use the lexemes.
This commit is contained in:
Paul Beckingham
2014-10-31 20:11:34 -04:00
parent 975b20a517
commit 7420ef8e28
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/CLI.cpp
View File

@@ -504,7 +504,7 @@ void CLI::addArg (const std::string& arg)
_original_args.push_back (arg); _original_args.push_back (arg);
} }
// Do not lex, unless lexing reveals OPs. // Lex, but only use lexemes if an operator is found in there.
else else
{ {
// Lex each argument. If there are multiple lexemes, create sub branches, // Lex each argument. If there are multiple lexemes, create sub branches,
@@ -518,22 +518,18 @@ void CLI::addArg (const std::string& arg)
while (lex.token (lexeme, type)) while (lex.token (lexeme, type))
lexemes.push_back (std::pair <std::string, Lexer::Type> (lexeme, type)); lexemes.push_back (std::pair <std::string, Lexer::Type> (lexeme, type));
// This one looks interesting. bool foundOP = false;
if (lexemes.size () > 1) std::vector <std::pair <std::string, Lexer::Type> >::iterator l;
{ for (l = lexemes.begin (); l != lexemes.end (); ++l)
bool foundOP = false; if (l->second == Lexer::typeOperator)
std::vector <std::pair <std::string, Lexer::Type> >::iterator l; foundOP = true;
for (l = lexemes.begin (); l != lexemes.end (); ++l)
if (l->second == Lexer::typeOperator)
foundOP = true;
if (foundOP) // This one looks interesting.
{ if (lexemes.size () > 1 &&
foundOP)
{
for (l = lexemes.begin (); l != lexemes.end (); ++l) for (l = lexemes.begin (); l != lexemes.end (); ++l)
_original_args.push_back (l->first); _original_args.push_back (l->first);
}
else
_original_args.push_back (arg);
} }
else else
_original_args.push_back (arg); _original_args.push_back (arg);