X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/892e136b3be07e45110a5a2db2889470386e954a..863aeead864a309c494893a1b06ec33ed2b7daf1:/src/xbt/xbt_str.cpp diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp index 9f817dc977..6637f211da 100644 --- a/src/xbt/xbt_str.cpp +++ b/src/xbt/xbt_str.cpp @@ -6,22 +6,21 @@ /* 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 "src/internal_config.h" +#include #include "xbt/misc.h" #include "xbt/sysdep.h" #include "xbt/str.h" /* headers of these functions */ -#include "xbt/strbuff.h" /** @brief Strip whitespace (or other characters) from the end of a string. * * Strips the whitespaces from the end of s. - * By default (when char_list=NULL), these characters get stripped: + * By default (when char_list=nullptr), these characters get stripped: * * - " " (ASCII 32 (0x20)) space. * - "\t" (ASCII 9 (0x09)) tab. * - "\n" (ASCII 10 (0x0A)) line feed. * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. + * - "\0" (ASCII 0 (0x00)) nullptr. * - "\x0B" (ASCII 11 (0x0B)) vertical tab. * * @param s The string to strip. Modified in place. @@ -33,10 +32,10 @@ void xbt_str_rtrim(char *s, const char *char_list) const char *__char_list = " \t\n\r\x0B"; char white_char[256] = { 1, 0 }; - if (!s) + if (not s) return; - if (!char_list) { + if (not char_list) { while (*__char_list) { white_char[(unsigned char) *__char_list++] = 1; } @@ -58,13 +57,13 @@ void xbt_str_rtrim(char *s, const char *char_list) /** @brief Strip whitespace (or other characters) from the beginning of a string. * * Strips the whitespaces from the begining of s. - * By default (when char_list=NULL), these characters get stripped: + * By default (when char_list=nullptr), these characters get stripped: * * - " " (ASCII 32 (0x20)) space. * - "\t" (ASCII 9 (0x09)) tab. * - "\n" (ASCII 10 (0x0A)) line feed. * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. + * - "\0" (ASCII 0 (0x00)) nullptr. * - "\x0B" (ASCII 11 (0x0B)) vertical tab. * * @param s The string to strip. Modified in place. @@ -76,10 +75,10 @@ void xbt_str_ltrim(char *s, const char *char_list) const char *__char_list = " \t\n\r\x0B"; char white_char[256] = { 1, 0 }; - if (!s) + if (not s) return; - if (!char_list) { + if (not char_list) { while (*__char_list) { white_char[(unsigned char) *__char_list++] = 1; } @@ -98,13 +97,13 @@ void xbt_str_ltrim(char *s, const char *char_list) /** @brief Strip whitespace (or other characters) from the end and the begining of a string. * * Strips the whitespaces from both the beginning and the end of s. - * By default (when char_list=NULL), these characters get stripped: + * By default (when char_list=nullptr), these characters get stripped: * * - " " (ASCII 32 (0x20)) space. * - "\t" (ASCII 9 (0x09)) tab. * - "\n" (ASCII 10 (0x0A)) line feed. * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. + * - "\0" (ASCII 0 (0x00)) nullptr. * - "\x0B" (ASCII 11 (0x0B)) vertical tab. * * @param s The string to strip. @@ -112,7 +111,7 @@ void xbt_str_ltrim(char *s, const char *char_list) */ void xbt_str_trim(char *s, const char *char_list) { - if (!s) + if (not s) return; xbt_str_rtrim(s, char_list); @@ -140,74 +139,48 @@ void xbt_str_subst(char *str, char from, char to, int occurence) } } -/** @brief Replaces a set of variables by their values - * - * @param str The input of the replacement process - * @param patterns The changes to apply - * @return The string modified - * - * Both '$toto' and '${toto}' are valid (and the two writing are equivalent). - * - * If the variable name contains spaces, use the brace version (ie, ${toto tutu}) - * - * You can provide a default value to use if the variable is not set in the dict by using '${var:=default}' or - * '${var:-default}'. These two forms are equivalent, even if they shouldn't to respect the shell standard (:= form - * should set the value in the dict, but does not) (BUG). - */ -char *xbt_str_varsubst(const char *str, xbt_dict_t patterns) -{ - xbt_strbuff_t buff = xbt_strbuff_new_from(str); - char *res; - xbt_strbuff_varsubst(buff, patterns); - res = buff->data; - xbt_strbuff_free_container(buff); - return res; -} - - /** @brief Splits a string into a dynar of strings * * @param s: the string to split * @param sep: a string of all chars to consider as separator. * - * By default (with sep=NULL), these characters are used as separator: + * By default (with sep=nullptr), these characters are used as separator: * * - " " (ASCII 32 (0x20)) space. * - "\t" (ASCII 9 (0x09)) tab. * - "\n" (ASCII 10 (0x0A)) line feed. * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. + * - "\0" (ASCII 0 (0x00)) nullptr. * - "\x0B" (ASCII 11 (0x0B)) vertical tab. */ 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 *p, *q; - int done; const char *sep_dflt = " \t\n\r\x0B"; char is_sep[256] = { 1, 0 }; /* check what are the separators */ memset(is_sep, 0, sizeof(is_sep)); - if (!sep) { + if (not sep) { while (*sep_dflt) is_sep[(unsigned char) *sep_dflt++] = 1; } else { while (*sep) is_sep[(unsigned char) *sep++] = 1; } - is_sep[0] = 1; /* End of string is also separator */ + is_sep[0] = 1; /* End of string is also separator */ /* Do the job */ - p = q = s; - done = 0; + const char* p = s; + const char* q = s; + int done = 0; if (s[0] == '\0') return res; - while (!done) { + while (not done) { char *topush; - while (!is_sep[(unsigned char) *q]) { + while (not is_sep[(unsigned char)*q]) { q++; } if (*q == '\0') @@ -225,17 +198,16 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep) /** * \brief This functions splits a string after using another string as separator - * For example A!!B!!C splitted after !! will return the dynar {A,B,C} + * For example Anot not B!not C split after !! will return the dynar {A,B,C} * \return An array of dynars containing the string tokens */ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep) { xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - int done; - const char *p, *q; - p = q = s; - done = 0; + const char* p = s; + const char* q = s; + int done = 0; if (s[0] == '\0') return res; @@ -245,14 +217,13 @@ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep) return res; } - while (!done) { + while (not done) { char *to_push; - int v = 0; - //get the start of the first occurence of the substring + // get the start of the first occurrence of the substring q = strstr(p, sep); //if substring was not found add the entire string - if (NULL == q) { - v = strlen(p); + if (nullptr == q) { + int v = strlen(p); to_push = (char*) xbt_malloc(v + 1); memcpy(to_push, p, v); to_push[v] = '\0'; @@ -283,11 +254,13 @@ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep) * pushes the address of each chunk in the resulting dynar. Yes, that's uneven. Yes, that's gory. But that's efficient. */ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) { - xbt_dynar_t res = xbt_dynar_new(sizeof(char *), NULL); - char *beg, *end; /* pointers around the parsed chunk */ - int in_simple_quote = 0, in_double_quote = 0; - int done = 0; - int ctn = 0; /* Got something in this block */ + xbt_dynar_t res = xbt_dynar_new(sizeof(char *), nullptr); + char* beg; + char* end; /* pointers around the parsed chunk */ + int in_simple_quote = 0; + int in_double_quote = 0; + int done = 0; + int ctn = 0; /* Got something in this block */ if (s[0] == '\0') return res; @@ -297,7 +270,7 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) { /* do not trim leading spaces: caller responsibility to clean his cruft */ end = beg; - while (!done) { + while (not done) { switch (*end) { case '\\': ctn = 1; @@ -309,8 +282,8 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) { break; case '\'': ctn = 1; - if (!in_double_quote) { - in_simple_quote = !in_simple_quote; + if (not in_double_quote) { + in_simple_quote = not in_simple_quote; memmove(end, end + 1, strlen(end)); } else { /* simple quote protected by double ones */ @@ -319,8 +292,8 @@ xbt_dynar_t xbt_str_split_quoted_in_place(char *s) { break; case '"': ctn = 1; - if (!in_simple_quote) { - in_double_quote = !in_double_quote; + if (not in_simple_quote) { + in_double_quote = not in_double_quote; memmove(end, end + 1, strlen(end)); } else { /* double quote protected by simple ones */ @@ -400,10 +373,9 @@ char *xbt_str_join(xbt_dynar_t dyn, const char *sep) { int len = 1, dyn_len = xbt_dynar_length(dyn); unsigned int cpt; - char *cursor; - char *res, *p; + char* cursor; - if (!dyn_len) + if (not dyn_len) return xbt_strdup(""); /* compute the length */ @@ -412,8 +384,8 @@ char *xbt_str_join(xbt_dynar_t dyn, const char *sep) } len += strlen(sep) * dyn_len; /* Do the job */ - res = (char*) xbt_malloc(len); - p = res; + char* res = (char*)xbt_malloc(len); + char* p = res; xbt_dynar_foreach(dyn, cpt, cursor) { if ((int) cpt < dyn_len - 1) p += snprintf(p,len, "%s%s", cursor, sep); @@ -425,30 +397,29 @@ char *xbt_str_join(xbt_dynar_t dyn, const char *sep) /** @brief Join a set of strings as a single string * - * The parameter must be a NULL-terminated array of chars, + * 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) { - char *res,*q; int amount_strings=0; int len=0; - int i; - if ((!strs) || (!strs[0])) + if ((not strs) || (not strs[0])) return xbt_strdup(""); /* compute the length before malloc */ - for (i=0;strs[i];i++) { + for (int i = 0; strs[i]; i++) { len += strlen(strs[i]); amount_strings++; } len += strlen(sep) * amount_strings; /* Do the job */ - q = res = (char*) xbt_malloc(len); - for (i=0;strs[i];i++) { - if (i!=0) { // not first loop + 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]); @@ -457,25 +428,6 @@ char *xbt_str_join_array(const char *const *strs, const char *sep) return res; } -/** @brief creates a new string containing what can be read on a fd */ -char *xbt_str_from_file(FILE * file) -{ - xbt_strbuff_t buff = xbt_strbuff_new(); - char *res; - char bread[1024]; - memset(bread, 0, 1024); - - while (!feof(file)) { - int got = fread(bread, 1, 1023, file); - bread[got] = '\0'; - xbt_strbuff_append(buff, bread); - } - - res = buff->data; - xbt_strbuff_free_container(buff); - 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: @@ -483,8 +435,8 @@ char *xbt_str_from_file(FILE * file) */ long int xbt_str_parse_int(const char* str, const char* error_msg) { - char *endptr; - if (str == NULL || str[0] == '\0') + char* endptr; + if (str == nullptr || str[0] == '\0') THROWF(arg_error, 0, error_msg, str); long int res = strtol(str, &endptr, 10); @@ -502,7 +454,7 @@ long int xbt_str_parse_int(const char* str, const char* error_msg) double xbt_str_parse_double(const char* str, const char* error_msg) { char *endptr; - if (str == NULL || str[0] == '\0') + if (str == nullptr || str[0] == '\0') THROWF(arg_error, 0, error_msg, str); double res = strtod(str, &endptr); @@ -513,19 +465,18 @@ double xbt_str_parse_double(const char* str, const char* error_msg) } #ifdef SIMGRID_TEST +#include #include "xbt/str.h" XBT_TEST_SUITE("xbt_str", "String Handling"); -#define mytest(name, input, expected) \ - xbt_test_add(name); \ - d=xbt_str_split_quoted(input); \ - s=xbt_str_join(d,"XXX"); \ - xbt_test_assert(!strcmp(s,expected),\ - "Input (%s) leads to (%s) instead of (%s)", \ - input,s,expected);\ - free(s); \ - xbt_dynar_free(&d); +#define mytest(name, input, expected) \ + xbt_test_add(name); \ + d = xbt_str_split_quoted(input); \ + s = xbt_str_join(d, "XXX"); \ + xbt_test_assert(not strcmp(s, expected), "Input (%s) leads to (%s) instead of (%s)", input, s, expected); \ + free(s); \ + xbt_dynar_free(&d); XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted") { xbt_dynar_t d; @@ -545,15 +496,13 @@ XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_ mytest("Backslashed quotes + quotes", "'toto \\'tutu' tata", "toto 'tutuXXXtata"); } -#define mytest_str(name, input, separator, expected) \ - xbt_test_add(name); \ - d=xbt_str_split_str(input, separator); \ - s=xbt_str_join(d,"XXX"); \ - xbt_test_assert(!strcmp(s,expected),\ - "Input (%s) leads to (%s) instead of (%s)", \ - input,s,expected);\ - free(s); \ - xbt_dynar_free(&d); +#define mytest_str(name, input, separator, expected) \ + xbt_test_add(name); \ + d = xbt_str_split_str(input, separator); \ + s = xbt_str_join(d, "XXX"); \ + xbt_test_assert(not strcmp(s, expected), "Input (%s) leads to (%s) instead of (%s)", input, s, expected); \ + free(s); \ + xbt_dynar_free(&d); XBT_TEST_UNIT("xbt_str_split_str", test_split_str, "test the function xbt_str_split_str") { @@ -598,7 +547,7 @@ XBT_TEST_UNIT("xbt_str_parse", test_parse, "Test the parsing functions") test_parse_ok(xbt_str_parse_int, "Parse -1 as an int", rint, "-1", -1); test_parse_error(xbt_str_parse_int, "Parse int + noise", rint, "342 cruft"); - test_parse_error(xbt_str_parse_int, "Parse NULL as an int", rint, NULL); + test_parse_error(xbt_str_parse_int, "Parse nullptr as an int", rint, nullptr); test_parse_error(xbt_str_parse_int, "Parse '' as an int", rint, ""); test_parse_error(xbt_str_parse_int, "Parse cruft as an int", rint, "cruft"); @@ -609,7 +558,7 @@ XBT_TEST_UNIT("xbt_str_parse", test_parse, "Test the parsing functions") test_parse_ok(xbt_str_parse_double, "Parse -1 as a double", rdouble, "-1", -1); test_parse_error(xbt_str_parse_double, "Parse double + noise", rdouble, "342 cruft"); - test_parse_error(xbt_str_parse_double, "Parse NULL as a double", rdouble, NULL); + test_parse_error(xbt_str_parse_double, "Parse nullptr as a double", rdouble, nullptr); test_parse_error(xbt_str_parse_double, "Parse '' as a double", rdouble, ""); test_parse_error(xbt_str_parse_double, "Parse cruft as a double", rdouble, "cruft"); }