Merge branch 'master' into actor-yield

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

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 65279e8..d457e57 100644 (file)
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -1,15 +1,17 @@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_CONFIG_HPP_
-#define _XBT_CONFIG_HPP_
+#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,6 +23,15 @@
 namespace simgrid {
 namespace config {
 
+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
 std::string to_string(T&& value)
 {
@@ -71,6 +82,18 @@ extern template XBT_PUBLIC(void) declareFlag(const char* name,
 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
  *
  *  @param value Bound variable
@@ -80,12 +103,18 @@ extern template XBT_PUBLIC(void) declareFlag(const char* name,
 template<class T>
 void bindFlag(T& value, const char* name, const char* description)
 {
-  using namespace std;
   declareFlag<T>(name, description, value, [&value](T const& val) {
     value = val;
   });
 }
 
+template<class T>
+void bindFlag(T& value, std::initializer_list<const char*> names, const char* description)
+{
+  bindFlag(value, *names.begin(), description);
+  alias(names);
+}
+
 /** Bind a variable to configuration flag
  *
  *  <pre><code>
@@ -94,9 +123,21 @@ void 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,
@@ -116,7 +157,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>
@@ -127,8 +168,8 @@ typename std::enable_if<std::is_same<
 bindFlag(T& value, const char* name, const char* description,
   F callback)
 {
-  declareFlag(name, description, value, [&value,callback](const T& val) {
-    if (!callback(val))
+  declareFlag(name, description, value, [&value, callback](const T& val) {
+    if (not callback(val))
       throw std::range_error("invalid value");
     value = std::move(val);
   });
@@ -177,17 +218,26 @@ 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; }
 };
 
 }
 }
+XBT_PUBLIC(std::string) xbt_cfg_get_string(const char* name);
 
 #endif