Fix sizeof.

[stg.git] / projects / sgconf / options.h

diff --git a/projects/sgconf/options.h b/projects/sgconf/options.h
index 3d4bdd64263355211dcaf41ef5539506c777f40d..012b5167146fd0259742bfd5b276d83d1cd9f4e7 100644 (file)
--- a/projects/sgconf/options.h
+++ b/projects/sgconf/options.h
@@ -18,13 +18,13 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONF_OPTIONS_H__
-#define __STG_SGCONF_OPTIONS_H__
+#pragma once

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <list>
+#include <utility>

 #include <stdexcept>
 #include <stdexcept>

+#include <memory>

 #include <cstddef> // size_t
 
 namespace SGCONF
 #include <cstddef> // size_t
 
 namespace SGCONF


@@ -38,31 +38,31 @@ class OPTION
     public:
         OPTION(const std::string & shortName,
                const std::string & longName,
     public:
         OPTION(const std::string & shortName,
                const std::string & longName,

-               ACTION * action,
+               std::unique_ptr<ACTION> action,

                const std::string & description);
         OPTION(const std::string & longName,
                const std::string & description);
         OPTION(const std::string & longName,

-               ACTION * action,
+               std::unique_ptr<ACTION> action,

                const std::string & description);
                const std::string & description);

-        OPTION(const OPTION & rhs);
-        ~OPTION();

 
 

-        OPTION & operator=(const OPTION & rhs);
+        OPTION(OPTION&& rhs) = default;
+        OPTION& operator=(OPTION& rhs) = default;

 
         void Help(size_t level = 0) const;
 
         void Help(size_t level = 0) const;

-        PARSER_STATE Parse(int argc, char ** argv);
+        PARSER_STATE Parse(int argc, char ** argv, void * data);
+        void ParseValue(const std::string & value);

         bool Check(const char * arg) const;
         bool Check(const char * arg) const;

+        const std::string & Name() const { return m_longName; }

 
 

-        class ERROR : public std::runtime_error
+        struct ERROR : std::runtime_error

         {
         {

-            public:
-                ERROR(const std::string & message)
-                    : std::runtime_error(message.c_str()) {}
+            explicit ERROR(const std::string & message)
+                : std::runtime_error(message.c_str()) {}

         };
 
     private:
         std::string m_shortName;
         std::string m_longName;
         };
 
     private:
         std::string m_shortName;
         std::string m_longName;

-        ACTION * m_action;
+        std::unique_ptr<ACTION> m_action;

         std::string m_description;
 };
 
         std::string m_description;
 };
 


@@ -70,23 +70,36 @@ class OPTION_BLOCK
 {
     public:
         OPTION_BLOCK() {}
 {
     public:
         OPTION_BLOCK() {}

-        OPTION_BLOCK(const std::string & description)
+        explicit OPTION_BLOCK(const std::string & description)

             : m_description(description) {}
             : m_description(description) {}

+
+        OPTION_BLOCK(OPTION_BLOCK&&) = default;
+        OPTION_BLOCK& operator=(OPTION_BLOCK&&) = default;
+

         OPTION_BLOCK & Add(const std::string & shortName,
                            const std::string & longName,
         OPTION_BLOCK & Add(const std::string & shortName,
                            const std::string & longName,

-                           ACTION * action,
+                           std::unique_ptr<ACTION> action,

                            const std::string & description);
         OPTION_BLOCK & Add(const std::string & longName,
                            const std::string & description);
         OPTION_BLOCK & Add(const std::string & longName,

-                           ACTION * action,
+                           std::unique_ptr<ACTION> action,

                            const std::string & description);
 
         void Help(size_t level) const;
 
                            const std::string & description);
 
         void Help(size_t level) const;
 

-        PARSER_STATE Parse(int argc, char ** argv);
+        PARSER_STATE Parse(int argc, char ** argv, void * data = NULL);
+        void ParseFile(const std::string & filePath);
+
+        struct ERROR : std::runtime_error
+        {
+            explicit ERROR(const std::string & message)
+                : std::runtime_error(message.c_str()) {}
+        };

 
     private:
         std::vector<OPTION> m_options;
         std::string m_description;
 
     private:
         std::vector<OPTION> m_options;
         std::string m_description;

+
+        void OptionCallback(const std::string & key, const std::string & value);

 };
 
 class OPTION_BLOCKS
 };
 
 class OPTION_BLOCKS


@@ -94,13 +107,12 @@ class OPTION_BLOCKS
     public:
         OPTION_BLOCK & Add(const std::string & description)
         { m_blocks.push_back(OPTION_BLOCK(description)); return m_blocks.back(); }
     public:
         OPTION_BLOCK & Add(const std::string & description)
         { m_blocks.push_back(OPTION_BLOCK(description)); return m_blocks.back(); }

+        void Add(OPTION_BLOCK&& block) { m_blocks.push_back(std::move(block)); }

         void Help(size_t level) const;
         PARSER_STATE Parse(int argc, char ** argv);
 
     private:
         void Help(size_t level) const;
         PARSER_STATE Parse(int argc, char ** argv);
 
     private:

-        std::list<OPTION_BLOCK> m_blocks;
+        std::vector<OPTION_BLOCK> m_blocks;

 };
 
 } // namespace SGCONF
 };
 
 } // namespace SGCONF

-
-#endif