Add erase(), move down tests for strip()

Author: martinmoene

README.md

@@ -131,8 +131,9 @@ The following table presents types, values and simplified, short prototypes of t
 |           | string **to_uppercase**(string_view sv)                                            | string transformed to uppercase                                                                   |
 |           | string **capitalize**(string_view sv)                                              | string transformed to start with capital                                                          |
 |           | string **substring**(string_view sv, size_t pos \[, size_t count\]);               | substring starting at given position of given length, default up to end                           |
-|           | string **insert**(string_view sv, size_t pos string_view what)                     | string with substring 'what' inserted at given position                                           |
-|           | string **replace**(string_view sv, size_t pos, size_t length, string_view with)    | string with substring pos to pos+length replaced with 'whith'                                     |
+|           | string **erase**(string_view sv, size_t pos \[, size_t count\])                    | string with substring at given position of given length removed, default up to end                |
+|           | string **insert**(string_view sv, size_t pos, string_view what)                    | string with substring 'what' inserted at given position                                           |
+|           | string **replace**(string_view sv, size_t pos, size_t length, string_view with)    | string with substring pos to pos+length replaced with 'with'                                      |
 |           | string **replace_all**(string_view sv, string_view what, string_view with)         | string with all occurrences of 'what' replaced with 'with'                                        |
 |           | string **replace_first**(string_view sv, string_view what, string_view with)       | string with first occurrence of 'what' replaced with 'with'                                       |
 |           | string **replace_last**(string_view sv, string_view what, string_view with)        | string with last occurrence of 'what' replaced with 'with'                                        |
@@ -212,7 +213,6 @@ In the test runner, the version of *string-bare* is available via tag `[.version
 <p>
 
 ```
-string: Setting Windows console to print utf8 characters[unicode][windows]
 length: length of given string
 size: length of given string
 is_empty: true if string is empty
@@ -231,15 +231,16 @@ to_lowercase: string transformed to lowercase
 to_uppercase: char transformed to uppercase
 to_uppercase: string transformed to uppercase
 append: string with second string concatenated to first string
-substring: substring given position and length
-strip_left: string with characters in set removed from left of string [" \t\n"]
-strip_right: string with characters in set removed from right of string [" \t\n"]
-strip: string with characters in set removed from left and right of string [" \t\n"]
+substring: substring starting at given position of given length, default up to end
+erase: string with substring at given position of given length removed - default up to end
 insert: string with substring inserted at given position
 replace: string with substring given by position and length replaced
 replace_all: string with all occurrences of substring replaced
 replace_first: string with first occurrence of substring replaced
 replace_last: string with last occurrence of substring replaced
+strip_left: string with characters in set removed from left of string [" \t\n"]
+strip_right: string with characters in set removed from right of string [" \t\n"]
+strip: string with characters in set removed from left and right of string [" \t\n"]
 join: string with strings from collection joined separated by given separator
 split: split string into vector of string_view given delimiter - literal_delimiter
 split_left: split string into two-element tuple given delimiter - forward - literal_delimiter

include/nonstd/string.hpp

