diff options
| -rw-r--r-- | libcxx/include/regex | 4 | ||||
| -rw-r--r-- | libcxx/test/std/re/re.regex/re.regex.assign/assign.pass.cpp | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index 690213a978d..39e106c4e4c 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -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 diff --git a/libcxx/test/std/re/re.regex/re.regex.assign/assign.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.assign/assign.pass.cpp index 1bd0022edbc..8bf98268c49 100644 --- a/libcxx/test/std/re/re.regex/re.regex.assign/assign.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.assign/assign.pass.cpp @@ -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)); } |
