GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI2: ::aliasExpansion now properly observes and propagates TERMINATED args

Browse source
This commit is contained in:
Paul Beckingham 2015-06-28 00:33:17 -04:00
parent 050aad49f2
commit ba65fa67b1
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/CLI2.cpp
View file

@ -353,7 +353,9 @@ void CLI2::lexArguments ()
// Any arguments that are after the terminator are captured as words. // Any arguments that are after the terminator are captured as words.
else if (terminated) else if (terminated)
{ {
_args.push_back (A2 (_original_args[i], Lexer::Type::word)); A2 word (_original_args[i], Lexer::Type::word);
word.tag ("TERMINATED");
_args.push_back (word);
} }
// rc:<file> and rc.<name>[:=]<value> argumenst are captured whole. // rc:<file> and rc.<name>[:=]<value> argumenst are captured whole.
@ -740,13 +742,15 @@ void CLI2::aliasExpansion ()
for (auto& i : _args) for (auto& i : _args)
{ {
raw = i.attribute ("raw"); raw = i.attribute ("raw");
if (_aliases.find (raw) != _aliases.end ()) if (i.hasTag ("TERMINATED"))
{
reconstructed.push_back (i);
}
else if (_aliases.find (raw) != _aliases.end ())
{ {
for (auto& l : Lexer::split (_aliases[raw])) for (auto& l : Lexer::split (_aliases[raw]))
{ {
A2 a (l, Lexer::Type::word); A2 a (l, Lexer::Type::word);
a.tag ("ALIAS");
a.tag ("LEX");
reconstructed.push_back (a); reconstructed.push_back (a);
} }
@ -754,15 +758,25 @@ void CLI2::aliasExpansion ()
changes = true; changes = true;
} }
else else
{
reconstructed.push_back (i); reconstructed.push_back (i);
} }
}
_args = reconstructed; _args = reconstructed;
std::vector <std::string> reconstructedOriginals; std::vector <std::string> reconstructedOriginals;
bool terminated = false;
for (auto& i : _original_args) for (auto& i : _original_args)
{ {
if (_aliases.find (i) != _aliases.end ()) if (i == "--")
terminated = true;
if (terminated)
{
reconstructedOriginals.push_back (i);
}
else if (_aliases.find (i) != _aliases.end ())
{ {
for (auto& l : Lexer::split (_aliases[i])) for (auto& l : Lexer::split (_aliases[i]))
reconstructedOriginals.push_back (l); reconstructedOriginals.push_back (l);
@ -771,8 +785,10 @@ void CLI2::aliasExpansion ()
changes = true; changes = true;
} }
else else
{
reconstructedOriginals.push_back (i); reconstructedOriginals.push_back (i);
} }
}
_original_args = reconstructedOriginals; _original_args = reconstructedOriginals;
} }