steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find_first_not_of bug fix

Browse Source
This commit is contained in:
邹晓航
2014-10-11 09:52:52 +08:00
parent 002f5335cc
commit 1ac43ce99b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
TinySTL/String.h
View File

@@ -604,7 +604,7 @@ namespace TinySTL{
return compare_aux(pos, len, s, 0, n); return compare_aux(pos, len, s, 0, n);
} }
size_t string::find_first_of(const string& str, size_t pos) const{ size_t string::find_first_of(const string& str, size_t pos) const{
return find_first_of(str.begin(), pos, str.size() - pos); return find_first_of(str.begin(), pos, size() - pos);
} }
size_t string::find_first_of(const char* s, size_t pos) const{ size_t string::find_first_of(const char* s, size_t pos) const{
return find_first_of(s, pos, size() - pos); return find_first_of(s, pos, size() - pos);
@@ -620,7 +620,7 @@ namespace TinySTL{
return find(c, pos); return find(c, pos);
} }
size_t string::find_first_not_of(const string& str, size_t pos) const{ size_t string::find_first_not_of(const string& str, size_t pos) const{
return find_first_not_of(str.begin(), pos, str.size() - pos); return find_first_not_of(str.begin(), pos, size() - pos);
} }
size_t string::find_first_not_of(const char* s, size_t pos) const{ size_t string::find_first_not_of(const char* s, size_t pos) const{
return find_first_not_of(s, pos, size() - pos); return find_first_not_of(s, pos, size() - pos);
@@ -639,26 +639,20 @@ namespace TinySTL{
} }
return npos; return npos;
} }
//size_t string::find_last_of(const string& str, size_t pos = npos) const; size_t string::find_last_of(const string& str, size_t pos) const{
if (pos == npos)
pos = size() - 1;
return find_last_of(str.begin(), pos, pos + 1);
}
size_t string::find_last_of(const char* s, size_t pos) const{ size_t string::find_last_of(const char* s, size_t pos) const{
if (pos == npos) if (pos == npos)
pos = size() - 1; pos = size() - 1;
return find_last_of(s, pos, pos + 1); return find_last_of(s, pos, pos + 1);
} }
size_t string::find_last_of(const char* s, size_t pos, size_t n) const{ size_t string::find_last_of(const char* s, size_t pos, size_t n) const{
/*size_t lengthOfS = strlen(s);*/ for (size_t i = pos; i != 0 && i != pos - n; --i){
/*if (n < lengthOfS)
return npos;*/
size_t i, j;
for (i = pos; i != 0 && i != pos - n; --i){
if (isContained((*this)[i], s, s + strlen(s))) if (isContained((*this)[i], s, s + strlen(s)))
return i; return i;
/*for (j = 0; j != lengthOfS; ++j){
if ((*this)[i + j] != s[j])
break;
}
if (j == lengthOfS)
return i;*/
} }
return npos; return npos;
} }