Fixed merge issues.

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

diff --git a/projects/sgconf/options.h b/projects/sgconf/options.h
index 696255ff6c58b28c8699e118398759fc8c16b40e..3d4bdd64263355211dcaf41ef5539506c777f40d 100644 (file)
--- a/projects/sgconf/options.h
+++ b/projects/sgconf/options.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#include <list>

 #include <stdexcept>
 #include <cstddef> // size_t
 
 #include <stdexcept>
 #include <cstddef> // size_t
 


@@ -68,13 +69,16 @@ class OPTION
 class OPTION_BLOCK
 {
     public:
 class OPTION_BLOCK
 {
     public:

-        void Add(const std::string & shortName,
-                 const std::string & longName,
-                 ACTION * action,
-                 const std::string & description);
-        void Add(const std::string & longName,
-                 ACTION * action,
-                 const std::string & description);
+        OPTION_BLOCK() {}
+        OPTION_BLOCK(const std::string & description)
+            : m_description(description) {}
+        OPTION_BLOCK & Add(const std::string & shortName,
+                           const std::string & longName,
+                           ACTION * action,
+                           const std::string & description);
+        OPTION_BLOCK & Add(const std::string & longName,
+                           ACTION * action,
+                           const std::string & description);

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


@@ -82,6 +86,19 @@ class OPTION_BLOCK
 
     private:
         std::vector<OPTION> m_options;
 
     private:
         std::vector<OPTION> m_options;

+        std::string m_description;
+};
+
+class OPTION_BLOCKS
+{
+    public:
+        OPTION_BLOCK & Add(const std::string & description)
+        { m_blocks.push_back(OPTION_BLOCK(description)); return m_blocks.back(); }
+        void Help(size_t level) const;
+        PARSER_STATE Parse(int argc, char ** argv);
+
+    private:
+        std::list<OPTION_BLOCK> m_blocks;

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