CLI2: Aliases captured.

- CLI2::alias now captures all alias definitions from Context::Config.
This commit is contained in:
Paul Beckingham 2015-06-13 14:02:18 -04:00
parent 22765a70cb
commit ec5876d56b
3 changed files with 5 additions and 5 deletions

View file

@ -311,13 +311,11 @@ CLI2::~CLI2 ()
{ {
} }
/*
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void CLI2::alias (const std::string& name, const std::string& value) void CLI2::alias (const std::string& name, const std::string& value)
{ {
_aliases.insert (std::pair <std::string, std::string> (name, value)); _aliases.insert (std::pair <std::string, std::string> (name, value));
} }
*/
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void CLI2::entity (const std::string& category, const std::string& name) void CLI2::entity (const std::string& category, const std::string& name)

View file

@ -77,9 +77,7 @@ public:
public: public:
CLI2 (); CLI2 ();
~CLI2 (); ~CLI2 ();
/*
void alias (const std::string&, const std::string&); void alias (const std::string&, const std::string&);
*/
void entity (const std::string&, const std::string&); void entity (const std::string&, const std::string&);
/* /*
void initialize (int, const char**); void initialize (int, const char**);
@ -144,8 +142,8 @@ private:
public: public:
std::multimap <std::string, std::string> _entities; std::multimap <std::string, std::string> _entities;
/*
std::map <std::string, std::string> _aliases; std::map <std::string, std::string> _aliases;
/*
std::vector <std::string> _original_args; std::vector <std::string> _original_args;
std::vector <A> _args; std::vector <A> _args;

View file

@ -802,6 +802,10 @@ void Context::updateVerbosity ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Context::loadAliases () void Context::loadAliases ()
{ {
for (auto& i : config)
if (i.first.substr (0, 6) == "alias.")
cli2.alias (i.first.substr (6), i.second);
for (auto& i : config) for (auto& i : config)
if (i.first.substr (0, 6) == "alias.") if (i.first.substr (0, 6) == "alias.")
cli.alias (i.first.substr (6), i.second); cli.alias (i.first.substr (6), i.second);