Vendor import of libc++ trunk r300422: - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2017-04-16 16:03:23 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2017-04-16 16:03:23 +0000
commit	0dc0969cd0a732760f0aa79942a04e0eaef297c4 (patch)
tree	051bdb57b1ac6ee143f61ddbb47bd0da619f6f0c /test/std/re
parent	868847c6900e575417c03bced6e562b3af891318 (diff)

vendor/libc++/libc++-trunk-r300422

Notes

Diffstat (limited to 'test/std/re')

-rw-r--r--

test/std/re/re.alg/re.alg.match/awk.pass.cpp

-rw-r--r--

test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp

-rw-r--r--

test/std/re/re.alg/re.alg.search/backup.pass.cpp

-rw-r--r--

test/std/re/re.alg/re.alg.search/lookahead.pass.cpp

-rw-r--r--

test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp

-rw-r--r--

test/std/re/re.traits/lookup_classname.pass.cpp

-rw-r--r--

test/std/re/re.traits/translate_nocase.pass.cpp

7 files changed, 56 insertions, 55 deletions

diff --git a/test/std/re/re.alg/re.alg.match/awk.pass.cpp b/test/std/re/re.alg/re.alg.match/awk.pass.cpp
index f866929795db..9bd213f96746 100644
--- a/test/std/re/re.alg/re.alg.match/awk.pass.cpp
+++ b/test/std/re/re.alg/re.alg.match/awk.pass.cpp

@@ -26,7 +26,8 @@

int main()

{

-/* {

+#if 0

+ {

std::cmatch m;

const char s[] = "a";

assert(std::regex_match(s, m, std::regex("a", std::regex_constants::awk)));

@@ -263,7 +264,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -278,7 +279,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -293,7 +294,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -326,7 +327,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -341,7 +342,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -356,7 +357,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -378,7 +379,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -394,7 +395,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -410,7 +411,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

assert(m.length(1) == 4);

@@ -434,7 +435,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -519,7 +520,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -542,7 +543,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -572,7 +573,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -588,7 +589,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -604,7 +605,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -616,24 +617,23 @@ int main()

assert(m.size() == 0);

}

std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2));

-*/ {

- /*

+ {

std::cmatch m;

const char s[] = "m";

- assert(std::regex_match(s, m, std::regex("[a[=M=]z]",

- std::regex_constants::awk);

- assert(m.size() == 1);

+ assert(std::regex_match(s, m,

+ std::regex("[a[=M=]z]", std::regex_constants::awk)));

+ assert(m.size() == 1);

assert(!m.prefix().matched);

assert(m.prefix().first == s);

assert(m.prefix().second == m[0].first);

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

-*/ }

-/* {

+ }

+ {

std::cmatch m;

const char s[] = "Ch";

assert(std::regex_match(s, m, std::regex("[a[.ch.]z]",

@@ -645,7 +645,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -688,7 +688,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == 4);

+ assert((size_t)m.length(0) == 4);

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -704,7 +704,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == s + std::char_traits<char>::length(s));

- assert(m.length(0) == std::char_traits<char>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<char>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -720,7 +720,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == s+1);

- assert(m.length(0) == 1);

+ assert((size_t)m.length(0) == 1);

assert(m.position(0) == 0);

assert(m.str(0) == L"a");

}

@@ -735,7 +735,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == s+2);

- assert(m.length(0) == 2);

+ assert((size_t)m.length(0) == 2);

assert(m.position(0) == 0);

assert(m.str(0) == L"ab");

}

@@ -945,7 +945,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -960,7 +960,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -975,7 +975,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1008,7 +1008,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1023,7 +1023,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1038,7 +1038,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1060,7 +1060,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1076,7 +1076,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1092,7 +1092,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

assert(m.length(1) == 4);

@@ -1116,7 +1116,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1201,7 +1201,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1224,7 +1224,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1254,7 +1254,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1270,7 +1270,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1286,7 +1286,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1310,7 +1310,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1326,7 +1326,7 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == m[0].second);

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

@@ -1385,8 +1385,9 @@ int main()

assert(!m.suffix().matched);

assert(m.suffix().first == m[0].second);

assert(m.suffix().second == s + std::char_traits<wchar_t>::length(s));

- assert(m.length(0) == std::char_traits<wchar_t>::length(s));

+ assert((size_t)m.length(0) == std::char_traits<wchar_t>::length(s));

assert(m.position(0) == 0);

assert(m.str(0) == s);

}

-*/}

