replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix <rdar://problem/10255403> match_results::begin() is off by one 

llvm-svn: 141494
This commit is contained in:
Howard Hinnant 2011-10-08 14:36:16 +00:00
parent 8a984e9418
commit 2a4812fd04
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/include/regex
View File

@ -5210,11 +5210,11 @@ public:
const_reference suffix() const {return __suffix_;}
_LIBCPP_INLINE_VISIBILITY
const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin() + 1;}
const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin();}
_LIBCPP_INLINE_VISIBILITY
const_iterator end() const {return __matches_.end();}
_LIBCPP_INLINE_VISIBILITY
const_iterator cbegin() const {return empty() ? __matches_.end() : __matches_.begin() + 1;}
const_iterator cbegin() const {return empty() ? __matches_.end() : __matches_.begin();}
_LIBCPP_INLINE_VISIBILITY
const_iterator cend() const {return __matches_.end();}

4
libcxx/test/re/re.results/re.results.acc/begin_end.pass.cpp
View File

@ -27,8 +27,8 @@ test()
std::match_results<const char*>::const_iterator i = m.begin();
std::match_results<const char*>::const_iterator e = m.end();
assert(e - i == m.size() - 1);
for (int j = 1; i != e; ++i, ++j)
assert(e - i == m.size());
for (int j = 0; i != e; ++i, ++j)
assert(*i == m[j]);
}

4
libcxx/test/re/re.results/re.results.acc/cbegin_cend.pass.cpp
View File

@ -27,8 +27,8 @@ test()
std::match_results<const char*>::const_iterator i = m.cbegin();
std::match_results<const char*>::const_iterator e = m.cend();
assert(e - i == m.size() - 1);
for (int j = 1; i != e; ++i, ++j)
assert(e - i == m.size());
for (int j = 0; i != e; ++i, ++j)
assert(*i == m[j]);
}