X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9d0bdd2e04d23fbcc1db6e7e525cf79979c4643b..455435b8a7cc8d84037aa66104a73d4760d9666f:/include/xbt/config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index af350a5307..8200bf06c6 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -7,9 +7,12 @@
 #ifndef _XBT_CONFIG_HPP_
 #define _XBT_CONFIG_HPP_
 
+#include <xbt/base.h>
+
 #include <cstdlib>
 
 #include <functional>
+#include <initializer_list>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
@@ -21,54 +24,15 @@
 namespace simgrid {
 namespace config {
 
-bool parseBool(const char* value);
-double parseDouble(const char* value);
-long int parseLong(const char* value);
-
-template<class T> struct parse_option {
-  static inline T parse(const char* value)
-  {
-    return T(value);
-  }
-};
-
-template<> struct parse_option<std::string> {
-  static inline std::string parse(const char* value)
-  {
-    return std::string(value);
-  }
-};
-
-template<>
-struct parse_option<double> {
-  static inline double parse(const char* value)
-  {
-    return parseDouble(value);
-  }
-};
-
-template<>
-struct parse_option<int> {
-  static inline double parse(const char* value)
-  {
-    return parseLong(value);
-  }
-};
-
-template<>
-struct parse_option<bool> {
-  static inline bool parse(const char* value)
-  {
-    return parseBool(value);
-  }
+XBT_PUBLIC_CLASS 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
-T parse(const char* value)
-{
-  return parse_option<T>::parse(value);
-}
-
 template<class T> inline
 std::string to_string(T&& value)
 {
@@ -87,16 +51,49 @@ inline std::string to_string(std::string&& value)
   return std::move(value);
 }
 
+// Get config
+
+template<class T>
+XBT_PUBLIC(T const&) getConfig(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);
+
 // Register:
 
 /** Register a configuration flag
  *
  *  @param name        name of the option
  *  @param description Description of the option
+ *  @param value       Initial/default value
  *  @param callback    called with the option value
  */
+template<class T>
 XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
-  std::function<void(const char* value)> callback);
+  T value, std::function<void(const T&)> callback = std::function<void(const T&)>());
+
+extern template XBT_PUBLIC(void) declareFlag(const char* name,
+  const char* description, int value, std::function<void(int const &)> callback);
+extern template XBT_PUBLIC(void) declareFlag(const char* name,
+  const char* description, double value, std::function<void(double const &)> callback);
+extern template XBT_PUBLIC(void) declareFlag(const char* name,
+  const char* description, bool value, std::function<void(bool const &)> callback);
+extern template XBT_PUBLIC(void) declareFlag(const char* name,
+  const char* description, std::string value, std::function<void(std::string const &)> callback);
+
+// ***** 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);
+}
 
 /** Bind a variable to configuration flag
  *
@@ -107,37 +104,16 @@ XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
 template<class T>
 void bindFlag(T& value, const char* name, const char* description)
 {
-  using namespace std;
-  declareFlag(name, description, [&value](const char* val) {
-    value = simgrid::config::parse<T>(val);
+  declareFlag<T>(name, description, value, [&value](T const& val) {
+    value = val;
   });
-  xbt_cfg_setdefault_string(name, simgrid::config::to_string(value).c_str());
 }
 
-/** Bind a variable to configuration flag
- *
- *  <pre><code>
- *  static int x;
- *  simgrid::config::bindFlag(a, "x", [](const char* value) {
- *    return simgrid::config::parse(value);
- *  }
- *  </pre><code>
- */
-// F is a parser, F : const char* -> T
-template<class T, class F>
-typename std::enable_if<std::is_same<
-  T,
-  typename std::remove_cv< decltype(
-    std::declval<F>()(std::declval<const char*>())
-  ) >::type
->::value, void>::type
-bindFlag(T& value, const char* name, const char* description,
-  F callback)
+template<class T>
+void bindFlag(T& value, std::initializer_list<const char*> names, const char* description)
 {
-  declareFlag(name, description, [&value,callback](const char* val) {
-    value = callback(val);
-  });
-  xbt_cfg_setdefault_string(name, to_string(value).c_str());
+  bindFlag(value, *names.begin(), description);
+  alias(names);
 }
 
 /** Bind a variable to configuration flag
@@ -148,9 +124,21 @@ bindFlag(T& value, const char* name, const char* description,
  *    if (x < x_min || x => x_max)
  *      throw std::range_error("must be in [x_min, x_max)")
  *  });
- *  </pre><code>
+ *  </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)
+{
+  bindFlag(value, *names.begin(), description);
+  alias(names);
+}
+
 template<class T, class F>
 typename std::enable_if<std::is_same<
   void,
@@ -159,12 +147,10 @@ typename std::enable_if<std::is_same<
 bindFlag(T& value, const char* name, const char* description,
   F callback)
 {
-  declareFlag(name, description, [&value,callback](const char* val) {
-    T res = parse<T>(val);
-    callback(res);
-    value = std::move(res);
+  declareFlag(name, description, value, [&value,callback](const T& val) {
+    callback(val);
+    value = std::move(val);
   });
-  xbt_cfg_setdefault_string(name, to_string(value).c_str());
 }
 
 /** Bind a variable to configuration flag
@@ -172,7 +158,7 @@ bindFlag(T& value, const char* name, const char* description,
  *  <pre><code>
  *  static int x;
  *  simgrid::config::bindFlag(a, "x", [](int x) { return return x > 0; });
- *  </pre><code>
+ *  </code></pre>
  */
 // F is a predicate, F : T const& -> bool
 template<class T, class F>
@@ -183,13 +169,11 @@ typename std::enable_if<std::is_same<
 bindFlag(T& value, const char* name, const char* description,
   F callback)
 {
-  declareFlag(name, description, [&value,callback](const char* val) {
-    T res = parse<T>(val);
-    if (!callback(res))
+  declareFlag(name, description, value, [&value,callback](const T& val) {
+    if (!callback(val))
       throw std::range_error("invalid value");
-    value = std::move(res);
+    value = std::move(val);
   });
-  xbt_cfg_setdefault_string(name, to_string(value).c_str());
 }
 
 /** A variable bound to a CLI option
@@ -235,14 +219,22 @@ public:
   operator T const&() const{ return value_; }
 
   // Basic interop with T:
-  Flag& operator=(T const& that) { value_ = that; return *this; }
-  Flag& operator=(T && that)     { value_ = that; return *this; }
-  bool operator==(T const& that) const { return value_ == that; }
-  bool operator!=(T const& that) const { return value_ != that; }
-  bool operator<(T const& that) const { return value_ < that; }
-  bool operator>(T const& that) const { return value_ > that; }
-  bool operator<=(T const& that) const { return value_ <= that; }
-  bool operator>=(T const& that) const { return value_ >= that; }
+  template<class U>
+  Flag& operator=(U const& that) { value_ = that; return *this; }
+  template<class U>
+  Flag& operator=(U && that)     { value_ = that; return *this; }
+  template<class U>
+  bool operator==(U const& that) const { return value_ == that; }
+  template<class U>
+  bool operator!=(U const& that) const { return value_ != that; }
+  template<class U>
+  bool operator<(U const& that) const { return value_ < that; }
+  template<class U>
+  bool operator>(U const& that) const { return value_ > that; }
+  template<class U>
+  bool operator<=(U const& that) const { return value_ <= that; }
+  template<class U>
+  bool operator>=(U const& that) const { return value_ >= that; }
 };
 
 }