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

add option_set constructors

Browse source
This commit is contained in:
zawz 2021-06-04 13:25:24 +02:00
parent e88779afe3
commit ba744333ed
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -49,10 +49,10 @@ install:
uninstall: uninstall:
rm $(INSTALL)/usr/lib/libztd.* rm $(INSTALL)/usr/lib/libztd.*
rm -rd $(INSTALL)/usr/include/ztd rm -r $(INSTALL)/usr/include/ztd
clean: clean:
rm $(ODIR)/*.o $(ODIR_SHARED)/*.o rm $(ODIR)/*.o $(ODIR_SHARED)/*.o
clear: clear:
rm -rd libztd.a libztd.so doc rm -r libztd.a libztd.so doc

15
include/options.hpp
View file

@ -135,9 +135,14 @@ namespace ztd
class option_set class option_set
{ {
public: public:
option_set() { ; }
option_set(option opt) { add(opt); }
option_set(std::vector<option> opts) { option_vec = opts; }
/*CREATION FUNCTIONS*/ /*CREATION FUNCTIONS*/
//! @brief Add option to the set //! @brief Add option to the set
inline void add(option opt) { option_vec.push_back(opt); } inline void add(option opt) { option_vec.push_back(opt); }
//! @brief Vector call of add();
inline void add(std::vector<option> opts) { for(auto it: opts) add(it); }
//! @brief Variadic call of add() //! @brief Variadic call of add()
template<class... Args> template<class... Args>
void add(Args... args) { std::vector<option> rargs = { static_cast<option>(args)...}; for(auto it: rargs) add(it); } void add(Args... args) { std::vector<option> rargs = { static_cast<option>(args)...}; for(auto it: rargs) add(it); }
@ -162,22 +167,22 @@ namespace ztd
option* find(const std::string& str); option* find(const std::string& str);
inline option* find(const char* str) { return this->find(std::string(str)); } inline option* find(const char* str) { return this->find(std::string(str)); }
static constexpr struct process_arguments default_process_args={}; static constexpr process_arguments default_process_args={};
//! @brief Process arguments through the option set //! @brief Process arguments through the option set
/*! /*!
If errors are encountered, exceptions option_error are thrown If errors are encountered, exceptions option_error are thrown
@see struct process_arguments @see process_arguments
@param arguments vector of string containing arguments and options @param arguments vector of string containing arguments and options
@param behavior behavioral changes for option processing. Optional @param behavior behavioral changes for option processing. Optional
@return if @a behavior.stop_on_argument is specified, returns unprocessed arguments\n otherwise, returns leftover arguments that are not options\n @return if @a behavior.stop_on_argument is specified, returns unprocessed arguments\n otherwise, returns leftover arguments that are not options\n
*/ */
std::vector<std::string> process(std::vector<std::string> const& arguments, struct process_arguments const& behavior=default_process_args); std::vector<std::string> process(std::vector<std::string> const& arguments, process_arguments const& behavior=default_process_args);
//! @brief Process arguments through the option set //! @brief Process arguments through the option set
/*! /*!
@see process(std::vector<std::string> const& arguments, struct process_arguments const& behavior) @see process(std::vector<std::string> const& arguments, process_arguments const& behavior)
*/ */
inline std::vector<std::string> process(int argc, char** argv, struct process_arguments const& behavior=default_process_args) { return this->process(ztd::argVector(argc, argv), behavior); } inline std::vector<std::string> process(int argc, char** argv, process_arguments const& behavior=default_process_args) { return this->process(ztd::argVector(argc, argv), behavior); }
//! @brief Get option with char name //! @brief Get option with char name
/*! @see option* find(char c) /*! @see option* find(char c)

2
src/options.cpp
View file

@ -160,7 +160,7 @@ ztd::option* ztd::option_set::find(const std::string& str)
return nullptr; return nullptr;
} }
std::vector<std::string> ztd::option_set::process(std::vector<std::string> const& arguments, struct ztd::process_arguments const& behavior) std::vector<std::string> ztd::option_set::process(std::vector<std::string> const& arguments, ztd::process_arguments const& behavior)
{ {
std::vector<std::string> out; std::vector<std::string> out;
unsigned int i=0; unsigned int i=0;