From 7026a17a482a9f7fdd9fc41aead6a167167efb1b Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Fri, 13 Aug 2010 18:11:23 +0000
Subject: [PATCH] Everything under [re.regex]
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111024 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/regex | 99 +++++++++++++++----
test/re/re.alg/re.alg.search/ecma.pass.cpp | 2 -
test/re/re.alg/re.alg.search/egrep.pass.cpp | 2 -
test/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 +++++
test/re/re.regex/re.regex.assign/il.pass.cpp | 27 +++++
test/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 +++
test/re/re.regex/re.regex.swap/swap.pass.cpp | 28 ++++++
test/re/re.traits/lookup_collatename.pass.cpp | 2 -
test/re/re.traits/transform_primary.pass.cpp | 2 -
test/re/re.traits/value.pass.cpp | 2 -
26 files changed, 511 insertions(+), 35 deletions(-)
create mode 100644 test/re/re.regex/re.regex.assign/assign.il.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/assign.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/copy.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/il.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/ptr.pass.cpp
create mode 100644 test/re/re.regex/re.regex.assign/string.pass.cpp
create mode 100644 test/re/re.regex/re.regex.construct/copy.pass.cpp
create mode 100644 test/re/re.regex/re.regex.locale/imbue.pass.cpp
create mode 100644 test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp
create mode 100644 test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp
create mode 100644 test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp
create mode 100644 test/re/re.regex/re.regex.swap/swap.pass.cpp
diff --git a/include/regex b/include/regex
index be49cd29..2e0e8e39 100644
--- a/include/regex
+++ b/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<value_type> __il);
+ basic_regex& operator=(const value_type* __p)
+ {return assign(__p);}
+ basic_regex& operator=(initializer_list<value_type> __il)
+ {return assign(__il);}
template <class _ST, class _SA>
- basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __p);
+ basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __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 <class _ST, class _SA>
basic_regex& assign(const basic_string<value_type, _ST, _SA>& __s,
- flag_type __f = regex_constants::ECMAScript);
+ flag_type __f = regex_constants::ECMAScript)
+ {return assign(__s.begin(), __s.end(), __f);}
+
template <class _InputIterator>
- 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 <class _ForwardIterator>
+ 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<value_type> __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 <class _CharT, class _Traits>
-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 <class _CharT, class _Traits>
+inline _LIBCPP_INLINE_VISIBILITY
+void
+swap(basic_regex<_CharT, _Traits>& __x, basic_regex<_CharT, _Traits>& __y)
+{
+ return __x.swap(__y);
}
// __lookahead
diff --git a/test/re/re.alg/re.alg.search/ecma.pass.cpp b/test/re/re.alg/re.alg.search/ecma.pass.cpp
index 927c37af..44b40fcb 100644
--- a/test/re/re.alg/re.alg.search/ecma.pass.cpp
+++ b/test/re/re.alg/re.alg.search/ecma.pass.cpp
@@ -16,8 +16,6 @@
// const basic_regex<charT, traits>& e,
// regex_constants::match_flag_type flags = regex_constants::match_default);
-#include <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.alg/re.alg.search/egrep.pass.cpp b/test/re/re.alg/re.alg.search/egrep.pass.cpp
index 1fd2be06..3eaadce9 100644
--- a/test/re/re.alg/re.alg.search/egrep.pass.cpp
+++ b/test/re/re.alg/re.alg.search/egrep.pass.cpp
@@ -16,8 +16,6 @@
// const basic_regex<charT, traits>& e,
// regex_constants::match_flag_type flags = regex_constants::match_default);
-#include <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.alg/re.alg.search/grep.pass.cpp b/test/re/re.alg/re.alg.search/grep.pass.cpp
index cfd08fee..47dca45b 100644
--- a/test/re/re.alg/re.alg.search/grep.pass.cpp
+++ b/test/re/re.alg/re.alg.search/grep.pass.cpp
@@ -16,8 +16,6 @@
// const basic_regex<charT, traits>& e,
// regex_constants::match_flag_type flags = regex_constants::match_default);
-#include <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.regex/re.regex.assign/assign.il.pass.cpp b/test/re/re.regex/re.regex.assign/assign.il.pass.cpp
new file mode 100644
index 00000000..c97a6fae
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex&
+// assign(initializer_list<charT> il,
+// flag_type f = regex_constants::ECMAScript);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/assign.pass.cpp b/test/re/re.regex/re.regex.assign/assign.pass.cpp
new file mode 100644
index 00000000..9c3194e5
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& assign(const basic_regex& that);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp b/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
new file mode 100644
index 00000000..b3c476fd
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// template <class InputIterator>
+// basic_regex&
+// assign(InputIterator first, InputIterator last,
+// flag_type f = regex_constants::ECMAScript);
+
+#include <regex>
+#include <cassert>
+
+#include "../../iterators.h"
+
+int main()
+{
+ typedef input_iterator<std::string::const_iterator> I;
+ typedef forward_iterator<std::string::const_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/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp b/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp
new file mode 100644
index 00000000..0668202d
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp b/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp
new file mode 100644
index 00000000..2f49460f
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& assign(const charT* ptr, size_t len, flag_type f);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp b/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp
new file mode 100644
index 00000000..98925e5f
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// template <class string_traits, class A>
+// basic_regex& assign(const basic_string<charT, string_traits, A>& s,
+// flag_type f = regex_constants::ECMAScript);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/copy.pass.cpp b/test/re/re.regex/re.regex.assign/copy.pass.cpp
new file mode 100644
index 00000000..ca865e46
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& operator=(const basic_regex& e);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/il.pass.cpp b/test/re/re.regex/re.regex.assign/il.pass.cpp
new file mode 100644
index 00000000..5a9dc0c6
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& operator=(initializer_list<charT> il);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.assign/ptr.pass.cpp b/test/re/re.regex/re.regex.assign/ptr.pass.cpp
new file mode 100644
index 00000000..56413e4f
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex& operator=(const charT* ptr);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ std::regex r2;
+ r2 = "(a([bc]))";
+ assert(r2.flags() == std::regex::ECMAScript);
+ assert(r2.mark_count() == 2);
+}
diff --git a/test/re/re.regex/re.regex.assign/string.pass.cpp b/test/re/re.regex/re.regex.assign/string.pass.cpp
new file mode 100644
index 00000000..1e320d4a
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// template <class ST, class SA>
+// basic_regex& operator=(const basic_string<charT, ST, SA>& p);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ std::regex r2;
+ r2 = std::string("(a([bc]))");
+ assert(r2.flags() == std::regex::ECMAScript);
+ assert(r2.mark_count() == 2);
+}
diff --git a/test/re/re.regex/re.regex.construct/copy.pass.cpp b/test/re/re.regex/re.regex.construct/copy.pass.cpp
new file mode 100644
index 00000000..d2fa4740
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// basic_regex(const basic_regex& e);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.construct/ptr.pass.cpp b/test/re/re.regex/re.regex.construct/ptr.pass.cpp
index 23b3d175..9e16dfce 100644
--- a/test/re/re.regex/re.regex.construct/ptr.pass.cpp
+++ b/test/re/re.regex/re.regex.construct/ptr.pass.cpp
@@ -13,8 +13,6 @@
// basic_regex(const charT* p);
-#include <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp b/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
index 31f9da9e..88d1ae25 100644
--- a/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
+++ b/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 <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.regex/re.regex.construct/string_flg.pass.cpp b/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
index 56ba2af7..0d1ecf26 100644
--- a/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
+++ b/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
@@ -15,8 +15,6 @@
// basic_regex(const basic_string<charT, ST, SA>& s,
// flag_type f = regex_constants::ECMAScript);
-#include <iostream>
-
#include <regex>
#include <cassert>
diff --git a/test/re/re.regex/re.regex.locale/imbue.pass.cpp b/test/re/re.regex/re.regex.locale/imbue.pass.cpp
new file mode 100644
index 00000000..8677c2b2
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// locale_type imbue(locale_type loc);
+
+#include <regex>
+#include <locale>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp b/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp
new file mode 100644
index 00000000..b89f168e
--- /dev/null
+++ b/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/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp b/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp
new file mode 100644
index 00000000..5b264c78
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// template <class charT, class traits>
+// void swap(basic_regex<charT, traits>& lhs, basic_regex<charT, traits>& rhs);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp b/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp
new file mode 100644
index 00000000..b89f168e
--- /dev/null
+++ b/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/test/re/re.regex/re.regex.swap/swap.pass.cpp b/test/re/re.regex/re.regex.swap/swap.pass.cpp
new file mode 100644
index 00000000..311706a7
--- /dev/null
+++ b/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.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class charT, class traits = regex_traits<charT>> class basic_regex;
+
+// void swap(basic_regex& e);
+
+#include <regex>
+#include <cassert>
+
+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/test/re/re.traits/lookup_collatename.pass.cpp b/test/re/re.traits/lookup_collatename.pass.cpp
index e2ce3d51..28fb4426 100644
--- a/test/re/re.traits/lookup_collatename.pass.cpp
+++ b/test/re/re.traits/lookup_collatename.pass.cpp
@@ -15,8 +15,6 @@
// string_type
// lookup_collatename(ForwardIterator first, ForwardIterator last) const;
-#include <iostream>
-
#include <regex>
#include <iterator>
#include <cassert>
diff --git a/test/re/re.traits/transform_primary.pass.cpp b/test/re/re.traits/transform_primary.pass.cpp
index d29c7785..06fe5e75 100644
--- a/test/re/re.traits/transform_primary.pass.cpp
+++ b/test/re/re.traits/transform_primary.pass.cpp
@@ -16,8 +16,6 @@
// string_type
// transform_primary(ForwardIterator first, ForwardIterator last) const;
-#include <iostream>
-
#include <regex>
#include <cassert>
#include "iterators.h"
diff --git a/test/re/re.traits/value.pass.cpp b/test/re/re.traits/value.pass.cpp
index 4cbf924d..e5cdb173 100644
--- a/test/re/re.traits/value.pass.cpp
+++ b/test/re/re.traits/value.pass.cpp
@@ -13,8 +13,6 @@
// int value(charT ch, int radix) const;
-#include <iostream>
-
#include <regex>
#include <cassert>