zawz/ztd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

options: added option_sequence

Browse source
This commit is contained in:
zawz 2019-08-29 17:50:19 +02:00
parent 60cc951679
commit 96637468dc
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/options.hpp
View file

@ -100,13 +100,18 @@ namespace ztd
//! @brief Set of POSIX/GNU style options //! @brief Set of POSIX/GNU style options
/*! /*!
Process arguments through it to extract options Process arguments through it to extract options
After processing:
- for global option settings use find() or parse option_vec
- for sequential option settings parse option_sequence
*/ */
class option_set class option_set
{ {
public: public:
/*CREATION FUNCTIONS*/ /*CREATION FUNCTIONS*/
//! @brief Add option to the set //! @brief Add option to the set
inline void add(option opt) { m_options.push_back(opt); } inline void add(option opt) { option_vec.push_back(opt); }
/*PRINT FUNCTIONS*/ /*PRINT FUNCTIONS*/
//! @brief Print help for the full option set //! @brief Print help for the full option set
@ -138,8 +143,11 @@ namespace ztd
*/ */
inline std::vector<std::string> process(int argc, char** argv) { return this->process(ztd::argVector(argc, argv)); } inline std::vector<std::string> process(int argc, char** argv) { return this->process(ztd::argVector(argc, argv)); }
private: //! @brief Options in the set
std::vector<option> m_options; std::vector<option> option_vec;
//! @brief Ordered result of option processing
std::vector<option> option_sequence;
}; };
} //ztd } //ztd

21
src/options.cpp
View file

@ -98,7 +98,8 @@ ztd::option::option(const option& opt)
//help //help
help_text=opt.help_text; help_text=opt.help_text;
//init //init
activated=false; activated=opt.activated;
argument=opt.argument;
} }
void ztd::option::print_help(int leftpad, int rightpad) const void ztd::option::print_help(int leftpad, int rightpad) const
@ -134,13 +135,13 @@ void ztd::option::print_help(int leftpad, int rightpad) const
void ztd::option_set::print_help(int leftpad, int rightpad) const void ztd::option_set::print_help(int leftpad, int rightpad) const
{ {
for(auto it : this->m_options) for(auto it : this->option_vec)
it.print_help(leftpad,rightpad); it.print_help(leftpad,rightpad);
} }
ztd::option* ztd::option_set::find(char c) ztd::option* ztd::option_set::find(char c)
{ {
for( auto it=m_options.begin() ; it!=m_options.end() ; it++ ) for( auto it=option_vec.begin() ; it!=option_vec.end() ; it++ )
{ {
if(it->shortDef && it->charName == c) if(it->shortDef && it->charName == c)
return &*it; return &*it;
@ -150,7 +151,7 @@ ztd::option* ztd::option_set::find(char c)
ztd::option* ztd::option_set::find(std::string const& str) ztd::option* ztd::option_set::find(std::string const& str)
{ {
for( auto it=m_options.begin() ; it!=m_options.end() ; it++ ) for( auto it=option_vec.begin() ; it!=option_vec.end() ; it++ )
{ {
if(it->longDef && it->strName == str) if(it->longDef && it->strName == str)
return &*it; return &*it;
@ -162,6 +163,7 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
{ {
std::vector<std::string> out; std::vector<std::string> out;
unsigned int i=0; unsigned int i=0;
option_sequence.clear();
for( auto it = arguments.begin(); it!=arguments.end() ; it++ ) for( auto it = arguments.begin(); it!=arguments.end() ; it++ )
{ {
if( (*it).size()>0 && (*it)[0]=='-' ) if( (*it).size()>0 && (*it)[0]=='-' )
@ -184,9 +186,13 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
} }
popt->activated = true; popt->activated = true;
popt->argument = (*it); popt->argument = (*it);
option_sequence.push_back(*popt);
} }
else else
{
popt->activated = true; popt->activated = true;
option_sequence.push_back(*popt);
}
} }
else else
{ {
@ -199,7 +205,9 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
{ {
throw ztd::option_error(ztd::option_error::takes_no_arg, "--" + popt->strName); throw ztd::option_error(ztd::option_error::takes_no_arg, "--" + popt->strName);
} }
popt->activated = true;
popt->argument = (*it).substr(eqn+1,(*it).size()-eqn-1 ); popt->argument = (*it).substr(eqn+1,(*it).size()-eqn-1 );
option_sequence.push_back(*popt);
} }
} }
else else
@ -225,6 +233,7 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
} }
popt->activated = true; popt->activated = true;
popt->argument = (*it); popt->argument = (*it);
option_sequence.push_back(*popt);
tstop = true; tstop = true;
} }
else //continue else //continue
@ -233,11 +242,15 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
i++; i++;
popt->argument = (*it).substr(i , (*it).size()-i ); popt->argument = (*it).substr(i , (*it).size()-i );
popt->activated = true; popt->activated = true;
option_sequence.push_back(*popt);
tstop=true; tstop=true;
} }
} }
else //no argument else //no argument
{
popt->activated = true; popt->activated = true;
option_sequence.push_back(*popt);
}
i++; i++;
} }
} }