+#endif

diff --git a/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp b/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
index 59b2832c4580..d9c5172303fc 100644
--- a/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
+++ b/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp

@@ -16,7 +16,7 @@

// const basic_regex<charT, traits>& e,

// regex_constants::match_flag_type flags = regex_constants::match_default);

-// http://llvm.org/bugs/show_bug.cgi?id=16135

+// https://bugs.llvm.org/show_bug.cgi?id=16135

#include <string>

#include <regex>

diff --git a/test/std/re/re.alg/re.alg.search/backup.pass.cpp b/test/std/re/re.alg/re.alg.search/backup.pass.cpp
index f33b844bed9c..8de0b650ff05 100644
--- a/test/std/re/re.alg/re.alg.search/backup.pass.cpp
+++ b/test/std/re/re.alg/re.alg.search/backup.pass.cpp

@@ -25,7 +25,7 @@

int main()

{

// This regex_iterator uses regex_search(__wrap_iter<_Iter> __first, ...)

- // Test for http://llvm.org/bugs/show_bug.cgi?id=16240 fixed in r185273.

+ // Test for https://bugs.llvm.org/show_bug.cgi?id=16240 fixed in r185273.

{

std::string s("aaaa a");

std::regex re("\\ba");

diff --git a/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp b/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp
index 93424e188432..2d753ed14701 100644
--- a/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp
+++ b/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp

@@ -16,7 +16,7 @@

// const basic_regex<charT, traits>& e,

// regex_constants::match_flag_type flags = regex_constants::match_default);

-// http://llvm.org/bugs/show_bug.cgi?id=11118

+// https://bugs.llvm.org/show_bug.cgi?id=11118

#include <regex>

#include <cassert>

diff --git a/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp b/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
index aca4d674d9f9..e66d3e976db2 100644
--- a/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp

@@ -36,7 +36,7 @@ int main()

assert(error_badbackref_thrown("ab(c)\\2def")); // only one reference

// this should NOT throw, because we only should look at the '1'

-// See https://llvm.org/bugs/show_bug.cgi?id=31387

+// See https://bugs.llvm.org/show_bug.cgi?id=31387

{

const char *pat1 = "a(b)c\\1234";

std::regex re(pat1, pat1 + 7); // extra chars after the end.

diff --git a/test/std/re/re.traits/lookup_classname.pass.cpp b/test/std/re/re.traits/lookup_classname.pass.cpp
index 4f7cf61ebf99..2215b9043d5b 100644
--- a/test/std/re/re.traits/lookup_classname.pass.cpp
+++ b/test/std/re/re.traits/lookup_classname.pass.cpp

@@ -35,7 +35,7 @@ test(const char_type* A,

int main()

{

// if __regex_word is not distinct from all the classes, bad things happen

-// See https://llvm.org/bugs/show_bug.cgi?id=26476 for an example.

+// See https://bugs.llvm.org/show_bug.cgi?id=26476 for an example.

assert((std::ctype_base::space & std::regex_traits<char>::__regex_word) == 0);

assert((std::ctype_base::print & std::regex_traits<char>::__regex_word) == 0);

assert((std::ctype_base::cntrl & std::regex_traits<char>::__regex_word) == 0);

diff --git a/test/std/re/re.traits/translate_nocase.pass.cpp b/test/std/re/re.traits/translate_nocase.pass.cpp
index bf79629d33b4..ab73db79d97f 100644
--- a/test/std/re/re.traits/translate_nocase.pass.cpp
+++ b/test/std/re/re.traits/translate_nocase.pass.cpp

@@ -16,8 +16,8 @@

// REQUIRES: locale.en_US.UTF-8

-// XFAIL: with_system_cxx_lib=x86_64-apple-darwin11

-// XFAIL: with_system_cxx_lib=x86_64-apple-darwin12

+// XFAIL: with_system_cxx_lib=x86_64-apple-macosx10.7

+// XFAIL: with_system_cxx_lib=x86_64-apple-macosx10.8

// TODO: investigation needed

// XFAIL: linux-gnu