Fix the bug number, bummer

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

diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp
index 0d784a1b224ede792c1b988a740a085d6d26ad67..dfd3d6b95cbc24bc92e1bcc1db26162f4c5e868a 100644 (file)
--- a/src/xbt/xbt_str.cpp
+++ b/src/xbt/xbt_str.cpp
@@ -1,6 +1,6 @@
 /* xbt_str.cpp - various helping functions to deal with strings             */
 
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. 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. */
@@ -8,6 +8,8 @@
 #include "simgrid/Exception.hpp"
 #include "xbt/misc.h"
 #include "xbt/str.h" /* headers of these functions */
+#include "xbt/string.hpp"
+#include <array>
 
 /** @brief Splits a string into a dynar of strings
  *
@@ -27,18 +29,18 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep)
 {
   xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
   const char *sep_dflt = " \t\n\r\x0B";
-  char is_sep[256] = { 1, 0 };
+  std::array<bool, 256> is_sep;
 
   /* check what are the separators */
-  memset(is_sep, 0, sizeof(is_sep));
+  is_sep.fill(false);
   if (not sep) {
     while (*sep_dflt)
-      is_sep[(unsigned char) *sep_dflt++] = 1;
+      is_sep[(unsigned char)*sep_dflt++] = true;
   } else {
     while (*sep)
-      is_sep[(unsigned char) *sep++] = 1;
+      is_sep[(unsigned char)*sep++] = true;
   }
-  is_sep[0] = 1; /* End of string is also separator */
+  is_sep[0] = true; /* End of string is also separator */
 
   /* Do the job */
   const char* p = s;
@@ -101,7 +103,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
       /* Protected char; move it closer */
       memmove(end, end + 1, strlen(end));
       if (*end == '\0')
-        THROWF(arg_error, 0, "String ends with \\");
+        throw std::invalid_argument("String ends with \\");
       end++;                    /* Pass the protected char */
       break;
     case '\'':
@@ -129,7 +131,8 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
     case '\n':
     case '\0':
       if (*end == '\0' && (in_simple_quote || in_double_quote)) {
-        THROWF(arg_error, 0, "End of string found while searching for %c in %s", (in_simple_quote ? '\'' : '"'), s);
+        throw std::invalid_argument(simgrid::xbt::string_printf("End of string found while searching for %c in %s",
+                                                                (in_simple_quote ? '\'' : '"'), s));
       }
       if (in_simple_quote || in_double_quote) {
         end++;
@@ -192,53 +195,20 @@ xbt_dynar_t xbt_str_split_quoted(const char *s)
   return res;
 }
 
-/** @brief Join a set of strings as a single string
- *
- * The parameter must be a nullptr-terminated array of chars,
- * just like xbt_dynar_to_array() produces
- */
-char *xbt_str_join_array(const char *const *strs, const char *sep)
-{
-  int amount_strings=0;
-  int len=0;
-
-  if ((not strs) || (not strs[0]))
-    return xbt_strdup("");
-
-  /* compute the length before malloc */
-  for (int i = 0; strs[i]; i++) {
-    len += strlen(strs[i]);
-    amount_strings++;
-  }
-  len += strlen(sep) * amount_strings;
-
-  /* Do the job */
-  char* res = (char*)xbt_malloc(len);
-  char* q   = res;
-  for (int i = 0; strs[i]; i++) {
-    if (i != 0) { // not first loop
-      q += snprintf(q,len, "%s%s", sep, strs[i]);
-    } else {
-      q += snprintf(q,len, "%s",strs[i]);
-    }
-  }
-  return res;
-}
-
 /** @brief Parse an integer out of a string, or raise an error
  *
  * The @a str is passed as argument to your @a error_msg, as follows:
- * @verbatim THROWF(arg_error, 0, error_msg, str); @endverbatim
+ * @verbatim throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str)); @endverbatim
  */
 long int xbt_str_parse_int(const char* str, const char* error_msg)
 {
   char* endptr;
   if (str == nullptr || str[0] == '\0')
-    THROWF(arg_error, 0, error_msg, str);
+    throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str));
 
   long int res = strtol(str, &endptr, 10);
   if (endptr[0] != '\0')
-    THROWF(arg_error, 0, error_msg, str);
+    throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str));
 
   return res;
 }
@@ -246,17 +216,17 @@ long int xbt_str_parse_int(const char* str, const char* error_msg)
 /** @brief Parse a double out of a string, or raise an error
  *
  * The @a str is passed as argument to your @a error_msg, as follows:
- * @verbatim THROWF(arg_error, 0, error_msg, str); @endverbatim
+ * @verbatim throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str)); @endverbatim
  */
 double xbt_str_parse_double(const char* str, const char* error_msg)
 {
   char *endptr;
   if (str == nullptr || str[0] == '\0')
-    THROWF(arg_error, 0, error_msg, str);
+    throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str));
 
   double res = strtod(str, &endptr);
   if (endptr[0] != '\0')
-    THROWF(arg_error, 0, error_msg, str);
+    throw std::invalid_argument(simgrid::xbt::string_printf(error_msg, str));
 
   return res;
 }