Possibility to handle class method & example

[command.git] / include / option.h

diff --git a/include/option.h b/include/option.h
index d66164d38d6f622e7f81440c5ba4845bcd4e6a7a..d9630a798b486bed5225e802d09c519e85c4ef4c 100644 (file)
--- a/include/option.h
+++ b/include/option.h
@@ -44,7 +44,7 @@ namespace command {
          * @param description Description of current Option
          * @param function Function used to handle current Option.
          */
-        Option(const std::string & name, const std::string & description, void (*function)(ParameterType))
+        Option(const std::string & name, const std::string & description, std::function<void(ParameterType)> function)
             : Parameter(description), Callable<ParameterType>(function), name(name) {
         }
 
@@ -89,8 +89,7 @@ namespace command {
          *  to ParameterType
          */
         virtual bool understand(const std::string & argv) {
-
-            if (argv.find(name) == 0) {
+            if (this->hasName(argv)) {
                 std::size_t pos = this->valuePosition(argv);
 
                 if (pos != name.size()) {
@@ -98,11 +97,11 @@ namespace command {
                 }
 
                 std::stringstream ss;
-                ss << argv.substr(pos + 1);
+                ss << std::fixed << argv.substr(pos + 1);
                 ss >> value;
 
                 if (ss.fail()) {
-                    throw OptionFailedConversion("Value for option: " + name + " failed conversion to the required type");
+                    throw OptionFailedConversion("Option: " + name + " failed value conversion to the required type");
                 }
 
                 return true;
@@ -116,12 +115,17 @@ namespace command {
         virtual unsigned int valuePosition(const std::string & value) {
             std::size_t pos = value.find("=");
 
-            if (pos == std::string::npos) {
-                throw OptionValueNotSpecified("Option: " + name + " requires value to be specified using equal sign");
+            if ((this->hasName(value)) && (pos == std::string::npos)) {
+                throw OptionValueNotSpecified("Option: " + name + " requires value to be specified after equal sign, but no equal sign was found");
             }
 
             return pos;
         }
+
+    protected:
+        bool hasName(const std::string & argv) {
+            return argv.find(name) == 0;
+        }
     };
 
     /**
@@ -154,7 +158,7 @@ namespace command {
          * @param description Description of current Option
          * @param function Function used to handle current Option.
          */
-        Option(const std::string & name, const std::string & description, void (*function)(void))
+        Option(const std::string & name, const std::string & description, std::function<void(void)> function)
             : Parameter(description), Callable<void>(function), name(name) {
         }