Fixed merge issues.

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

diff --git a/projects/sgconf/options.cpp b/projects/sgconf/options.cpp
index 71f9687ce73ff9117e1f8463ae5f93997eaef509..6fddaf38583a4e5462a69426d5210fcc000d479a 100644 (file)
--- a/projects/sgconf/options.cpp
+++ b/projects/sgconf/options.cpp
@@ -29,6 +29,7 @@
 
 using SGCONF::OPTION;
 using SGCONF::OPTION_BLOCK;
+using SGCONF::OPTION_BLOCKS;
 using SGCONF::ACTION;
 using SGCONF::PARSER_STATE;
 
@@ -55,7 +56,7 @@ OPTION::OPTION(const std::string & longName,
 OPTION::OPTION(const OPTION & rhs)
     : m_shortName(rhs.m_shortName),
       m_longName(rhs.m_longName),
-      m_action(rhs.m_action),
+      m_action(rhs.m_action->Clone()),
       m_description(rhs.m_description)
 {
 }
@@ -102,30 +103,38 @@ try
     }
 catch (const ACTION::ERROR & ex)
     {
-    throw ERROR(m_longName + ": " + ex.what());
+    if (m_longName.empty())
+        throw ERROR("-" + m_shortName + ": " + ex.what());
+    else
+        throw ERROR("--" + m_longName + ", -" + m_shortName + ": " + ex.what());
     }
 }
 
-void OPTION_BLOCK::Add(const std::string & shortName,
-                       const std::string & longName,
-                       ACTION * action,
-                       const std::string & description)
+OPTION_BLOCK & OPTION_BLOCK::Add(const std::string & shortName,
+                                 const std::string & longName,
+                                 ACTION * action,
+                                 const std::string & description)
 {
 m_options.push_back(OPTION(shortName, longName, action, description));
+return *this;
 }
 
-void OPTION_BLOCK::Add(const std::string & longName,
-                       ACTION * action,
-                       const std::string & description)
+OPTION_BLOCK & OPTION_BLOCK::Add(const std::string & longName,
+                                 ACTION * action,
+                                 const std::string & description)
 {
 m_options.push_back(OPTION(longName, action, description));
+return *this;
 }
 
 void OPTION_BLOCK::Help(size_t level) const
 {
+if (m_options.empty())
+    return;
+std::cout << m_description << ":\n";
 std::for_each(m_options.begin(),
               m_options.end(),
-              std::bind2nd(std::mem_fun_ref(&OPTION::Help), level));
+              std::bind2nd(std::mem_fun_ref(&OPTION::Help), level + 1));
 }
 
 PARSER_STATE OPTION_BLOCK::Parse(int argc, char ** argv)
@@ -138,6 +147,30 @@ while (state.argc > 0 && !state.stop)
         state = it->Parse(--state.argc, ++state.argv);
     else
         break;
+    ++it;
+    }
+return state;
+}
+
+void OPTION_BLOCKS::Help(size_t level) const
+{
+std::list<OPTION_BLOCK>::const_iterator it(m_blocks.begin());
+while (it != m_blocks.end())
+    {
+    it->Help(level);
+    std::cout << "\n";
+    ++it;
+    }
+}
+
+PARSER_STATE OPTION_BLOCKS::Parse(int argc, char ** argv)
+{
+PARSER_STATE state(false, argc, argv);
+std::list<OPTION_BLOCK>::iterator it(m_blocks.begin());
+while (!state.stop && it != m_blocks.end())
+    {
+    state = it->Parse(state.argc, state.argv);
+    ++it;
     }
 return state;
 }