mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
CLI2: Implemented ::findOverrides relying on Lexer::Type
This commit is contained in:
parent
a433ca308a
commit
1d4a532ea2
2 changed files with 12 additions and 3 deletions
11
src/CLI2.cpp
11
src/CLI2.cpp
|
@ -407,6 +407,9 @@ void CLI2::analyze ()
|
|||
_args.push_back (A2 ("arg", lexeme, type));
|
||||
}
|
||||
|
||||
// Now process _args.
|
||||
findOverrides ();
|
||||
|
||||
if (context.config.getInteger ("debug.parser") >= 3)
|
||||
{
|
||||
context.debug (dump ());
|
||||
|
@ -873,6 +876,7 @@ void CLI2::aliasExpansion ()
|
|||
context.config.getInteger ("debug.parser") >= 3)
|
||||
context.debug (dump ("CLI2::analyze aliasExpansion"));
|
||||
}
|
||||
*/
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void CLI2::findOverrides ()
|
||||
|
@ -886,13 +890,15 @@ void CLI2::findOverrides ()
|
|||
if (raw == "--")
|
||||
break;
|
||||
|
||||
if (isRCOverride (raw))
|
||||
if (raw.length () > 3 &&
|
||||
raw.find ("rc:") == 0)
|
||||
{
|
||||
a.tag ("RC");
|
||||
a.attribute ("file", raw.substr (3));
|
||||
changes = true;
|
||||
}
|
||||
else if (isConfigOverride (raw))
|
||||
else if (raw.length () > 3 &&
|
||||
raw.find ("rc.") == 0)
|
||||
{
|
||||
auto sep = raw.find ('=', 3);
|
||||
if (sep == std::string::npos)
|
||||
|
@ -912,6 +918,7 @@ void CLI2::findOverrides ()
|
|||
context.debug (dump ("CLI2::analyze findOverrides"));
|
||||
}
|
||||
|
||||
/*
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// TODO This method should further categorize args into whether or not they are
|
||||
// extracted by ::getWords.
|
||||
|
|
|
@ -107,11 +107,13 @@ public:
|
|||
*/
|
||||
const std::string dump (const std::string& title = "CLI2 Parser") const;
|
||||
|
||||
/*
|
||||
private:
|
||||
/*
|
||||
void addArg (const std::string&);
|
||||
void aliasExpansion ();
|
||||
*/
|
||||
void findOverrides ();
|
||||
/*
|
||||
void categorize ();
|
||||
bool exactMatch (const std::string&, const std::string&) const;
|
||||
void desugarFilterTags ();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue