[cfe-commits] [libcxx] r111333 - in /libcxx/trunk: include/ test/re/re.alg/re.alg.replace/ test/re/re.iter/re.regiter/re.regiter.cnstr/ test/re/re.iter/re.tokiter/re.tokiter.cnstr/ test/re/re.iter/re.tokiter/re.tokiter.comp/ test/re/re.iter/re.tokiter/re.tokiter.deref/ test/re/re.iter/re.tokiter/re.tokiter.incr/
Howard Hinnant
hhinnant at apple.com
Tue Aug 17 17:13:09 PDT 2010
Author: hhinnant
Date: Tue Aug 17 19:13:08 2010
New Revision: 111333
URL: http://llvm.org/viewvc/llvm-project?rev=111333&view=rev
Log:
[re.alg.replace]. This finishes all of <regex>. That being said, <regex> is exceptionally difficult to thoroughly test. If anyone has the ability to test this, combined with the interest to do so, now would be a good time. :-)
Added:
libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test3.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test4.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test5.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test6.pass.cpp
Modified:
libcxx/trunk/include/regex
libcxx/trunk/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Tue Aug 17 19:13:08 2010
@@ -6271,6 +6271,113 @@
typedef regex_token_iterator<string::const_iterator> sregex_token_iterator;
typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
+// regex_replace
+
+template <class _OutputIterator, class _BidirectionalIterator,
+ class _Traits, class _CharT>
+_OutputIterator
+regex_replace(_OutputIterator __out,
+ _BidirectionalIterator __first, _BidirectionalIterator __last,
+ const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Iter;
+ _Iter __i(__first, __last, __e, __flags);
+ _Iter __eof;
+ if (__i == __eof)
+ {
+ if (!(__flags & regex_constants::format_no_copy))
+ __out = _STD::copy(__first, __last, __out);
+ }
+ else
+ {
+ sub_match<_BidirectionalIterator> __lm;
+ for (size_t __len = char_traits<_CharT>::length(__fmt); __i != __eof; ++__i)
+ {
+ if (!(__flags & regex_constants::format_no_copy))
+ __out = _STD::copy(__i->prefix().first, __i->prefix().second, __out);
+ __out = __i->format(__out, __fmt, __fmt + __len, __flags);
+ __lm = __i->suffix();
+ if (__flags & regex_constants::format_first_only)
+ break;
+ }
+ if (!(__flags & regex_constants::format_no_copy))
+ __out = _STD::copy(__lm.first, __lm.second, __out);
+ }
+ return __out;
+}
+
+template <class _OutputIterator, class _BidirectionalIterator,
+ class _Traits, class _CharT, class _ST, class _SA>
+inline _LIBCPP_INLINE_VISIBILITY
+_OutputIterator
+regex_replace(_OutputIterator __out,
+ _BidirectionalIterator __first, _BidirectionalIterator __last,
+ const basic_regex<_CharT, _Traits>& __e,
+ const basic_string<_CharT, _ST, _SA>& __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ return _STD::regex_replace(__out, __first, __last, __e, __fmt.c_str(), __flags);
+}
+
+template <class _Traits, class _CharT, class _ST, class _SA, class _FST,
+ class _FSA>
+inline _LIBCPP_INLINE_VISIBILITY
+basic_string<_CharT, _ST, _SA>
+regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
+ const basic_regex<_CharT, _Traits>& __e,
+ const basic_string<_CharT, _FST, _FSA>& __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ basic_string<_CharT, _ST, _SA> __r;
+ _STD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
+ __fmt.c_str(), __flags);
+ return __r;
+}
+
+template <class _Traits, class _CharT, class _ST, class _SA>
+inline _LIBCPP_INLINE_VISIBILITY
+basic_string<_CharT, _ST, _SA>
+regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
+ const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ basic_string<_CharT, _ST, _SA> __r;
+ _STD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
+ __fmt, __flags);
+ return __r;
+}
+
+template <class _Traits, class _CharT, class _ST, class _SA>
+inline _LIBCPP_INLINE_VISIBILITY
+basic_string<_CharT>
+regex_replace(const _CharT* __s,
+ const basic_regex<_CharT, _Traits>& __e,
+ const basic_string<_CharT, _ST, _SA>& __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ basic_string<_CharT> __r;
+ _STD::regex_replace(back_inserter(__r), __s,
+ __s + char_traits<_CharT>::length(__s), __e,
+ __fmt.c_str(), __flags);
+ return __r;
+}
+
+template <class _Traits, class _CharT>
+inline _LIBCPP_INLINE_VISIBILITY
+basic_string<_CharT>
+regex_replace(const _CharT* __s,
+ const basic_regex<_CharT, _Traits>& __e,
+ const _CharT* __fmt,
+ regex_constants::match_flag_type __flags = regex_constants::match_default)
+{
+ basic_string<_CharT> __r;
+ _STD::regex_replace(back_inserter(__r), __s,
+ __s + char_traits<_CharT>::length(__s), __e,
+ __fmt, __flags);
+ return __r;
+}
+
_LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_REGEX
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,107 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class OutputIterator, class BidirectionalIterator,
+// class traits, class charT, class ST, class SA>
+// OutputIterator
+// regex_replace(OutputIterator out,
+// BidirectionalIterator first, BidirectionalIterator last,
+// const basic_regex<charT, traits>& e,
+// const basic_string<charT, ST, SA>& fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+#include "../../iterators.h"
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-$&"));
+ assert(r.base() == buf+40);
+ assert(buf == std::string("123-555-1234, 123-555-2345, 123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_sed);
+ assert(r.base() == buf+43);
+ assert(buf == std::string("123-$555-1234, 123-$555-2345, 123-$555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-&"),
+ std::regex_constants::format_sed);
+ assert(r.base() == buf+40);
+ assert(buf == std::string("123-555-1234, 123-555-2345, 123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_no_copy);
+ assert(r.base() == buf+36);
+ assert(buf == std::string("123-555-1234123-555-2345123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only);
+ assert(r.base() == buf+32);
+ assert(buf == std::string("123-555-1234, 555-2345, 555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r.base() == buf+12);
+ assert(buf == std::string("123-555-1234"));
+ }
+}
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,107 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class OutputIterator, class BidirectionalIterator,
+// class traits, class charT, class ST, class SA>
+// OutputIterator
+// regex_replace(OutputIterator out,
+// BidirectionalIterator first, BidirectionalIterator last,
+// const basic_regex<charT, traits>& e,
+// const charT* fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+#include "../../iterators.h"
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-$&");
+ assert(r.base() == buf+40);
+ assert(buf == std::string("123-555-1234, 123-555-2345, 123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-$&",
+ std::regex_constants::format_sed);
+ assert(r.base() == buf+43);
+ assert(buf == std::string("123-$555-1234, 123-$555-2345, 123-$555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-&",
+ std::regex_constants::format_sed);
+ assert(r.base() == buf+40);
+ assert(buf == std::string("123-555-1234, 123-555-2345, 123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-$&",
+ std::regex_constants::format_no_copy);
+ assert(r.base() == buf+36);
+ assert(buf == std::string("123-555-1234123-555-2345123-555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only);
+ assert(r.base() == buf+32);
+ assert(buf == std::string("123-555-1234, 555-2345, 555-3456"));
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ typedef output_iterator<char*> Out;
+ typedef bidirectional_iterator<const char*> Bi;
+ char buf[100] = {0};
+ Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
+ Bi(std::end(phone_book)-1), phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r.base() == buf+12);
+ assert(buf == std::string("123-555-1234"));
+ }
+}
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test3.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test3.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test3.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,73 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class traits, class charT, class ST, class SA, class FST, class FSA>>
+// basic_string<charT, ST, SA>
+// regex_replace(const basic_string<charT, ST, SA>& s,
+// const basic_regex<charT, traits>& e,
+// const basic_string<charT, FST, FSA>& fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"));
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_sed);
+ assert(r == "123-$555-1234, 123-$555-2345, 123-$555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-&"),
+ std::regex_constants::format_sed);
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234123-555-2345123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only);
+ assert(r == "123-555-1234, 555-2345, 555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234");
+ }
+}
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test4.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test4.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test4.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,72 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class traits, class charT, class ST, class SA>
+// basic_string<charT, ST, SA>
+// regex_replace(const basic_string<charT, ST, SA>& s,
+// const basic_regex<charT, traits>& e, const charT* fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&");
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_sed);
+ assert(r == "123-$555-1234, 123-$555-2345, 123-$555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-&",
+ std::regex_constants::format_sed);
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234123-555-2345123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only);
+ assert(r == "123-555-1234, 555-2345, 555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ std::string phone_book("555-1234, 555-2345, 555-3456");
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234");
+ }
+}
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test5.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test5.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test5.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test5.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,73 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class traits, class charT, class ST, class SA>
+// basic_string<charT>
+// regex_replace(const charT* s,
+// const basic_regex<charT, traits>& e,
+// const basic_string<charT, ST, SA>& fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"));
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_sed);
+ assert(r == "123-$555-1234, 123-$555-2345, 123-$555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-&"),
+ std::regex_constants::format_sed);
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234123-555-2345123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only);
+ assert(r == "123-555-1234, 555-2345, 555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ std::string("123-$&"),
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234");
+ }
+}
Added: libcxx/trunk/test/re/re.alg/re.alg.replace/test6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test6.pass.cpp?rev=111333&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test6.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test6.pass.cpp Tue Aug 17 19:13:08 2010
@@ -0,0 +1,73 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// template <class traits, class charT>
+// basic_string<charT>
+// regex_replace(const charT* s,
+// const basic_regex<charT, traits>& e,
+// const charT* fmt,
+// regex_constants::match_flag_type flags =
+// regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+int main()
+{
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&");
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_sed);
+ assert(r == "123-$555-1234, 123-$555-2345, 123-$555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-&",
+ std::regex_constants::format_sed);
+ assert(r == "123-555-1234, 123-555-2345, 123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234123-555-2345123-555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only);
+ assert(r == "123-555-1234, 555-2345, 555-3456");
+ }
+ {
+ std::regex phone_numbers("\\d{3}-\\d{4}");
+ const char phone_book[] = "555-1234, 555-2345, 555-3456";
+ std::string r = std::regex_replace(phone_book, phone_numbers,
+ "123-$&",
+ std::regex_constants::format_first_only |
+ std::regex_constants::format_no_copy);
+ assert(r == "123-555-1234");
+ }
+}
Modified: libcxx/trunk/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp Tue Aug 17 19:13:08 2010
@@ -41,4 +41,4 @@
++i;
assert(i == std::cregex_iterator());
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp Tue Aug 17 19:13:08 2010
@@ -61,4 +61,4 @@
++i;
assert(i == std::cregex_token_iterator());
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp Tue Aug 17 19:13:08 2010
@@ -29,4 +29,4 @@
{
test<char>();
test<wchar_t>();
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp Tue Aug 17 19:13:08 2010
@@ -61,4 +61,4 @@
assert(i == std::cregex_token_iterator());
}
#endif
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp Tue Aug 17 19:13:08 2010
@@ -72,4 +72,4 @@
++i;
assert(i == std::cregex_token_iterator());
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp Tue Aug 17 19:13:08 2010
@@ -125,4 +125,4 @@
++i;
assert(i == std::cregex_token_iterator());
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp Tue Aug 17 19:13:08 2010
@@ -33,4 +33,4 @@
assert(!(i2 == i));
assert(i2 != i);
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp Tue Aug 17 19:13:08 2010
@@ -69,4 +69,4 @@
++i;
assert(i == std::cregex_token_iterator());
}
-}
\ No newline at end of file
+}
Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp?rev=111333&r1=111332&r2=111333&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp Tue Aug 17 19:13:08 2010
@@ -69,4 +69,4 @@
i++;
assert(i == std::cregex_token_iterator());
}
-}
\ No newline at end of file
+}
More information about the cfe-commits
mailing list