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

fix the bug when the default value of the argument is npos

Browse Source
This commit is contained in:
邹晓航
2014-10-11 11:36:29 +08:00
parent 34f2683733
commit 0025dbdd84
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TinySTL/String.h
View File

@@ -135,7 +135,7 @@ namespace TinySTL{
size_t find(const char* s, size_t pos = 0) const; size_t find(const char* s, size_t pos = 0) const;
size_t find(const char* s, size_t pos, size_t n) const; size_t find(const char* s, size_t pos, size_t n) const;
size_t find(char c, size_t pos = 0) const; size_t find(char c, size_t pos = 0) const;
size_t rfind(const string& str, size_t pos = npos) const; size_t rfind(const string& str, size_t pos = npos) const;//ok
size_t rfind(const char* s, size_t pos = npos) const; size_t rfind(const char* s, size_t pos = npos) const;
size_t rfind(const char* s, size_t pos, size_t n) const; size_t rfind(const char* s, size_t pos, size_t n) const;
size_t rfind(char c, size_t pos = npos) const;//ok size_t rfind(char c, size_t pos = npos) const;//ok
@@ -143,18 +143,18 @@ namespace TinySTL{
size_t find_first_of(const char* s, size_t pos = 0) const; size_t find_first_of(const char* s, size_t pos = 0) const;
size_t find_first_of(const char* s, size_t pos, size_t n) const; size_t find_first_of(const char* s, size_t pos, size_t n) const;
size_t find_first_of(char c, size_t pos = 0) const; size_t find_first_of(char c, size_t pos = 0) const;
size_t find_last_of(const string& str, size_t pos = npos) const; size_t find_last_of(const string& str, size_t pos = npos) const;//ok
size_t find_last_of(const char* s, size_t pos = npos) const; size_t find_last_of(const char* s, size_t pos = npos) const;//ok
size_t find_last_of(const char* s, size_t pos, size_t n) const; size_t find_last_of(const char* s, size_t pos, size_t n) const;
size_t find_last_of(char c, size_t pos = npos) const; size_t find_last_of(char c, size_t pos = npos) const;//ok
size_t find_first_not_of(const string& str, size_t pos = 0) const; size_t find_first_not_of(const string& str, size_t pos = 0) const;
size_t find_first_not_of(const char* s, size_t pos = 0) const; size_t find_first_not_of(const char* s, size_t pos = 0) const;
size_t find_first_not_of(const char* s, size_t pos, size_t n) const; size_t find_first_not_of(const char* s, size_t pos, size_t n) const;
size_t find_first_not_of(char c, size_t pos = 0) const; size_t find_first_not_of(char c, size_t pos = 0) const;
size_t find_last_not_of(const string& str, size_t pos = npos) const; size_t find_last_not_of(const string& str, size_t pos = npos) const;//ok
size_t find_last_not_of(const char* s, size_t pos = npos) const; size_t find_last_not_of(const char* s, size_t pos = npos) const;//ok
size_t find_last_not_of(const char* s, size_t pos, size_t n) const; size_t find_last_not_of(const char* s, size_t pos, size_t n) const;
size_t find_last_not_of(char c, size_t pos = npos) const; size_t find_last_not_of(char c, size_t pos = npos) const;//ok
string substr(size_t pos = 0, size_t len = npos) const{ string substr(size_t pos = 0, size_t len = npos) const{
if (len == npos) if (len == npos)
@@ -209,7 +209,7 @@ namespace TinySTL{
dataAllocator::destroy(start_, finish_); dataAllocator::destroy(start_, finish_);
dataAllocator::deallocate(start_, endOfStorage_ - start_); dataAllocator::deallocate(start_, endOfStorage_ - start_);
} }
size_t rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, size_t cond)const; size_t rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, int cond)const;
size_t find_aux(const_iterator cit, size_t pos, size_t lengthOfS, size_t cond)const; size_t find_aux(const_iterator cit, size_t pos, size_t lengthOfS, size_t cond)const;
int compare_aux(size_t pos, size_t len, const_iterator cit, size_t subpos, size_t sublen)const; int compare_aux(size_t pos, size_t len, const_iterator cit, size_t subpos, size_t sublen)const;
bool isContained(char ch, const_iterator first, const_iterator last)const{ bool isContained(char ch, const_iterator first, const_iterator last)const{
@@ -552,8 +552,8 @@ namespace TinySTL{
} }
return npos; return npos;
} }
size_t string::rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, size_t cond)const{ size_t string::rfind_aux(const_iterator cit, size_t pos, size_t lengthOfS, int cond)const{
size_t i, j; int i, j;
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])
@@ -568,10 +568,12 @@ namespace TinySTL{
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);
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{//ok
return rfind(s, pos, pos); pos = changeVarWhenEuqalNPOS(pos, size(), 1);
return rfind(s, pos, pos + 1);
} }
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);