X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b4740f2c34e232bcf203b9407af5637acaecaec..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/xbt_str.cpp diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp index 90eb701824..bead714bd1 100644 --- a/src/xbt/xbt_str.cpp +++ b/src/xbt/xbt_str.cpp @@ -7,11 +7,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "src/internal_config.h" #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. * @@ -34,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,7 +56,7 @@ 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. + * Strips the whitespaces from the beginning of s. * By default (when char_list=nullptr), these characters get stripped: * * - " " (ASCII 32 (0x20)) space. @@ -77,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; } @@ -96,7 +94,7 @@ void xbt_str_ltrim(char *s, const char *char_list) memmove(s, cur, strlen(cur) + 1); } -/** @brief Strip whitespace (or other characters) from the end and the begining of a string. +/** @brief Strip whitespace (or other characters) from the end and the beginning of a string. * * Strips the whitespaces from both the beginning and the end of s. * By default (when char_list=nullptr), these characters get stripped: @@ -113,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); @@ -125,7 +123,7 @@ void xbt_str_trim(char *s, const char *char_list) * @param str the string to modify * @param from char to search * @param to char to put instead - * @param occurence number of changes to do (=0 means all) + * @param occurrence number of changes to do (=0 means all) */ void xbt_str_subst(char *str, char from, char to, int occurence) { @@ -141,31 +139,6 @@ 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 @@ -188,7 +161,7 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep) /* 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 { @@ -205,9 +178,9 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep) 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,7 +198,7 @@ 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 split 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) @@ -244,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 occurrence of the substring q = strstr(p, sep); //if substring was not found add the entire string if (nullptr == q) { - v = strlen(p); + int v = strlen(p); to_push = (char*) xbt_malloc(v + 1); memcpy(to_push, p, v); to_push[v] = '\0'; @@ -298,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; @@ -310,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 */ @@ -320,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 */ @@ -399,11 +371,12 @@ xbt_dynar_t xbt_str_split_quoted(const char *s) /** @brief Join a set of strings as a single string */ char *xbt_str_join(xbt_dynar_t dyn, const char *sep) { - int len = 1, dyn_len = xbt_dynar_length(dyn); + int len = 1; + int dyn_len = xbt_dynar_length(dyn); unsigned int cpt; char* cursor; - if (!dyn_len) + if (not dyn_len) return xbt_strdup(""); /* compute the length */ @@ -433,7 +406,7 @@ char *xbt_str_join_array(const char *const *strs, const char *sep) int amount_strings=0; int len=0; - if ((!strs) || (!strs[0])) + if ((not strs) || (not strs[0])) return xbt_strdup(""); /* compute the length before malloc */ @@ -498,15 +471,13 @@ double xbt_str_parse_double(const char* str, const char* error_msg) 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; @@ -526,15 +497,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") {