add more convertToString for integers

Author: facontidavide

include/behaviortree_cpp/basic_types.h

@@ -144,16 +144,28 @@ template <>
 [[nodiscard]] const char* convertFromString<const char*>(StringView str);
 
 template <>
-[[nodiscard]] int convertFromString<int>(StringView str);
+[[nodiscard]] int8_t convertFromString<int8_t>(StringView str);
 
 template <>
-[[nodiscard]] unsigned convertFromString<unsigned>(StringView str);
+[[nodiscard]] int16_t convertFromString<int16_t>(StringView str);
 
 template <>
-[[nodiscard]] long convertFromString<long>(StringView str);
+[[nodiscard]] int32_t convertFromString<int32_t>(StringView str);
 
 template <>
-[[nodiscard]] unsigned long convertFromString<unsigned long>(StringView str);
+[[nodiscard]] int64_t convertFromString<int64_t>(StringView str);
+
+template <>
+[[nodiscard]] uint8_t convertFromString<uint8_t>(StringView str);
+
+template <>
+[[nodiscard]] uint16_t convertFromString<uint16_t>(StringView str);
+
+template <>
+[[nodiscard]] uint32_t convertFromString<uint32_t>(StringView str);
+
+template <>
+[[nodiscard]] uint64_t convertFromString<uint64_t>(StringView str);
 
 template <>
 [[nodiscard]] float convertFromString<float>(StringView str);

src/basic_types.cpp

@@ -116,51 +116,75 @@ std::string convertFromString<std::string>(StringView str)
 }
 
 template <>
-int convertFromString<int>(StringView str)
+int64_t convertFromString<int64_t>(StringView str)
 {
-  int result = 0;
+  long result = 0;
   auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
   if(ec != std::errc())
   {
-    throw RuntimeError(StrCat("Can't convert string [", str, "] to int"));
+    throw RuntimeError(StrCat("Can't convert string [", str, "] to integer"));
   }
   return result;
 }
 
 template <>
-long convertFromString<long>(StringView str)
+uint64_t convertFromString<unsigned long>(StringView str)
 {
-  long result = 0;
+  unsigned long result = 0;
   auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
   if(ec != std::errc())
   {
-    throw RuntimeError(StrCat("Can't convert string [", str, "] to long"));
+    throw RuntimeError(StrCat("Can't convert string [", str, "] to integer"));
   }
   return result;
 }
 
-template <>
-unsigned convertFromString<unsigned>(StringView str)
+template <typename T>
+T ConvertWithBoundCheck(StringView str)
 {
-  unsigned result = 0;
-  auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
-  if(ec != std::errc())
+  auto res = convertFromString<int64_t>(str);
+  if(res < std::numeric_limits<T>::lowest() || res > std::numeric_limits<T>::max())
   {
-    throw RuntimeError(StrCat("Can't convert string [", str, "] to unsigned"));
+    throw RuntimeError(
+        StrCat("Value out of bound when converting [", str, "] to integer"));
   }
-  return result;
+  return res;
 }
 
 template <>
-unsigned long convertFromString<unsigned long>(StringView str)
+int8_t convertFromString<int8_t>(StringView str)
 {
-  unsigned long result = 0;
-  auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), result);
-  if(ec != std::errc())
-  {
-    throw RuntimeError(StrCat("Can't convert string [", str, "] to unsigned long"));
-  }
-  return result;
+  return ConvertWithBoundCheck<int8_t>(str);
+}
+
+template <>
+int16_t convertFromString<int16_t>(StringView str)
+{
+  return ConvertWithBoundCheck<int16_t>(str);
+}
+
+template <>
+int32_t convertFromString<int32_t>(StringView str)
+{
+  return ConvertWithBoundCheck<int32_t>(str);
+}
+
+template <>
+uint8_t convertFromString<uint8_t>(StringView str)
+{
+  return ConvertWithBoundCheck<uint8_t>(str);
+}
+
+template <>
+uint16_t convertFromString<uint16_t>(StringView str)
+{
+  return ConvertWithBoundCheck<uint16_t>(str);
+}
+
+template <>
+uint32_t convertFromString<uint32_t>(StringView str)
+{
+  return ConvertWithBoundCheck<uint32_t>(str);
 }
 
 template <>

src/bt_factory.cpp

@@ -674,20 +674,6 @@ NodeStatus Tree::tickRoot(TickOption opt, std::chrono::milliseconds sleep_time)
   return status;
 }
 
-// void BlackboardClone(const Blackboard& src, Blackboard& dst)
-// {
-//   dst.clear();
-//   for(auto const key_name : src.getKeys())
-//   {
-//     const auto key = std::string(key_name);
-//     const auto entry = src.getEntry(key);
-//     dst.createEntry(key, entry->info);
-//     auto new_entry = dst.getEntry(key);
-//     new_entry->value = entry->value;
-//     new_entry->string_converter = entry->string_converter;
-//   }
-// }
-
 void BlackboardRestore(const std::vector<Blackboard::Ptr>& backup, Tree& tree)
 {
   assert(backup.size() == tree.subtrees.size());