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

CLI2: Now relies on Lexer::Type::separator, rather than literal "--".

Browse Source
This commit is contained in:
Paul Beckingham
2015-06-14 14:14:27 -04:00
parent 078e9fe751
commit c305768ed8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CLI2.cpp
View File

@@ -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)
{ {