Changeset a6ca1bc in mainline

Timestamp:

2018-07-05T21:41:18Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

509738fd

Parents:

6c089a9

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-02 17:38:55)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:18)

Message:

cpp: fixed some bugs found by the string find tests

File:

• uspace/lib/cpp/include/impl/string.hpp (modified) (9 diffs)

uspace/lib/cpp/include/impl/string.hpp

@@ -1019 +1019 @@
             size_type find(const value_type* str, size_type pos, size_type len) const noexcept
             {
-                if (empty() || len == 0 || len - pos > size())
+                if (empty() || len == 0 || len + pos > size())
                     return npos;
 
@@ -1060 +1060 @@
             size_type rfind(const value_type* str, size_type pos, size_type len) const noexcept
             {
-                if (empty() || len == 0 || len - pos > size())
+                if (empty() || len == 0 || len + pos > size())
                     return npos;
 
@@ -1085 +1085 @@
                     return npos;
 
-                for (size_type i = min(pos, size_ - 1) + 1; i > 0; --i)
+                for (size_type i = min(pos + 1, size_ - 1) + 1; i > 0; --i)
                 {
                     if (traits_type::eq(c, data_[i - 1]))
@@ -1101 +1101 @@
             size_type find_first_of(const value_type* str, size_type pos, size_type len) const noexcept
             {
-                if (empty() || len == 0 || pos + len > size())
+                if (empty() || len == 0 || pos >= size())
                     return npos;
 
@@ -1133 +1133 @@
             size_type find_last_of(const value_type* str, size_type pos, size_type len) const noexcept
             {
-                if (empty())
+                if (empty() || len == 0)
                     return npos;
 
@@ -1162 +1162 @@
             size_type find_first_not_of(const value_type* str, size_type pos, size_type len) const noexcept
             {
-                if (empty() || len == 0 || pos + len > size())
+                if (empty() || pos >= size())
                     return npos;
 
@@ -1179 +1179 @@
             size_type find_first_not_of(const value_type* str, size_type pos = 0) const noexcept
             {
-                return find_first_not_of(str.c_str(), pos, str.size());
+                return find_first_not_of(str, pos, traits_type::length(str));
             }
 
@@ -1208 +1208 @@
                 for (size_type i = min(pos, size_ - 1) + 1; i > 0; --i)
                 {
-                    if (!is_one_of_(i - 1, str, len))
+                    if (!is_any_of_(i - 1, str, len))
                         return i - 1;
                 }
@@ -1387 +1387 @@
             }
 
-            bool is_one_of_(size_type idx, const basic_string& str) const
-            {
-                auto cstr = str.c_str();
-                for (size_type i = 0; i < str.size(); ++i)
-                {
-                    if (traits_type::eq(data_[idx], cstr[i]))
+            bool is_any_of_(size_type idx, const value_type* str, size_type len) const
+            {
+                for (size_type i = 0; i < len; ++i)
+                {
+                    if (traits_type::eq(data_[idx], str[i]))
                         return true;
                 }