@@ -1036,6 +1036,18 @@ string_nodiscard std::basic_string<CharT> to_case( std::basic_string<CharT> text
 
 // insert()
 
+#define string_MK_ERASE(CharT)                          \
+    string_nodiscard inline std::basic_string<CharT>    \
+    erase(                                              \
+        std17::basic_string_view<CharT> text            \
+        , std::size_t pos                               \
+        , std::size_t len = npos )                      \
+        {                                               \
+            return to_string( text ).erase( pos, len ); \
+        }
+
+// insert()
+
 #define string_MK_INSERT(CharT)                         \
     string_nodiscard inline std::basic_string<CharT>    \
     insert(                                             \
@@ -1708,6 +1720,7 @@ string_MK_STARTS_WITH      ( char )
 string_MK_STARTS_WITH_CHAR ( char )
 string_MK_ENDS_WITH        ( char )
 string_MK_ENDS_WITH_CHAR   ( char )
+string_MK_ERASE            ( char )
 string_MK_INSERT           ( char )
 string_MK_REPLACE          ( char )
 string_MK_REPLACE_ALL      ( char )
@@ -1751,6 +1764,7 @@ string_MK_FIND_FIRST_OF    ( wchar_t )
 string_MK_FIND_LAST_OF     ( wchar_t )
 string_MK_FIND_FIRST_NOT_OF( wchar_t )
 string_MK_FIND_LAST_NOT_OF ( wchar_t )
+string_MK_ERASE            ( wchar_t )
 string_MK_INSERT           ( wchar_t )
 string_MK_REPLACE          ( wchar_t )
 string_MK_REPLACE_ALL      ( wchar_t )
@@ -1794,6 +1808,7 @@ string_MK_FIND_FIRST_OF    ( char8_t )
 string_MK_FIND_LAST_OF     ( char8_t )
 string_MK_FIND_FIRST_NOT_OF( char8_t )
 string_MK_FIND_LAST_NOT_OF ( char8_t )
+string_MK_ERASE            ( char8_t )
 string_MK_INSERT           ( char8_t )
 string_MK_REPLACE          ( char8_t )
 string_MK_REPLACE_ALL      ( char8_t )
@@ -1837,6 +1852,7 @@ string_MK_FIND_FIRST_OF    ( char16_t )
 string_MK_FIND_LAST_OF     ( char16_t )
 string_MK_FIND_FIRST_NOT_OF( char16_t )
 string_MK_FIND_LAST_NOT_OF ( char16_t )
+string_MK_ERASE            ( char16_t )
 string_MK_INSERT           ( char16_t )
 string_MK_REPLACE          ( char16_t )
 string_MK_REPLACE_ALL      ( char16_t )
@@ -1880,6 +1896,7 @@ string_MK_FIND_FIRST_OF    ( char32_t )
 string_MK_FIND_LAST_OF     ( char32_t )
 string_MK_FIND_FIRST_NOT_OF( char32_t )
 string_MK_FIND_LAST_NOT_OF ( char32_t )
+string_MK_ERASE            ( char32_t )
 string_MK_INSERT           ( char32_t )
 string_MK_REPLACE          ( char32_t )
 string_MK_REPLACE_ALL      ( char32_t )
@@ -1923,6 +1940,7 @@ string_MK_SPLIT_LEFT_STRING( char32_t )
 #undef string_MK_FIND_LAST_OF
 #undef string_MK_FIND_FIRST_NOT_OF
 #undef string_MK_FIND_LAST_NOT_OF
+#undef string_MK_ERASE
 #undef string_MK_INSERT
 #undef string_MK_REPLACE
 #undef string_MK_REPLACE_ALL

test/string.t.cpp

@@ -345,7 +345,7 @@ CASE( "append: string with second string concatenated to first string" )
 
 // substring()
 
-CASE( "substring: substring given position and length" )
+CASE( "substring: substring starting at given position of given length, default up to end" )
 {
     EXPECT( substring("abcxyz", 2, 3) == "cxy" );
     EXPECT( substring("abcxyz", 2   ) == "cxyz" );
@@ -360,55 +360,18 @@ CASE( "substring: substring given position and length" )
     EXPECT( substring(std17::string_view("abcxyz")      ) == "abcxyz" );
 }
 
-// strip_left()
-
-CASE( "strip_left: string with characters in set removed from left of string [\" \\t\\n\"]" )
-{
-    EXPECT( strip_left(" \t\nabc", " \t\n") == "abc" );
-    EXPECT( strip_left(" #$%&abc", " #$%&") == "abc" );
-
-    EXPECT( strip_left(std::string(" \t\nabc"), std::string(" \t\n")) == "abc" );
-    EXPECT( strip_left(std::string(" #$%&abc"), std::string(" #$%&")) == "abc" );
-
-    EXPECT( strip_left(std17::string_view(" \t\nabc"), std17::string_view(" \t\n")) == "abc" );
-    EXPECT( strip_left(std17::string_view(" #$%&abc"), std17::string_view(" #$%&")) == "abc" );
-
-    EXPECT( strip_left(stringy(" \t\nabc"), " \t\n") == "abc" );
-    EXPECT( strip_left(stringy(" #$%&abc"), " #$%&") == "abc" );
-}
-
-// strip_right()
-
-CASE( "strip_right: string with characters in set removed from right of string [\" \\t\\n\"]" )
-{
-    EXPECT( strip_right(std::string("abc \t\n"), " \t\n") == "abc" );
-    EXPECT( strip_right(std::string("abc #$%&"), " #$%&") == "abc" );
-
-    EXPECT( strip_right(std::string("abc \t\n"), std::string(" \t\n")) == "abc" );
-    EXPECT( strip_right(std::string("abc #$%&"), std::string(" #$%&")) == "abc" );
-
-    EXPECT( strip_right(std17::string_view("abc \t\n"), std17::string_view(" \t\n")) == "abc" );
-    EXPECT( strip_right(std17::string_view("abc #$%&"), std17::string_view(" #$%&")) == "abc" );
-
-    EXPECT( strip_right(stringy("abc \t\n"), " \t\n") == "abc" );
-    EXPECT( strip_right(stringy("abc #$%&"), " #$%&") == "abc" );
-}
+// erase():
 
-// strip()
-
-CASE( "strip: string with characters in set removed from left and right of string [\" \\t\\n\"]" )
+CASE( "erase: string with substring at given position of given length removed - default up to end" )
 {
-    EXPECT( strip(" \t\nabc \t\n", " \t\n") == "abc" );
-    EXPECT( strip(" #$%&abc #$%&", " #$%&") == "abc" );
-
-    EXPECT( strip(std::string(" \t\nabc \t\n"), std::string(" \t\n")) == "abc" );
-    EXPECT( strip(std::string(" #$%&abc #$%&"), std::string(" #$%&")) == "abc" );
+    EXPECT( erase("abcxyz", 3, 2) == "abcz" );
+    EXPECT( erase("abcxyz", 3   ) == "abc"  );
 
-    EXPECT( strip(std17::string_view(" \t\nabc \t\n"), std17::string_view(" \t\n")) == "abc" );
-    EXPECT( strip(std17::string_view(" #$%&abc #$%&"), std17::string_view(" #$%&")) == "abc" );
+    EXPECT( erase(std::string("abcxyz"), 3, 2) == "abcz" );
+    EXPECT( erase(std::string("abcxyz"), 3   ) == "abc"  );
 
-    EXPECT( strip(stringy(" \t\nabc \t\n"), " \t\n") == "abc" );
-    EXPECT( strip(stringy(" #$%&abc #$%&"), " #$%&") == "abc" );
+    EXPECT( erase(std17::string_view("abcxyz"), 3, 2) == "abcz" );
+    EXPECT( erase(std17::string_view("abcxyz"), 3   ) == "abc"  );
 }
 
 // insert():
@@ -456,6 +419,57 @@ CASE( "replace_last: string with last occurrence of substring replaced" )
     EXPECT( replace_last( std17::string_view("abc123mno123xyz"), std17::string_view("123"), std17::string_view("789")) == "abc123mno789xyz" );
 }
 
+// strip_left()
+
+CASE( "strip_left: string with characters in set removed from left of string [\" \\t\\n\"]" )
+{
+    EXPECT( strip_left(" \t\nabc", " \t\n") == "abc" );
+    EXPECT( strip_left(" #$%&abc", " #$%&") == "abc" );
+
+    EXPECT( strip_left(std::string(" \t\nabc"), std::string(" \t\n")) == "abc" );
+    EXPECT( strip_left(std::string(" #$%&abc"), std::string(" #$%&")) == "abc" );
+
+    EXPECT( strip_left(std17::string_view(" \t\nabc"), std17::string_view(" \t\n")) == "abc" );
+    EXPECT( strip_left(std17::string_view(" #$%&abc"), std17::string_view(" #$%&")) == "abc" );
+
+    EXPECT( strip_left(stringy(" \t\nabc"), " \t\n") == "abc" );
+    EXPECT( strip_left(stringy(" #$%&abc"), " #$%&") == "abc" );
+}
+
+// strip_right()
+
+CASE( "strip_right: string with characters in set removed from right of string [\" \\t\\n\"]" )
+{
+    EXPECT( strip_right(std::string("abc \t\n"), " \t\n") == "abc" );
+    EXPECT( strip_right(std::string("abc #$%&"), " #$%&") == "abc" );
+
+    EXPECT( strip_right(std::string("abc \t\n"), std::string(" \t\n")) == "abc" );
+    EXPECT( strip_right(std::string("abc #$%&"), std::string(" #$%&")) == "abc" );
+
+    EXPECT( strip_right(std17::string_view("abc \t\n"), std17::string_view(" \t\n")) == "abc" );
+    EXPECT( strip_right(std17::string_view("abc #$%&"), std17::string_view(" #$%&")) == "abc" );
+
+    EXPECT( strip_right(stringy("abc \t\n"), " \t\n") == "abc" );
+    EXPECT( strip_right(stringy("abc #$%&"), " #$%&") == "abc" );
+}
+
+// strip()
+
+CASE( "strip: string with characters in set removed from left and right of string [\" \\t\\n\"]" )
+{
+    EXPECT( strip(" \t\nabc \t\n", " \t\n") == "abc" );
+    EXPECT( strip(" #$%&abc #$%&", " #$%&") == "abc" );
+
+    EXPECT( strip(std::string(" \t\nabc \t\n"), std::string(" \t\n")) == "abc" );
+    EXPECT( strip(std::string(" #$%&abc #$%&"), std::string(" #$%&")) == "abc" );
+
+    EXPECT( strip(std17::string_view(" \t\nabc \t\n"), std17::string_view(" \t\n")) == "abc" );
+    EXPECT( strip(std17::string_view(" #$%&abc #$%&"), std17::string_view(" #$%&")) == "abc" );
+
+    EXPECT( strip(stringy(" \t\nabc \t\n"), " \t\n") == "abc" );
+    EXPECT( strip(stringy(" #$%&abc #$%&"), " #$%&") == "abc" );
+}
+
 //
 // Join, split:
 //