Added Makefile for tests for Darwin platform.

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

diff --git a/projects/sgconf/api_action.h b/projects/sgconf/api_action.h
index 55b384479fa8bbf0b7f005dc8dc73687d82dc2ff..f27715ca5f58bf65b042f8591796a71f5bbc185f 100644 (file)
--- a/projects/sgconf/api_action.h
+++ b/projects/sgconf/api_action.h
@@ -61,17 +61,25 @@ class COMMANDS
 class API_ACTION : public ACTION
 {
     public:
 class API_ACTION : public ACTION
 {
     public:

+        struct PARAM
+        {
+            PARAM(const std::string & n,
+                  const std::string & s,
+                  const std::string & l)
+                : name(n),
+                  shortDescr(s),
+                  longDescr(l)
+            {}
+            std::string name;
+            std::string shortDescr;
+            std::string longDescr;
+        };
+

         API_ACTION(COMMANDS & commands,
                    const std::string & paramDescription,
                    bool needArgument,
         API_ACTION(COMMANDS & commands,
                    const std::string & paramDescription,
                    bool needArgument,

-                   const OPTION_BLOCK& suboptions,
-                   API_FUNCTION funPtr)
-            : m_commands(commands),
-              m_description(paramDescription),
-              m_argument(needArgument ? "1" : ""), // Hack
-              m_suboptions(suboptions),
-              m_funPtr(funPtr)
-        {}
+                   const std::vector<PARAM> & params,
+                   API_FUNCTION funPtr);

         API_ACTION(COMMANDS & commands,
                    const std::string & paramDescription,
                    bool needArgument,
         API_ACTION(COMMANDS & commands,
                    const std::string & paramDescription,
                    bool needArgument,


@@ -87,7 +95,7 @@ class API_ACTION : public ACTION
         virtual std::string ParamDescription() const { return m_description; }
         virtual std::string DefaultDescription() const { return ""; }
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
         virtual std::string ParamDescription() const { return m_description; }
         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, void * /*data*/);

 
     private:
         COMMANDS & m_commands;
 
     private:
         COMMANDS & m_commands;


@@ -101,10 +109,26 @@ class API_ACTION : public ACTION
 inline
 ACTION * MakeAPIAction(COMMANDS & commands,
                        const std::string & paramDescription,
 inline
 ACTION * MakeAPIAction(COMMANDS & commands,
                        const std::string & paramDescription,

-                       bool needArgument,
+                       const std::vector<API_ACTION::PARAM> & params,
+                       API_FUNCTION funPtr)
+{
+return new API_ACTION(commands, paramDescription, true, params, funPtr);
+}
+
+inline
+ACTION * MakeAPIAction(COMMANDS & commands,
+                       const std::vector<API_ACTION::PARAM> & params,
+                       API_FUNCTION funPtr)
+{
+return new API_ACTION(commands, "", false, params, funPtr);
+}
+
+inline
+ACTION * MakeAPIAction(COMMANDS & commands,
+                       const std::string & paramDescription,

                        API_FUNCTION funPtr)
 {
                        API_FUNCTION funPtr)
 {

-return new API_ACTION(commands, paramDescription, needArgument, funPtr);
+return new API_ACTION(commands, paramDescription, true, funPtr);

 }
 
 inline
 }
 
 inline