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

bug fix

Browse Source
This commit is contained in:
邹晓航
2014-12-25 10:11:43 +08:00
parent e61b591697
commit 682f9b3ca4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
TinySTL/String.h
View File

@@ -564,7 +564,10 @@ namespace TinySTL{
} }
size_t string::rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, int cond)const{ size_t string::rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, int cond)const{
int i, j; int i, j;
for (i = pos - lengthOfS; i >= cond; --i){ //bug fix
//2014.12.25
//for (i = pos - lengthOfS; i >= cond; --i){
for (i = pos + lengthOfS; i >= cond; --i){
for (j = 0; j != lengthOfS; ++j){ for (j = 0; j != lengthOfS; ++j){
if (*(begin() + i + j) != cit[j]) if (*(begin() + i + j) != cit[j])
break; break;
@@ -576,20 +579,20 @@ namespace TinySTL{
} }
size_t string::rfind(const string& str, size_t pos) const{ size_t string::rfind(const string& str, size_t pos) const{
auto lengthOfS = str.size(); auto lengthOfS = str.size();
if (pos - 0 < lengthOfS) //if (pos - 0 < lengthOfS)
return npos; // return npos;
pos = changeVarWhenEuqalNPOS(pos, size(), 1); pos = changeVarWhenEuqalNPOS(pos, size(), 1);
return rfind_aux(str.begin(), pos, lengthOfS, 0); return rfind_aux(str.begin(), pos, lengthOfS, 0);
} }
size_t string::rfind(const char* s, size_t pos) const{ size_t string::rfind(const char* s, size_t pos) const{
pos = changeVarWhenEuqalNPOS(pos, size(), 1); pos = changeVarWhenEuqalNPOS(pos, size(), 1);
return rfind(s, pos, pos + 1); return rfind(s, pos, strlen(s));
} }
size_t string::rfind(const char* s, size_t pos, size_t n) const{ size_t string::rfind(const char* s, size_t pos, size_t n) const{
auto lengthOfS = strlen(s); auto lengthOfS = strlen(s);
if (n < lengthOfS) //if (n < lengthOfS)
return npos; // return npos;
return rfind_aux(s, pos, lengthOfS, pos - n); return rfind_aux(s, pos, n, 0);
} }
int string::compare(const string& str) const{ int string::compare(const string& str) const{
return compare(0, size(), str, 0, str.size()); return compare(0, size(), str, 0, str.size());