namespace command {
/**
* Class responsible for handling commandline options.
- * Options are non-required, named parameters of program.
+ * Options are named parameters of program.
*
* Example:
* ./myprog OptionName=OptionValue
/**
* Current Option name
*/
- OptionName name;
+ const OptionName name;
/**
* Current Option value
*/
OptionType value;
- /** Variable indicating if current Option was already used or not */
- bool used = false;
-
public:
/**
* Default constructor.
* @param description Description of current Option
* @param function Function used to handle current Option.
*/
- Option(std::string name, const std::string & description, void (*function)(OptionType))
+ Option(const std::string & name, const std::string & description, void (*function)(OptionType))
: Parameter(description), Callable<OptionType>(function), name(name) {
}
* @throw std::invalid_argument when OptionValue part failed conversion
* to OptionType
*/
- virtual bool understand(const std::string & argv) {
- if ((!used) &&
- (argv.find(name) == 0)) {
+ virtual bool understand(const std::string & argv)
+ throw(std::invalid_argument) {
+
+ if ((!isUsed()) && (argv.find(name) == 0)) {
std::size_t pos = argv.find("=");
+
if (pos != name.size()) {
throw std::invalid_argument("Option: " + name + " requires value but no one has been provided");
}
std::stringstream ss;
-
ss << argv.substr(pos + 1);
- ss >> value;
+ ss >> value;// memory leak? when uncommented and exception is
+ // thrown, valgrind shows e.g.:
+ // possibly lost: 380 bytes in 7 blocks
if (ss.fail()) {
throw std::invalid_argument("Value for option: " + name + " failed conversion to the required type");
/**
* Current Option name
*/
- OptionName name;
-
- /** Variable indicating if current Option was already used or not */
- bool used = false;
-
+ const OptionName name;
public:
/**
* Default constructor.
* @param description Description of current Option
* @param function Function used to handle current Option.
*/
- Option(std::string name, const std::string & description, void (*function)(void))
+ Option(const std::string & name, const std::string & description, void (*function)(void))
: Parameter(description), Callable<void>(function), name(name) {
}
- /**
- *
- */
- virtual ~Option() { }
-
/**
*
*/
* used to check against next value.
*/
virtual bool understand(const std::string & argv) {
- if ((!used) &&
+ if ((!isUsed()) &&
(argv == name)) {
used = true;
return true;