Merge pull request #11 from b1tflyyyy/added_index_op

Added index op

Author: b1tflyyyy

tests/utf8_string_test.cpp

@@ -188,4 +188,17 @@ TEST(utf8_string, comparison_operators)
     ASSERT_EQ(result_4, false);
     ASSERT_EQ(result_5, false);
     ASSERT_EQ(result_6, false);
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+TEST(utf8_string, index_operator)
+{
+    utf8::ustring::uchar expected{ "п" };
+    utf8::ustring ustr{ "привет" };
+
+    ASSERT_EQ(expected, ustr[0]);
+    ASSERT_NE(expected, ustr[1]);
+
+    ustr.replace_char("s", 0);
+    ASSERT_EQ(utf8::ustring::uchar{ "s" }, ustr[0]);
 }

utf8-string-lib/utf8_string.cpp

@@ -159,6 +159,17 @@ namespace utf8
         return (String != other);
     }
 
+    // -----------------------------------------------------------------------------------------------------------------
+    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);
+
+        return tmp;
+    }
+
     // -----------------------------------------------------------------------------------------------------------------
     void ustring::replace_char(std::basic_string_view<char> new_symbol, std::size_t idx)
     {
@@ -173,6 +184,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)

utf8-string-lib/utf8_string.hpp

@@ -27,6 +27,7 @@
 #include <cstring>
 #include <cstdint>
 #include <cstddef>
+#include <array>
 #include <stdexcept>
 
 #define ONE_BYTE   0b0000'0000 // first bit 0
@@ -38,6 +39,9 @@ namespace utf8
 {
     class ustring
     {
+    public:
+        typedef std::array<char, 5> uchar;
+
     public:
         friend std::ostream& operator<<(std::ostream& os, const ustring& ustr);
         friend std::istream& operator>>(std::istream& is, ustring& ustr);
@@ -68,9 +72,7 @@ namespace utf8
         bool operator!=(const std::basic_string<char>& other) const;
         bool operator!=(const std::basic_string_view<char>& other) const;
 
-        // TODO: ...............................................
-        char& operator[](std::size_t index) = delete;
-        const char& operator[](std::size_t index) const = delete;
+        const ustring::uchar operator[](std::size_t index) const;
 
         void replace_char(std::basic_string_view<char> new_symbol, std::size_t idx);