Fixed stupid things in MySQL backend.

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

diff --git a/projects/sgconf/actions.h b/projects/sgconf/actions.h
index 739fbf14af85a886e753c1ddf96f1a46a055cd2e..33a11347a27fb7a3143380f5dda1a8f3d08435c5 100644 (file)
--- a/projects/sgconf/actions.h
+++ b/projects/sgconf/actions.h
@@ -35,29 +35,37 @@ namespace SGCONF
 
 typedef void (* FUNC0)();
 
 
 typedef void (* FUNC0)();
 

+template <typename F>

 class FUNC0_ACTION : public ACTION
 {
     public:
 class FUNC0_ACTION : public ACTION
 {
     public:

-        FUNC0_ACTION(FUNC0 func) : m_func(func) {}
+        FUNC0_ACTION(const F & func) : m_func(func) {}
+
+        virtual ACTION * Clone() const { return new FUNC0_ACTION<F>(*this); }

 
         virtual std::string ParamDescription() const { return ""; }
         virtual std::string DefaultDescription() const { return ""; }
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
 
         virtual std::string ParamDescription() const { return ""; }
         virtual std::string DefaultDescription() const { return ""; }
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }

-        virtual PARSER_STATE Parse(int argc, char ** argv);
+        virtual PARSER_STATE Parse(int argc, char ** argv)
+        {
+        m_func();
+        return PARSER_STATE(true, argc, argv);
+        }

 
     private:
 
     private:

-        FUNC0 m_func;
+        F m_func;

         OPTION_BLOCK m_suboptions;
 };
 
         OPTION_BLOCK m_suboptions;
 };
 

+template <typename F>

 inline
 inline

-FUNC0_ACTION * MakeFunc0Action(FUNC0 func)
+FUNC0_ACTION<F> * MakeFunc0Action(F func)

 {
 {

-return new FUNC0_ACTION(func);
+return new FUNC0_ACTION<F>(func);

 }
 
 template <typename T>
 }
 
 template <typename T>

-class PARAM_ACTION: public ACTION
+class PARAM_ACTION : public ACTION

 {
     public:
         PARAM_ACTION(RESETABLE<T> & param,
 {
     public:
         PARAM_ACTION(RESETABLE<T> & param,


@@ -75,10 +83,13 @@ class PARAM_ACTION: public ACTION
               m_hasDefault(false)
         {}
 
               m_hasDefault(false)
         {}
 

+        virtual ACTION * Clone() const { return new PARAM_ACTION<T>(*this); }
+

         virtual std::string ParamDescription() const { return m_description; }
         virtual std::string DefaultDescription() const;
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
         virtual PARSER_STATE Parse(int argc, char ** argv);
         virtual std::string ParamDescription() const { return m_description; }
         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;


@@ -108,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 + "'");


@@ -115,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);
 }