From 5cd66587988e8fc858ca1c32f7cb295966fd824d Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Fri, 13 Aug 2010 18:11:23 +0000 Subject: [PATCH] Everything under [re.regex] llvm-svn: 111024 --- libcxx/include/regex | 99 +++++++++++++++---- .../re/re.alg/re.alg.search/ecma.pass.cpp | 2 - .../re/re.alg/re.alg.search/egrep.pass.cpp | 2 - .../re/re.alg/re.alg.search/grep.pass.cpp | 2 - .../re.regex.assign/assign.il.pass.cpp | 33 +++++++ .../re.regex/re.regex.assign/assign.pass.cpp | 26 +++++ .../assign_iter_iter_flag.pass.cpp | 46 +++++++++ .../re.regex.assign/assign_ptr_flag.pass.cpp | 29 ++++++ .../assign_ptr_size_flag.pass.cpp | 25 +++++ .../assign_string_flag.pass.cpp | 31 ++++++ .../re/re.regex/re.regex.assign/copy.pass.cpp | 26 +++++ .../re/re.regex/re.regex.assign/il.pass.cpp | 27 +++++ .../re/re.regex/re.regex.assign/ptr.pass.cpp | 25 +++++ .../re.regex/re.regex.assign/string.pass.cpp | 26 +++++ .../re.regex/re.regex.construct/copy.pass.cpp | 25 +++++ .../re.regex/re.regex.construct/ptr.pass.cpp | 2 - .../re.regex.construct/ptr_flg.pass.cpp | 2 - .../re.regex.construct/string_flg.pass.cpp | 2 - .../re.regex/re.regex.locale/imbue.pass.cpp | 29 ++++++ .../re.regex.nonmemb/nothing_to_do.pass.cpp | 12 +++ .../re.regex.nmswap/swap.pass.cpp | 29 ++++++ .../tested_elsewhere.pass.cpp | 12 +++ .../re/re.regex/re.regex.swap/swap.pass.cpp | 28 ++++++ .../re/re.traits/lookup_collatename.pass.cpp | 2 - .../re/re.traits/transform_primary.pass.cpp | 2 - libcxx/test/re/re.traits/value.pass.cpp | 2 - 26 files changed, 511 insertions(+), 35 deletions(-) create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp create mode 100644 libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp diff --git a/libcxx/include/regex b/libcxx/include/regex index be49cd2948df..2e0e8e394863 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -2529,41 +2529,88 @@ public: __end_(0), __left_anchor_(false) {__parse(__il.begin(), __il.end());} - ~basic_regex(); +// ~basic_regex() = default; // basic_regex& operator=(const basic_regex&) = default; // basic_regex& operator=(basic_regex&&) = default; - basic_regex& operator=(const value_type* __p); - basic_regex& operator=(initializer_list __il); + basic_regex& operator=(const value_type* __p) + {return assign(__p);} + basic_regex& operator=(initializer_list __il) + {return assign(__il);} template - basic_regex& operator=(const basic_string& __p); + basic_regex& operator=(const basic_string& __p) + {return assign(__p);} // assign: - basic_regex& assign(const basic_regex& __that); -#ifdef _LIBCPP_MOVE - basic_regex& assign(basic_regex&& __that); -#endif - basic_regex& assign(const value_type* __p, flag_type __f = regex_constants::ECMAScript); - basic_regex& assign(const value_type* __p, size_t __len, flag_type __f); + basic_regex& assign(const basic_regex& __that) + {return *this = __that;} + basic_regex& assign(const value_type* __p, flag_type __f = regex_constants::ECMAScript) + {return assign(__p, __p + __traits_.length(__p), __f);} + basic_regex& assign(const value_type* __p, size_t __len, flag_type __f) + {return assign(__p, __p + __len, __f);} template basic_regex& assign(const basic_string& __s, - flag_type __f = regex_constants::ECMAScript); + flag_type __f = regex_constants::ECMAScript) + {return assign(__s.begin(), __s.end(), __f);} + template - basic_regex& assign(_InputIterator __first, _InputIterator __last, - flag_type __f = regex_constants::ECMAScript); + typename enable_if + < + __is_input_iterator <_InputIterator>::value && + !__is_forward_iterator<_InputIterator>::value, + basic_regex& + >::type + assign(_InputIterator __first, _InputIterator __last, + flag_type __f = regex_constants::ECMAScript) + { + basic_string<_CharT> __t(__first, __last); + return assign(__t.begin(), __t.end(), __f); + } + +private: + void __member_init(flag_type __f) + { + __flags_ = __f; + __marked_count_ = 0; + __loop_count_ = 0; + __open_count_ = 0; + __end_ = nullptr; + __left_anchor_ = false; + } +public: + + template + typename enable_if + < + __is_forward_iterator<_ForwardIterator>::value, + basic_regex& + >::type + assign(_ForwardIterator __first, _ForwardIterator __last, + flag_type __f = regex_constants::ECMAScript) + { + __member_init(__f); + __parse(__first, __last); + } + basic_regex& assign(initializer_list __il, - flag_type = regex_constants::ECMAScript); + flag_type __f = regex_constants::ECMAScript) + {return assign(__il.begin(), __il.end(), __f);} // const operations: unsigned mark_count() const {return __marked_count_;} flag_type flags() const {return __flags_;} // locale: - locale_type imbue(locale_type __loc) {return __traits_.imbue(__loc);} + locale_type imbue(locale_type __loc) + { + __member_init(ECMAScript); + __start_.reset(); + return __traits_.imbue(__loc); + } locale_type getloc() const {return __traits_.getloc();} // swap: - void swap(basic_regex&); + void swap(basic_regex& __r); private: unsigned __loop_count() const {return __loop_count_;} @@ -2810,8 +2857,26 @@ private: }; template -basic_regex<_CharT, _Traits>::~basic_regex() +void +basic_regex<_CharT, _Traits>::swap(basic_regex& __r) { + using _STD::swap; + swap(__traits_, __r.__traits_); + swap(__flags_, __r.__flags_); + swap(__marked_count_, __r.__marked_count_); + swap(__loop_count_, __r.__loop_count_); + swap(__open_count_, __r.__open_count_); + swap(__start_, __r.__start_); + swap(__end_, __r.__end_); + swap(__left_anchor_, __r.__left_anchor_); +} + +template +inline _LIBCPP_INLINE_VISIBILITY +void +swap(basic_regex<_CharT, _Traits>& __x, basic_regex<_CharT, _Traits>& __y) +{ + return __x.swap(__y); } // __lookahead diff --git a/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp index 927c37afde08..44b40fcb04b1 100644 --- a/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp @@ -16,8 +16,6 @@ // const basic_regex& e, // regex_constants::match_flag_type flags = regex_constants::match_default); -#include - #include #include diff --git a/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp index 1fd2be06ab98..3eaadce9a2e4 100644 --- a/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp @@ -16,8 +16,6 @@ // const basic_regex& e, // regex_constants::match_flag_type flags = regex_constants::match_default); -#include - #include #include diff --git a/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp index cfd08fee6d14..47dca45bb4b8 100644 --- a/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp @@ -16,8 +16,6 @@ // const basic_regex& e, // regex_constants::match_flag_type flags = regex_constants::match_default); -#include - #include #include diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp new file mode 100644 index 000000000000..c97a6fae1750 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp @@ -0,0 +1,33 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& +// assign(initializer_list il, +// flag_type f = regex_constants::ECMAScript); + +#include +#include + +int main() +{ +#ifdef _LIBCPP_MOVE + std::regex r2; + r2.assign({'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); + + r2.assign({'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}, std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); +#endif +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp new file mode 100644 index 000000000000..9c3194e55d06 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp @@ -0,0 +1,26 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& assign(const basic_regex& that); + +#include +#include + +int main() +{ + std::regex r1("(a([bc]))"); + std::regex r2; + r2.assign(r1); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp new file mode 100644 index 000000000000..b3c476fd4703 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp @@ -0,0 +1,46 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// template +// basic_regex& +// assign(InputIterator first, InputIterator last, +// flag_type f = regex_constants::ECMAScript); + +#include +#include + +#include "../../iterators.h" + +int main() +{ + typedef input_iterator I; + typedef forward_iterator F; + std::string s4("(a([bc]))"); + std::regex r2; + + r2.assign(I(s4.begin()), I(s4.end())); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); + + r2.assign(I(s4.begin()), I(s4.end()), std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); + + r2.assign(F(s4.begin()), F(s4.end())); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); + + r2.assign(F(s4.begin()), F(s4.end()), std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp new file mode 100644 index 000000000000..0668202dd955 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript); + +#include +#include + +int main() +{ + std::regex r2; + r2.assign("(a([bc]))"); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); + + r2.assign("(a([bc]))", std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp new file mode 100644 index 000000000000..2f49460f3b98 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp @@ -0,0 +1,25 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& assign(const charT* ptr, size_t len, flag_type f); + +#include +#include + +int main() +{ + std::regex r2; + r2.assign("(a([bc]))", 9, std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp new file mode 100644 index 000000000000..98925e5f4723 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp @@ -0,0 +1,31 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// template +// basic_regex& assign(const basic_string& s, +// flag_type f = regex_constants::ECMAScript); + +#include +#include + +int main() +{ + std::regex r2; + r2.assign(std::string("(a([bc]))")); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); + + r2.assign(std::string("(a([bc]))"), std::regex::extended); + assert(r2.flags() == std::regex::extended); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp new file mode 100644 index 000000000000..ca865e4657e9 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp @@ -0,0 +1,26 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& operator=(const basic_regex& e); + +#include +#include + +int main() +{ + std::regex r1("(a([bc]))"); + std::regex r2; + r2 = r1; + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp new file mode 100644 index 000000000000..5a9dc0c6e643 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& operator=(initializer_list il); + +#include +#include + +int main() +{ +#ifdef _LIBCPP_MOVE + std::regex r2; + r2 = {'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}; + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +#endif +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp new file mode 100644 index 000000000000..56413e4fb9cd --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp @@ -0,0 +1,25 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex& operator=(const charT* ptr); + +#include +#include + +int main() +{ + std::regex r2; + r2 = "(a([bc]))"; + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp new file mode 100644 index 000000000000..1e320d4aa1a1 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp @@ -0,0 +1,26 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// template +// basic_regex& operator=(const basic_string& p); + +#include +#include + +int main() +{ + std::regex r2; + r2 = std::string("(a([bc]))"); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp new file mode 100644 index 000000000000..d2fa4740665d --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp @@ -0,0 +1,25 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// basic_regex(const basic_regex& e); + +#include +#include + +int main() +{ + std::regex r1("(a([bc]))"); + std::regex r2 = r1; + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp index 23b3d17568e7..9e16dfce577b 100644 --- a/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp @@ -13,8 +13,6 @@ // basic_regex(const charT* p); -#include - #include #include diff --git a/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp index 31f9da9e4dfb..88d1ae255297 100644 --- a/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp @@ -13,8 +13,6 @@ // basic_regex(const charT* p, flag_type f = regex_constants::ECMAScript); -#include - #include #include diff --git a/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp index 56ba2af7c799..0d1ecf2665f4 100644 --- a/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp @@ -15,8 +15,6 @@ // basic_regex(const basic_string& s, // flag_type f = regex_constants::ECMAScript); -#include - #include #include diff --git a/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp new file mode 100644 index 000000000000..8677c2b2752c --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// locale_type imbue(locale_type loc); + +#include +#include +#include + +int main() +{ + std::regex r; + std::locale loc = r.imbue(std::locale("en_US")); + assert(loc.name() == "C"); + assert(r.getloc().name() == "en_US"); + loc = r.imbue(std::locale("C")); + assert(loc.name() == "en_US"); + assert(r.getloc().name() == "C"); +} diff --git a/libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp b/libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp new file mode 100644 index 000000000000..b89f168e9c4e --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp @@ -0,0 +1,12 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +int main() +{ +} diff --git a/libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp b/libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp new file mode 100644 index 000000000000..5b264c78e2a2 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// template +// void swap(basic_regex& lhs, basic_regex& rhs); + +#include +#include + +int main() +{ + std::regex r1("(a([bc]))"); + std::regex r2; + swap(r2, r1); + assert(r1.flags() == std::regex::ECMAScript); + assert(r1.mark_count() == 0); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp b/libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp new file mode 100644 index 000000000000..b89f168e9c4e --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp @@ -0,0 +1,12 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +int main() +{ +} diff --git a/libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp b/libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp new file mode 100644 index 000000000000..311706a7fd60 --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp @@ -0,0 +1,28 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template > class basic_regex; + +// void swap(basic_regex& e); + +#include +#include + +int main() +{ + std::regex r1("(a([bc]))"); + std::regex r2; + r2.swap(r1); + assert(r1.flags() == std::regex::ECMAScript); + assert(r1.mark_count() == 0); + assert(r2.flags() == std::regex::ECMAScript); + assert(r2.mark_count() == 2); +} diff --git a/libcxx/test/re/re.traits/lookup_collatename.pass.cpp b/libcxx/test/re/re.traits/lookup_collatename.pass.cpp index e2ce3d5115d6..28fb4426210d 100644 --- a/libcxx/test/re/re.traits/lookup_collatename.pass.cpp +++ b/libcxx/test/re/re.traits/lookup_collatename.pass.cpp @@ -15,8 +15,6 @@ // string_type // lookup_collatename(ForwardIterator first, ForwardIterator last) const; -#include - #include #include #include diff --git a/libcxx/test/re/re.traits/transform_primary.pass.cpp b/libcxx/test/re/re.traits/transform_primary.pass.cpp index d29c77857e70..06fe5e7527d0 100644 --- a/libcxx/test/re/re.traits/transform_primary.pass.cpp +++ b/libcxx/test/re/re.traits/transform_primary.pass.cpp @@ -16,8 +16,6 @@ // string_type // transform_primary(ForwardIterator first, ForwardIterator last) const; -#include - #include #include #include "iterators.h" diff --git a/libcxx/test/re/re.traits/value.pass.cpp b/libcxx/test/re/re.traits/value.pass.cpp index 4cbf924d833b..e5cdb173dc2f 100644 --- a/libcxx/test/re/re.traits/value.pass.cpp +++ b/libcxx/test/re/re.traits/value.pass.cpp @@ -13,8 +13,6 @@ // int value(charT ch, int radix) const; -#include - #include #include