Fix compilation.

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

diff --git a/projects/sgconf/actions.h b/projects/sgconf/actions.h
index 08dc177eb9d3eadc575a3427260eec6d4aba376a..a078e6b222fa979ead48b8bb441c5159a8494e45 100644 (file)
--- a/projects/sgconf/actions.h
+++ b/projects/sgconf/actions.h
@@ -18,17 +18,16 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONF_ACTIONS_H__
-#define __STG_SGCONF_ACTIONS_H__
+#pragma once

 
 #include "action.h"
 #include "options.h"
 #include "parser_state.h"
 
 #include "stg/common.h"
 
 #include "action.h"
 #include "options.h"
 #include "parser_state.h"
 
 #include "stg/common.h"

-#include "stg/resetable.h"

 
 #include <string>
 
 #include <string>

+#include <optional>

 
 #include <cassert>
 
 
 #include <cassert>
 


@@ -41,17 +40,15 @@ template <typename F>
 class FUNC0_ACTION : public ACTION
 {
     public:
 class FUNC0_ACTION : public ACTION
 {
     public:

-        FUNC0_ACTION(const F & func) : m_func(func) {}
+        explicit 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 PARSER_STATE Parse(int argc, char ** argv, void * /*data*/)
+        std::string ParamDescription() const override { return ""; }
+        std::string DefaultDescription() const override { return ""; }
+        OPTION_BLOCK & Suboptions() override { return m_suboptions; }
+        PARSER_STATE Parse(int argc, char ** argv, void * /*data*/) override

         {
         {

-        m_func();
-        return PARSER_STATE(true, argc, argv);
+            m_func();
+            return PARSER_STATE(true, argc, argv);

         }
 
     private:
         }
 
     private:


@@ -61,16 +58,16 @@ class FUNC0_ACTION : public ACTION
 
 template <typename F>
 inline
 
 template <typename F>
 inline

-FUNC0_ACTION<F> * MakeFunc0Action(F func)
+std::unique_ptr<ACTION> MakeFunc0Action(F func)

 {
 {

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

 }
 
 template <typename T>
 class PARAM_ACTION : public ACTION
 {
     public:
 }
 
 template <typename T>
 class PARAM_ACTION : public ACTION
 {
     public:

-        PARAM_ACTION(RESETABLE<T> & param,
+        PARAM_ACTION(std::optional<T> & param,

                      const T & defaultValue,
                      const std::string & paramDescription)
             : m_param(param),
                      const T & defaultValue,
                      const std::string & paramDescription)
             : m_param(param),


@@ -78,27 +75,25 @@ class PARAM_ACTION : public ACTION
               m_description(paramDescription),
               m_hasDefault(true)
         {}
               m_description(paramDescription),
               m_hasDefault(true)
         {}

-        PARAM_ACTION(RESETABLE<T> & param)
+        explicit PARAM_ACTION(std::optional<T> & param)

             : m_param(param),
               m_hasDefault(false)
         {}
             : m_param(param),
               m_hasDefault(false)
         {}

-        PARAM_ACTION(RESETABLE<T> & param,
+        PARAM_ACTION(std::optional<T> & param,

                      const std::string & paramDescription)
             : m_param(param),
               m_description(paramDescription),
               m_hasDefault(false)
         {}
 
                      const std::string & paramDescription)
             : m_param(param),
               m_description(paramDescription),
               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, void * /*data*/);
-        virtual void ParseValue(const std::string & value);
+        std::string ParamDescription() const override { return m_description; }
+        std::string DefaultDescription() const override;
+        OPTION_BLOCK & Suboptions() override { return m_suboptions; }
+        PARSER_STATE Parse(int argc, char ** argv, void * /*data*/) override;
+        void ParseValue(const std::string & value) override;

 
     private:
 
     private:

-        RESETABLE<T> & m_param;
+        std::optional<T> & m_param;

         T m_defaltValue;
         std::string m_description;
         bool m_hasDefault;
         T m_defaltValue;
         std::string m_description;
         bool m_hasDefault;


@@ -109,7 +104,7 @@ template <typename T>
 inline
 std::string PARAM_ACTION<T>::DefaultDescription() const
 {
 inline
 std::string PARAM_ACTION<T>::DefaultDescription() const
 {

-return m_hasDefault ? " (default: '" + x2str(m_defaltValue) + "')"
+return m_hasDefault ? " (default: '" + std::to_string(m_defaltValue) + "')"

                     : "";
 }
 
                     : "";
 }
 


@@ -177,26 +172,26 @@ return PARSER_STATE(false, --argc, ++argv);
 
 template <typename T>
 inline
 
 template <typename T>
 inline

-PARAM_ACTION<T> * MakeParamAction(RESETABLE<T> & param,
-                                  const T & defaultValue,
-                                  const std::string & paramDescription)
+std::unique_ptr<ACTION> MakeParamAction(std::optional<T> & param,
+                                        const T & defaultValue,
+                                        const std::string & paramDescription)

 {
 {

-return new PARAM_ACTION<T>(param, defaultValue, paramDescription);
+return std::make_unique<PARAM_ACTION<T>>(param, defaultValue, paramDescription);

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

-PARAM_ACTION<T> * MakeParamAction(RESETABLE<T> & param)
+std::unique_ptr<ACTION> MakeParamAction(std::optional<T> & param)

 {
 {

-return new PARAM_ACTION<T>(param);
+return std::make_unique<PARAM_ACTION<T>>(param);

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

-PARAM_ACTION<T> * MakeParamAction(RESETABLE<T> & param,
-                                  const std::string & paramDescription)
+std::unique_ptr<ACTION> MakeParamAction(std::optional<T> & param,
+                                        const std::string & paramDescription)

 {
 {

-return new PARAM_ACTION<T>(param, paramDescription);
+return std::make_unique<PARAM_ACTION<T>>(param, paramDescription);

 }
 
 class KV_ACTION : public ACTION
 }
 
 class KV_ACTION : public ACTION


@@ -208,12 +203,10 @@ class KV_ACTION : public ACTION
               m_description(paramDescription)
         {}
 
               m_description(paramDescription)
         {}
 

-        virtual ACTION * Clone() const { return new KV_ACTION(*this); }
-
-        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, void * data);
+        std::string ParamDescription() const override { return m_description; }
+        std::string DefaultDescription() const override { return ""; }
+        OPTION_BLOCK & Suboptions() override { return m_suboptions; }
+        PARSER_STATE Parse(int argc, char ** argv, void * data) override;

 
     private:
         std::string m_name;
 
     private:
         std::string m_name;


@@ -235,12 +228,10 @@ return PARSER_STATE(false, --argc, ++argv);
 }
 
 inline
 }
 
 inline

-KV_ACTION * MakeKVAction(const std::string & name,
-                         const std::string & paramDescription)
+std::unique_ptr<ACTION> MakeKVAction(const std::string & name,
+                                     const std::string & paramDescription)

 {
 {

-return new KV_ACTION(name, paramDescription);
+return std::make_unique<KV_ACTION>(name, paramDescription);

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

-
-#endif