generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First loop test passed. The data structure and search algorithm is still crude and in-flux. But this milestone needed to be locked in. Right now every loop is implemented in terms of a structure that will handle the most complicated {min, max} loop. Though only *-loops are tested at the moment. In a future iteration *-loops will likely be optimized a little more. The only tests are for basic posix so far, but I have prototype code running for extended posix and ecma. The prototype code lacks the complicating properties of the real <regex> requirements though.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@107803 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2010-07-07 19:14:52 +00:00
parent 43b4decac5
commit f8ce459f8d
3 changed files with 766 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/__split_buffer
View File

@ -18,7 +18,7 @@ protected:
void __throw_out_of_range() const; void __throw_out_of_range() const;
}; };
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator = allocator<_Tp> >
struct __split_buffer struct __split_buffer
: private __split_buffer_common<true> : private __split_buffer_common<true>
{ {
@ -497,7 +497,7 @@ __split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
else else
{ {
size_type __c = max<size_type>(2 * (__end_cap() - __first_), 1); size_type __c = max<size_type>(2 * (__end_cap() - __first_), 1);
__split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 2) / 4, __alloc()); __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
__t.__construct_at_end(move_iterator<pointer>(__begin_), __t.__construct_at_end(move_iterator<pointer>(__begin_),
move_iterator<pointer>(__end_)); move_iterator<pointer>(__end_));
_STD::swap(__first_, __t.__first_); _STD::swap(__first_, __t.__first_);
@ -528,7 +528,7 @@ __split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
else else
{ {
size_type __c = max<size_type>(2 * (__end_cap() - __first_), 1); size_type __c = max<size_type>(2 * (__end_cap() - __first_), 1);
__split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 2) / 4, __alloc()); __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
__t.__construct_at_end(move_iterator<pointer>(__begin_), __t.__construct_at_end(move_iterator<pointer>(__begin_),
move_iterator<pointer>(__end_)); move_iterator<pointer>(__end_));
_STD::swap(__first_, __t.__first_); _STD::swap(__first_, __t.__first_);

987
include/regex
View File

File diff suppressed because it is too large Load Diff

47
test/re/re.alg/re.alg.search/basic.pass.cpp
View File

@ -104,24 +104,39 @@ int main()
} }
{ {
std::cmatch m; std::cmatch m;
const char s[] = "abcdefghijk"; const char s[] = "abbc";
assert(std::regex_search(s, m, std::regex("cd\\(\\(e\\)fg\\)hi", assert(std::regex_search(s, m, std::regex("ab*c", std::regex_constants::basic)));
std::regex_constants::basic))); assert(m.size() == 1);
assert(m.size() == 3); assert(!m.prefix().matched);
assert(m.prefix().matched);
assert(m.prefix().first == s); assert(m.prefix().first == s);
assert(m.prefix().second == m[0].first); assert(m.prefix().second == m[0].first);
assert(m.suffix().matched); assert(!m.suffix().matched);
assert(m.suffix().first == m[0].second); assert(m.suffix().first == m[0].second);
assert(m.suffix().second == s+std::regex_traits<char>::length(s)); assert(m.suffix().second == s+4);
assert(m.length(0) == 7); assert(m.length(0) == 4);
assert(m.position(0) == 2); assert(m.position(0) == 0);
assert(m.str(0) == "cdefghi"); assert(m.str(0) == s);
assert(m.length(1) == 3);
assert(m.position(1) == 4);
assert(m.str(1) == "efg");
assert(m.length(2) == 1);
assert(m.position(2) == 4);
assert(m.str(2) == "e");
} }
// {
// std::cmatch m;
// const char s[] = "abcdefghijk";
// assert(std::regex_search(s, m, std::regex("cd\\(\\(e\\)fg\\)hi",
// std::regex_constants::basic)));
// assert(m.size() == 3);
// assert(m.prefix().matched);
// assert(m.prefix().first == s);
// assert(m.prefix().second == m[0].first);
// assert(m.suffix().matched);
// assert(m.suffix().first == m[0].second);
// assert(m.suffix().second == s+std::regex_traits<char>::length(s));
// assert(m.length(0) == 7);
// assert(m.position(0) == 2);
// assert(m.str(0) == "cdefghi");
// assert(m.length(1) == 3);
// assert(m.position(1) == 4);
// assert(m.str(1) == "efg");
// assert(m.length(2) == 1);
// assert(m.position(2) == 4);
// assert(m.str(2) == "e");
// }
} }