/* 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. */
#include "simgrid/Exception.hpp"
#include "xbt/misc.h"
#include "xbt/str.h" /* headers of these functions */
+#include "xbt/string.hpp"
/** @brief Splits a string into a dynar of strings
*
/* 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 '\'':
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++;
/** @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;
}
/** @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;
}