mirror of
https://github.com/boostorg/regex.git
synced 2025-07-18 23:02:09 +02:00
Apply patches to regex_iteraor/regex_token_iterator to the unicode iterators as well.
[SVN r29512]
This commit is contained in:
@ -59,6 +59,8 @@ public:
|
|||||||
match_flag_type f(flags);
|
match_flag_type f(flags);
|
||||||
if(!what.length())
|
if(!what.length())
|
||||||
f |= regex_constants::match_not_initial_null;
|
f |= regex_constants::match_not_initial_null;
|
||||||
|
if(base != next_start)
|
||||||
|
f |= regex_constants::match_not_bob;
|
||||||
bool result = u32regex_search(next_start, end, what, re, f);
|
bool result = u32regex_search(next_start, end, what, re, f);
|
||||||
if(result)
|
if(result)
|
||||||
what.set_base(base);
|
what.set_base(base);
|
||||||
|
@ -130,7 +130,7 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(what.prefix().first != what[0].second)
|
if(what.prefix().first != what[0].second)
|
||||||
flags |= match_prev_avail;
|
flags |= match_prev_avail | regex_constants::match_not_bob;
|
||||||
BidirectionalIterator last_end(what[0].second);
|
BidirectionalIterator last_end(what[0].second);
|
||||||
if(u32regex_search(last_end, end, what, re, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
|
if(u32regex_search(last_end, end, what, re, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user