mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
CLI2: Now relies on Lexer::Type::separator, rather than literal "--".
This commit is contained in:
parent
078e9fe751
commit
c305768ed8
1 changed files with 4 additions and 3 deletions
|
@ -816,6 +816,7 @@ void CLI2::addArg (const std::string& arg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
void CLI2::aliasExpansion ()
|
void CLI2::aliasExpansion ()
|
||||||
{
|
{
|
||||||
|
@ -832,7 +833,7 @@ void CLI2::aliasExpansion ()
|
||||||
for (auto& i : _args)
|
for (auto& i : _args)
|
||||||
{
|
{
|
||||||
raw = i.attribute ("raw");
|
raw = i.attribute ("raw");
|
||||||
if (raw == "--")
|
if (i._lextype == Lexer::Type::separator)
|
||||||
terminated = true;
|
terminated = true;
|
||||||
|
|
||||||
if (! terminated)
|
if (! terminated)
|
||||||
|
@ -878,10 +879,10 @@ void CLI2::findOverrides ()
|
||||||
|
|
||||||
for (auto& a : _args)
|
for (auto& a : _args)
|
||||||
{
|
{
|
||||||
raw = a.attribute ("raw");
|
if (a._lextype == Lexer::Type::separator)
|
||||||
if (raw == "--")
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
raw = a.attribute ("raw");
|
||||||
if (raw.length () > 3 &&
|
if (raw.length () > 3 &&
|
||||||
raw.find ("rc:") == 0)
|
raw.find ("rc:") == 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue