X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=include%2Fargument.h;h=bf5fc3354f304c7b894252069969451275ec7fff;hb=e0fda02032d7d502e57e24eb218da9e24155541a;hp=b07ae67080925875a3a039218288640f31680bd7;hpb=9bc6a44ad1a07a6420ce4fd75dfea0796bcd0d46;p=command.git

diff --git a/include/argument.h b/include/argument.h
index b07ae67..bf5fc33 100644
--- a/include/argument.h
+++ b/include/argument.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <functional>
 
 #include "parameter.h"
 #include "callable.h"
@@ -11,21 +12,17 @@
 namespace command {
     /**
      * Class responsible for handling commandline arguments.
-     * Arguments are required, non-named parameters of program.
-     * Accepts
+     * Arguments are non-named parameters of program.
      *
      * Example:
-     *  ./myprog ARGUMENT
-     *  ./myprog /path/to/file
-     *  ./myprog "some argument"
+     *  - ./myprog ARGUMENT
+     *  - ./myprog /path/to/file
+     *  - ./myprog "some argument"
      */
-    template<typename ArgumentType>
-    class Argument : public Parameter, public Callable<ArgumentType> {
+    template<typename ParameterType>
+    class Argument : public Parameter, public Callable<ParameterType> {
     protected:
-        /** Variable indicating if current Argument was already used or not */
-        bool used = false;
-
-        ArgumentType value;
+        ParameterType value;
     public:
         typedef class Argument Type;
 
@@ -35,8 +32,8 @@ namespace command {
          * @param description Description of current Argument
          * @param function Function used to handle current Argument.
          */
-        Argument(const std::string & description, void (*function)(ArgumentType))
-            : Parameter(description), Callable<ArgumentType>(function) {
+        Argument(const std::string & description, std::function<void(ParameterType)> function)
+            : Parameter(description), Callable<ParameterType>(function) {
         }
 
         /**
@@ -45,10 +42,11 @@ namespace command {
         virtual ~Argument() { }
 
         /**
-         *
+         * \inheritdoc
          */
         virtual void handle() {
             this->call(value);
+            this->used = true;
         }
 
         /**
@@ -56,32 +54,36 @@ namespace command {
          * If so current Argument is flagged as used and no more checks against
          * it will be done in future.
          *
-         * \attention If conversion from passed value to ArgumentType is
+         * \attention If conversion from passed value to ParameterType is
          * impossible, it is ignored. It means that it is not understanded by
          * Argument.
          *
          * @param argv command line value against which test will be made.
          *
-         * @return If passed argv is succesfully converted to ArgumentType,
+         * @return If passed argv is succesfully converted to ParameterType,
          *  returns true and Argument is set as used one. If there was an error
          *  during conversion, method returns false and can be used to check
          *  against next value.
          */
         virtual bool understand(const std::string & argv) {
-            if (!used) {
-                std::stringstream ss;
+            std::stringstream ss;
 
-                ss << argv;
-                ss >> value;
+            ss << std::fixed << argv;
+            ss >> value;
 
-                if (!ss.fail()) {
-                    used = true;
-                    return true;
-                }
+            if (!ss.fail()) {
+                return true;
             }
 
             return false;
         }
+
+        /**
+         * \inheritdoc
+         */
+        virtual unsigned int valuePosition(const std::string & ) {
+            return 0;
+        }
     };
 }