Snake_case in xbt/config.

[simgrid.git] / include / xbt / config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index f773739..852bdad 100644 (file)
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -25,15 +25,6 @@
 namespace simgrid {
 namespace config {
 
-class XBT_PUBLIC missing_key_error : public std::runtime_error {
-public:
-  explicit missing_key_error(const std::string& what)
-    : std::runtime_error(what) {}
-  explicit missing_key_error(const char* what)
-    : std::runtime_error(what) {}
-  ~missing_key_error() override;
-};
-
 template<class T> inline
 std::string to_string(T&& value)
 {
@@ -54,12 +45,12 @@ inline std::string to_string(std::string&& value)
 
 // Get config
 
-template <class T> XBT_PUBLIC T const& getConfig(const char* name);
+template <class T> XBT_PUBLIC T const& get_config(const char* name);
 
-extern template XBT_PUBLIC int const& getConfig<int>(const char* name);
-extern template XBT_PUBLIC double const& getConfig<double>(const char* name);
-extern template XBT_PUBLIC bool const& getConfig<bool>(const char* name);
-extern template XBT_PUBLIC std::string const& getConfig<std::string>(const char* name);
+extern template XBT_PUBLIC int const& get_config<int>(const char* name);
+extern template XBT_PUBLIC double const& get_config<double>(const char* name);
+extern template XBT_PUBLIC bool const& get_config<bool>(const char* name);
+extern template XBT_PUBLIC std::string const& get_config<std::string>(const char* name);
 
 // Register:
 
@@ -85,15 +76,7 @@ extern template XBT_PUBLIC void declareFlag(const char* name, const char* descri
 
 // ***** alias *****
 
-XBT_PUBLIC void alias(const char* realname, const char* aliasname);
-
-inline
-void alias(std::initializer_list<const char*> names)
-{
-  auto i = names.begin();
-  for (++i; i != names.end(); ++i)
-    alias(*names.begin(), *i);
-}
+XBT_PUBLIC void alias(const char* realname, std::initializer_list<const char*> aliases);
 
 /** Bind a variable to configuration flag
  *
@@ -109,11 +92,11 @@ void bindFlag(T& value, const char* name, const char* description)
   });
 }
 
-template<class T>
-void bindFlag(T& value, std::initializer_list<const char*> names, const char* description)
+template <class T>
+void bindFlag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description)
 {
-  bindFlag(value, *names.begin(), description);
-  alias(names);
+  bindFlag(value, name, description);
+  alias(name, std::move(aliases));
 }
 
 /** Bind a variable to configuration flag
@@ -127,33 +110,24 @@ void bindFlag(T& value, std::initializer_list<const char*> names, const char* de
  *  </code></pre>
  */
 // F is a checker, F : T& -> ()
-template<class T, class F>
-typename std::enable_if<std::is_same<
-  void,
-  decltype( std::declval<F>()(std::declval<const T&>()) )
->::value, void>::type
-bindFlag(T& value, std::initializer_list<const char*> names, const char* description,
-  F callback)
+template <class T, class F>
+typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+bindFlag(T& value, const char* name, const char* description, F callback)
 {
-  bindFlag(value, *names.begin(), description);
-  alias(names);
+  declareFlag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
+                callback(val);
+                value = std::move(val);
+              }));
 }
 
-template<class T, class F>
-typename std::enable_if<std::is_same<
-  void,
-  decltype( std::declval<F>()(std::declval<const T&>()) )
->::value, void>::type
-bindFlag(T& value, const char* name, const char* description,
-  F callback)
+template <class T, class F>
+typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+bindFlag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description, F callback)
 {
-  declareFlag(name, description, value,
-    std::function<void(const T&)>([&value,callback](const T& val) {
-      callback(val);
-      value = std::move(val);
-    }
-  ));
+  bindFlag(value, name, description, std::move(callback));
+  alias(name, std::move(aliases));
 }
+
 template <class T, class F>
 typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
 bindFlag(T& value, const char* name, const char* description, std::map<T, std::string> valid_values, F callback)
@@ -196,13 +170,11 @@ typename std::enable_if<std::is_same<
 bindFlag(T& value, const char* name, const char* description,
   F callback)
 {
-  declareFlag(name, description, value,
-    std::function<void(const T&)>([&value, callback](const T& val) {
-      if (not callback(val))
-        throw std::range_error("invalid value.");
-        value = std::move(val);
-    })
-  );
+  declareFlag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
+                if (not callback(val))
+                  throw std::range_error("invalid value.");
+                value = std::move(val);
+              }));
 }
 
 /** A variable bound to a CLI option
@@ -229,6 +201,12 @@ public:
     simgrid::config::bindFlag(value_, name, desc);
   }
 
+  /** Constructor taking also an array of aliases for name */
+  Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value) : value_(value)
+  {
+    simgrid::config::bindFlag(value_, name, std::move(aliases), desc);
+  }
+
   /* A constructor accepting a callback that will be passed the parameter.
    * It can either return a boolean (informing whether the parameter is valid), or returning void.
    */
@@ -238,6 +216,13 @@ public:
     simgrid::config::bindFlag(value_, name, desc, std::move(callback));
   }
 
+  template <class F>
+  Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value, F callback)
+      : value_(value)
+  {
+    simgrid::config::bindFlag(value_, name, std::move(aliases), desc, std::move(callback));
+  }
+
   /* A constructor accepting a map of valid values -> their description,
    * and producing an informative error message when an invalid value is passed, or when help is passed as a value.
    */