Possibility to handle class method & example

[command.git] / include / option.h

diff --git a/include/option.h b/include/option.h
index 21f814e105f9f3e6b1fffc91d50864109700c749..d9630a798b486bed5225e802d09c519e85c4ef4c 100644 (file)
--- a/include/option.h
+++ b/include/option.h
@@ -8,6 +8,7 @@
 #include "parameter.h"
 #include "exception/missingOptionValue.h"
 #include "exception/optionFailedConversion.h"
+#include "exception/optionValueNotSpecified.h"
 
 namespace command {
     /**
@@ -43,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) {
         }
 
@@ -57,6 +58,7 @@ namespace command {
          */
         virtual void handle() {
             this->call(value);
+            used = true;
         }
 
         /**
@@ -87,27 +89,43 @@ namespace command {
          *  to ParameterType
          */
         virtual bool understand(const std::string & argv) {
-
-            if ((!isUsed()) && (argv.find(name) == 0)) {
-                std::size_t pos = argv.find("=");
+            if (this->hasName(argv)) {
+                std::size_t pos = this->valuePosition(argv);
 
                 if (pos != name.size()) {
                     throw MissingOptionValue("Option: " + name + " requires value but no one has been provided");
                 }
 
                 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");
                 }
 
-                used = true;
                 return true;
             }
             return false;
         }
+
+        /**
+         * \inheritdoc
+         */
+        virtual unsigned int valuePosition(const std::string & value) {
+            std::size_t pos = value.find("=");
+
+            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;
+        }
     };
 
     /**
@@ -140,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) {
         }
 
@@ -149,6 +167,7 @@ namespace command {
          */
         virtual void handle() {
             this->call();
+            used = true;
         }
 
         /**
@@ -167,13 +186,18 @@ namespace command {
          *  used to check against next value.
          */
         virtual bool understand(const std::string & argv) {
-            if ((!isUsed()) &&
-                (argv == name)) {
-                used = true;
+            if (argv == name) {
                 return true;
             }
             return false;
         }
+
+        /**
+         * \inheritdoc
+         */
+        virtual unsigned int valuePosition(const std::string & ) {
+            throw new std::invalid_argument(this->describe() + " is void Option, so it does not have value part");
+        }
     };
 }