Be more user-friendly, and give a hint for options wrongly spelled in snake_case.

[simgrid.git] / src / xbt / config.cpp

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index 67a8fadb320c16390bde155008d3a712e8f82a7f..1d54b045a1ff8dd6c70f8fd04c944c39b173902b 100644 (file)
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -16,8 +16,6 @@
 #include <stdexcept>
 #include <string>
 #include <string>
-#include <type_traits>
-#include <typeinfo>
 #include <vector>
 
 #include "simgrid/Exception.hpp"
@@ -56,12 +54,10 @@ double parse_double(const char* value)
   double res = std::strtod(value, &end);
   if (errno == ERANGE)
     throw std::range_error("out of range");
-  else if (errno)
-    xbt_die("Unexpected errno");
+  xbt_assert(errno == 0, "Unexpected errno: %d", errno);
   if (end == value || *end != '\0')
     throw std::range_error("invalid double");
-  else
-    return res;
+  return res;
 }
 
 long int parse_long(const char* value)
@@ -69,17 +65,12 @@ long int parse_long(const char* value)
   char* end;
   errno = 0;
   long int res = std::strtol(value, &end, 0);
-  if (errno) {
-    if (res == LONG_MIN && errno == ERANGE)
-      throw std::range_error("underflow");
-    else if (res == LONG_MAX && errno == ERANGE)
-      throw std::range_error("overflow");
-    xbt_die("Unexpected errno");
-  }
+  if (errno == ERANGE)
+    throw std::range_error(res == LONG_MIN ? "underflow" : "overflow");
+  xbt_assert(errno == 0, "Unexpected errno: %d", errno);
   if (end == value || *end != '\0')
     throw std::range_error("invalid integer");
-  else
-    return res;
+  return res;
 }
 
 // ***** ConfigType *****
@@ -182,7 +173,6 @@ public:
   TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function<void(T&)> callback)
       : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
   {}
-  ~TypedConfigurationElement() override = default;
 
   std::string get_string_value() override;
   const char* get_type_name() override;
@@ -299,7 +289,12 @@ inline ConfigurationElement* Config::get_dict_element(const std::string& name)
         XBT_INFO("Option %s has been renamed to %s. Consider switching.", name.c_str(), res->get_key().c_str());
       return res;
     } else {
-      std::string msg = "Bad config key: " + name + "\nExisting config keys:\n";
+      std::string msg   = "Bad config key: " + name + "\n";
+      std::string kebab = name;
+      std::replace(begin(kebab), end(kebab), '_', '-'); // convert from snake_case to kebab-case
+      if (options.count(kebab) > 0)
+        msg += "Did you mean '" + kebab + "'?\n";
+      msg += "Existing config keys:\n";
       for (auto const& elm : options)
         msg += "  " + elm.first + ": (" + elm.second->get_type_name() + ")" + elm.second->get_string_value() + "\n";
       throw std::out_of_range(msg);