Implemented some user management functions.

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

diff --git a/projects/sgconf/actions.h b/projects/sgconf/actions.h
index 886e17e2568619da73bcdaf31873c0698c93853a..33a11347a27fb7a3143380f5dda1a8f3d08435c5 100644 (file)
--- a/projects/sgconf/actions.h
+++ b/projects/sgconf/actions.h
@@ -89,6 +89,7 @@ class PARAM_ACTION : public ACTION
         virtual std::string DefaultDescription() const;
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
         virtual PARSER_STATE Parse(int argc, char ** argv);
         virtual std::string DefaultDescription() const;
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
         virtual PARSER_STATE Parse(int argc, char ** argv);

+        virtual void ParseValue(const std::string & value);

 
     private:
         RESETABLE<T> & m_param;
 
     private:
         RESETABLE<T> & m_param;


@@ -118,6 +119,10 @@ template <typename T>
 inline
 PARSER_STATE PARAM_ACTION<T>::Parse(int argc, char ** argv)
 {
 inline
 PARSER_STATE PARAM_ACTION<T>::Parse(int argc, char ** argv)
 {

+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");

 T value;
 if (str2x(*argv, value))
     throw ERROR(std::string("Bad argument: '") + *argv + "'");
 T value;
 if (str2x(*argv, value))
     throw ERROR(std::string("Bad argument: '") + *argv + "'");


@@ -125,10 +130,33 @@ m_param = value;
 return PARSER_STATE(false, --argc, ++argv);
 }
 
 return PARSER_STATE(false, --argc, ++argv);
 }
 

+template <typename T>
+inline
+void PARAM_ACTION<T>::ParseValue(const std::string & stringValue)
+{
+if (stringValue.empty())
+    throw ERROR("Missing value.");
+T value;
+if (str2x(stringValue, value))
+    throw ERROR(std::string("Bad value: '") + stringValue + "'");
+m_param = value;
+}
+
+template <>
+inline
+void PARAM_ACTION<std::string>::ParseValue(const std::string & stringValue)
+{
+m_param = stringValue;
+}
+

 template <>
 inline
 PARSER_STATE PARAM_ACTION<std::string>::Parse(int argc, char ** argv)
 {
 template <>
 inline
 PARSER_STATE PARAM_ACTION<std::string>::Parse(int argc, char ** argv)
 {

+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");

 m_param = *argv;
 return PARSER_STATE(false, --argc, ++argv);
 }
 m_param = *argv;
 return PARSER_STATE(false, --argc, ++argv);
 }