GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: Dequotes args; no point leaving quotes if the QUOTED tag exists

Browse source
This commit is contained in:
Paul Beckingham 2016-04-29 18:19:34 -04:00
parent 2fe21b0a18
commit d62a8eb2a2
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/CLI.cpp
View file

@ -178,7 +178,7 @@ void CLI::handleArg0 ()
void CLI::lexArguments () void CLI::lexArguments ()
{ {
// Note: Starts iterating at index 1, because ::handleArg0 has already // Note: Starts iterating at index 1, because ::handleArg0 has already
// processed it. // processed 0.
for (unsigned int i = 1; i < _original_args.size (); ++i) for (unsigned int i = 1; i < _original_args.size (); ++i)
{ {
bool quoted = Lexer::wasQuoted (_original_args[i].attribute ("raw")); bool quoted = Lexer::wasQuoted (_original_args[i].attribute ("raw"));
@ -189,7 +189,7 @@ void CLI::lexArguments ()
if (lex.token (lexeme, type) && if (lex.token (lexeme, type) &&
lex.isEOS ()) lex.isEOS ())
{ {
A2 a (_original_args[i].attribute ("raw"), type); A2 a (Lexer::dequote (_original_args[i].attribute ("raw")), type);
if (quoted) if (quoted)
a.tag ("QUOTED"); a.tag ("QUOTED");
@ -207,8 +207,7 @@ void CLI::lexArguments ()
std::string word; std::string word;
if (Lexer::readWord (quote + escaped + quote, quote, cursor, word)) if (Lexer::readWord (quote + escaped + quote, quote, cursor, word))
{ {
Lexer::dequote (word); A2 unknown (Lexer::dequote (word), Lexer::Type::word);
A2 unknown (word, Lexer::Type::word);
if (Lexer::wasQuoted (_original_args[i].attribute ("raw"))) if (Lexer::wasQuoted (_original_args[i].attribute ("raw")))
unknown.tag ("QUOTED"); unknown.tag ("QUOTED");
@ -221,7 +220,7 @@ void CLI::lexArguments ()
// This branch may have no use-case. // This branch may have no use-case.
else else
{ {
A2 unknown (_original_args[i].attribute ("raw"), Lexer::Type::word); A2 unknown (Lexer::dequote (_original_args[i].attribute ("raw")), Lexer::Type::word);
unknown.tag ("UNKNOWN"); unknown.tag ("UNKNOWN");
if (Lexer::wasQuoted (_original_args[i].attribute ("raw"))) if (Lexer::wasQuoted (_original_args[i].attribute ("raw")))