Make regex::assign not clobber the regex in case of failure. Fixes PR#22213
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@225799 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
fe079256b2
commit
083e011d6c
@ -2599,9 +2599,7 @@ public:
|
||||
assign(_ForwardIterator __first, _ForwardIterator __last,
|
||||
flag_type __f = regex_constants::ECMAScript)
|
||||
{
|
||||
__member_init(__f);
|
||||
__parse(__first, __last);
|
||||
return *this;
|
||||
return assign(basic_regex(__first, __last, __f));
|
||||
}
|
||||
|
||||
#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
|
||||
|
@ -23,4 +23,13 @@ int main()
|
||||
r2.assign(r1);
|
||||
assert(r2.flags() == std::regex::ECMAScript);
|
||||
assert(r2.mark_count() == 2);
|
||||
assert(std::regex_search("ab", r2));
|
||||
|
||||
bool caught = false;
|
||||
try { r2.assign("(def", std::regex::extended); }
|
||||
catch(std::regex_error &) { caught = true; }
|
||||
assert(caught);
|
||||
assert(r2.flags() == std::regex::ECMAScript);
|
||||
assert(r2.mark_count() == 2);
|
||||
assert(std::regex_search("ab", r2));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user