From 18da30894e88a2ab587f793e3ec500b1842c0966 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 23 Mar 2021 16:22:24 +0100 Subject: [PATCH] Kill now unused xbt_str_split_quoted(), xbt_str_split_quoted_in_place(). --- ChangeLog | 3 +- include/xbt/str.h | 3 - src/xbt/xbt_str.cpp | 128 --------------------------------------- src/xbt/xbt_str_test.cpp | 28 --------- 4 files changed, 2 insertions(+), 160 deletions(-) diff --git a/ChangeLog b/ChangeLog index 471c1d2c83..2016ea7ae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,8 @@ S4U: XBT: - Drop simgrid::xbt::demangle(). Please use boost::core::demangle() instead. - - Drop xbt_dynar_cursor_rm(), xbt_dynar_search_or_negative(), xbt_dynar_to_array(). + - Drop xbt_dynar_cursor_rm(), xbt_dynar_search_or_negative(), xbt_dynar_to_array(), + xbt_str_split_quoted(), xbt_str_split_quoted_in_place(). C binding and interface: - Rename (lowercase) functions sg_actor_get_PID, sg_actor_get_PPID, sg_actor_by_PID. diff --git a/include/xbt/str.h b/include/xbt/str.h index c31cde157d..8ba861d2fe 100644 --- a/include/xbt/str.h +++ b/include/xbt/str.h @@ -24,9 +24,6 @@ SG_BEGIN_DECL * @{ */ -XBT_PUBLIC xbt_dynar_t xbt_str_split_quoted(const char* s); -XBT_PUBLIC xbt_dynar_t xbt_str_split_quoted_in_place(char* s); - XBT_PUBLIC long int xbt_str_parse_int(const char* str, const char* error_mesg); XBT_PUBLIC double xbt_str_parse_double(const char* str, const char* error_mesg); diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp index 52c964b941..3759f495ff 100644 --- a/src/xbt/xbt_str.cpp +++ b/src/xbt/xbt_str.cpp @@ -9,134 +9,6 @@ #include "xbt/misc.h" #include "xbt/str.h" /* headers of these functions */ #include "xbt/string.hpp" -#include - -/** @brief Just like @ref xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation - * - * The string passed as argument must be writable (not const) - * The elements of the dynar are just parts of the string passed as argument. - * So if you don't store that argument elsewhere, you should free it in addition to freeing the dynar. This can be done - * by simply freeing the first argument of the dynar: - * free(xbt_dynar_get_ptr(dynar,0)); - * - * Actually this function puts a bunch of \0 in the memory area you passed as argument to separate the elements, and - * 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 *), nullptr); - char* beg; - char* end; /* pointers around the parsed chunk */ - bool in_simple_quote = false; - bool in_double_quote = false; - bool done = false; - bool ctn = false; /* Got something in this block */ - - if (s[0] == '\0') - return res; - - beg = s; - - /* do not trim leading spaces: caller responsibility to clean his cruft */ - end = beg; - - while (not done) { - switch (*end) { - case '\\': - ctn = true; - /* Protected char; move it closer */ - memmove(end, end + 1, strlen(end)); - if (*end == '\0') - throw std::invalid_argument("String ends with \\"); - end++; /* Pass the protected char */ - break; - case '\'': - ctn = true; - 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 */ - end++; - } - break; - case '"': - ctn = true; - 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 */ - end++; - } - break; - case ' ': - case '\t': - case '\n': - case '\0': - if (*end == '\0' && (in_simple_quote || in_double_quote)) { - 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++; - break; - } - if (*end == '\0') - done = true; - - *end = '\0'; - if (ctn) { - /* Found a separator. Push the string if contains something */ - xbt_dynar_push(res, &beg); - } - ctn = false; - - if (done) - break; - - beg = ++end; - /* trim within the string, manually to speed things up */ - while (*beg == ' ') - beg++; - end = beg; - break; - default: - ctn = true; - end++; - } - } - return res; -} - -/** @brief Splits a string into a dynar of strings, taking quotes into account - * - * It basically does the same argument separation than the shell, where white spaces can be escaped and where arguments - * are never split within a quote group. - * Several subsequent spaces are ignored (unless within quotes, of course). - * You may want to trim the input string, if you want to avoid empty entries - */ -xbt_dynar_t xbt_str_split_quoted(const char *s) -{ - xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - xbt_dynar_t parsed; - char *str_to_free; /* we have to copy the string before, to handle backslashes */ - unsigned int cursor; - char *p; - - if (s[0] == '\0') - return res; - str_to_free = xbt_strdup(s); - - parsed = xbt_str_split_quoted_in_place(str_to_free); - xbt_dynar_foreach(parsed,cursor,p) { - char *q=xbt_strdup(p); - xbt_dynar_push(res,&q); - } - xbt_free(str_to_free); - xbt_dynar_shrink(res, 0); - xbt_dynar_free(&parsed); - return res; -} /** @brief Parse an integer out of a string, or raise an error * diff --git a/src/xbt/xbt_str_test.cpp b/src/xbt/xbt_str_test.cpp index ec659e4c4d..22ee6f9194 100644 --- a/src/xbt/xbt_str_test.cpp +++ b/src/xbt/xbt_str_test.cpp @@ -14,18 +14,6 @@ #include namespace { -void test_split_quoted(const std::string& name, const char* input, const std::vector& expected) -{ - INFO(name); - xbt_dynar_t a = xbt_str_split_quoted(input); - REQUIRE(xbt_dynar_length(a) == expected.size()); - unsigned i; - char* token; - xbt_dynar_foreach (a, i, token) - REQUIRE(token == expected[i]); - xbt_dynar_free(&a); -} - template void test_parse_error(F function, const std::string& name, const char* str) { INFO(name); @@ -43,22 +31,6 @@ template void test_parse_ok(F function, const std::stri TEST_CASE("xbt::str: String Handling", "xbt_str") { - SECTION("Test the function xbt_str_split_quoted") - { - test_split_quoted("Empty", "", {}); - test_split_quoted("Basic test", "toto tutu", {"toto", "tutu"}); - test_split_quoted("Useless backslashes", "\\t\\o\\t\\o \\t\\u\\t\\u", {"toto", "tutu"}); - test_split_quoted("Protected space", "toto\\ tutu", {"toto tutu"}); - test_split_quoted("Several spaces", "toto tutu", {"toto", "tutu"}); - test_split_quoted("LTrimming", " toto tatu", {"toto", "tatu"}); - test_split_quoted("Trimming", " toto tutu ", {"toto", "tutu"}); - test_split_quoted("Single quotes", "'toto tutu' tata", {"toto tutu", "tata"}); - test_split_quoted("Double quotes", "\"toto tutu\" tata", {"toto tutu", "tata"}); - test_split_quoted("Mixed quotes", "\"toto' 'tutu\" tata", {"toto' 'tutu", "tata"}); - test_split_quoted("Backslashed quotes", "\\'toto tutu\\' tata", {"'toto", "tutu'", "tata"}); - test_split_quoted("Backslashed quotes + quotes", "'toto \\'tutu' tata", {"toto 'tutu", "tata"}); - } - SECTION("Test the parsing functions") { test_parse_ok(xbt_str_parse_int, "Parse int", "42", 42); -- 2.20.1