Merge pull request #12 from b1tflyyyy/refactored_replace_char

refactored replace char method

Author: b1tflyyyy

utf8-string-lib/utf8_string.cpp

@@ -162,10 +162,8 @@ namespace utf8
     // -----------------------------------------------------------------------------------------------------------------
     const ustring::uchar ustring::operator[](std::size_t index) const
     {
-        const SSymbol_Info& symbol_info{ Symbols_Info[index] };
-
         ustring::uchar tmp{ };
-        std::memcpy(tmp.data(), String.c_str() + symbol_info.Symbol_Offset, symbol_info.Symbol_Size);
+        std::memcpy(tmp.data(), String.c_str() + Symbols_Info[index].Symbol_Offset, Symbols_Info[index].Symbol_Size);
 
         return tmp;
     }
@@ -184,20 +182,7 @@ namespace utf8
             std::basic_string<char> new_string{ };
             new_string.resize(old_string_size + new_symbol_size - old_symbol_info.Symbol_Size); // calculate & resize new string size
 
-            // TODO: refactor
-            for (std::size_t i{}, counter{}; i < old_string_size;)
-            {
-                if (i == replace_position)
-                {
-                    std::memcpy(new_string.data() + i, new_symbol.data(), new_symbol_size);
-                    counter += new_symbol_size;
-                    i += old_symbol_info.Symbol_Size;
-
-                    continue;
-                }
-
-                new_string[counter++] = String[i++];
-            }
+            Copy_With_Char_Replacing(old_string_size, replace_position, old_symbol_info.Symbol_Size, new_symbol_size, new_string, new_symbol);
 
             auto new_offset{ static_cast<std::ptrdiff_t>(new_symbol_size) - static_cast<std::ptrdiff_t>(old_symbol_info.Symbol_Size) };
             Recalculate_Symbols_Offset(idx + 1, new_offset);
@@ -271,4 +256,25 @@ namespace utf8
             }
         }
     }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    void ustring::Copy_With_Char_Replacing(std::size_t old_string_size, std::size_t replace_position, std::size_t old_symbol_size, std::size_t new_symbol_size, std::basic_string<char>& dest, std::basic_string_view<char> new_symbol)
+    {
+        // src_counter -> String
+        // dest counter -> new/dest string
+        for (std::size_t src_counter{}, dest_counter{}; src_counter < old_string_size;)
+        {
+            if (src_counter == replace_position)
+            {
+                std::memcpy(dest.data() + replace_position, new_symbol.data(), new_symbol_size); // write new symbol in the replacing position
+
+                dest_counter += new_symbol_size; // skip new symbol in replace_position
+                src_counter += old_symbol_size; // skip old symbol in the same position
+
+                continue;
+            }
+
+            dest[dest_counter++] = String[src_counter++];
+        }
+    }
 }

utf8-string-lib/utf8_string.hpp

@@ -54,7 +54,7 @@ namespace utf8
         explicit ustring(const std::basic_string<char>& default_string);
         explicit ustring(const std::basic_string_view<char>& default_string);
 
-        constexpr ~ustring() = default;
+        ~ustring() = default;
 
         explicit ustring(const ustring& other);
         explicit ustring(ustring&& other) noexcept;
@@ -80,9 +80,10 @@ namespace utf8
         [[nodiscard]] const std::basic_string<char>& get_c_str() const;
 
     private:
-        std::uint8_t Get_Size_Of_Symbol(std::uint8_t symbol);
-        void Recalculate_Symbols_Offset(std::size_t start_pos, std::ptrdiff_t new_offset);
-        void Copy_With_Metadata_To_Internal_String(const char* default_string);
+        [[clang::always_inline, gnu::always_inline]] __inline__ std::uint8_t Get_Size_Of_Symbol(std::uint8_t symbol);
+        [[clang::always_inline, gnu::always_inline]] __inline__ void Recalculate_Symbols_Offset(std::size_t start_pos, std::ptrdiff_t new_offset);
+        [[clang::always_inline, gnu::always_inline]] __inline__ void Copy_With_Metadata_To_Internal_String(const char* default_string);
+        [[clang::always_inline, gnu::always_inline]] __inline__ void Copy_With_Char_Replacing(std::size_t old_string_size, std::size_t replace_position, std::size_t old_symbol_size, std::size_t new_symbol_size, std::basic_string<char>& dest, std::basic_string_view<char> new_symbol);
 
     private:
         struct SSymbol_Info