LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard usage of libc++ regex internals inside test.

Browse Source 
This patch attempts to make lookup_classname.pass.cpp usable against
other STL implementations by guarding the use of __regex_word. That being
said it seems likely that the test is still non-conforming due to how
libc++ handles the "w" character class.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302859 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-12 01:19:01 +00:00
parent a12fdedd50
commit 40e4fb68ac
1 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
test/std/re/re.traits/lookup_classname.pass.cpp
View File

@@ -27,39 +27,61 @@ test(const char_type* A,
typename std::regex_traits<char_type>::char_class_type expected,
bool icase = false)
{
typedef typename std::regex_traits<char_type>::char_class_type char_class_type;
std::regex_traits<char_type> t;
typedef forward_iterator<const char_type*> F;
assert(t.lookup_classname(F(A), F(A + t.length(A)), icase) == expected);
char_class_type result = t.lookup_classname(F(A), F(A + t.length(A)), icase);
assert(result == expected);
}
template <class char_type>
void
test_w(const char_type* A,
typename std::regex_traits<char_type>::char_class_type expected,
bool icase = false)
{
typedef typename std::regex_traits<char_type>::char_class_type char_class_type;
std::regex_traits<char_type> t;
typedef forward_iterator<const char_type*> F;
char_class_type result = t.lookup_classname(F(A), F(A + t.length(A)), icase);
assert((result & expected) == expected);
LIBCPP_ASSERT((expected | std::regex_traits<char_type>::__regex_word) == result);
const bool matches_underscore = t.isctype('_', result);
if (result != expected)
assert(matches_underscore && "expected to match underscore");
else
assert(!matches_underscore && "should not match underscore");
}
int main()
{
// if __regex_word is not distinct from all the classes, bad things happen
// 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);
assert((std::ctype_base::upper & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::lower & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::alpha & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::digit & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::punct & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::xdigit & std::regex_traits<char>::__regex_word) == 0);
assert((std::ctype_base::blank & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::space & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::print & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::cntrl & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::upper & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::lower & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::alpha & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::digit & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::punct & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::xdigit & std::regex_traits<char>::__regex_word) == 0);
LIBCPP_ASSERT((std::ctype_base::blank & std::regex_traits<char>::__regex_word) == 0);
test("d", std::ctype_base::digit);
test("D", std::ctype_base::digit);
test("d", std::ctype_base::digit, true);
test("D", std::ctype_base::digit, true);
test("w", std::regex_traits<char>::__regex_word | std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test("W", std::regex_traits<char>::__regex_word | std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test("w", std::regex_traits<char>::__regex_word | std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test("W", std::regex_traits<char>::__regex_word | std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test_w("w", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test_w("W", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test_w("w", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test_w("W", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test("s", std::ctype_base::space);
test("S", std::ctype_base::space);
@@ -140,13 +162,13 @@ int main()
test(L"d", std::ctype_base::digit, true);
test(L"D", std::ctype_base::digit, true);
test(L"w", std::regex_traits<wchar_t>::__regex_word | std::ctype_base::alnum
test_w(L"w", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test(L"W", std::regex_traits<wchar_t>::__regex_word | std::ctype_base::alnum
test_w(L"W", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower);
test(L"w", std::regex_traits<wchar_t>::__regex_word | std::ctype_base::alnum
test_w(L"w", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test(L"W", std::regex_traits<wchar_t>::__regex_word | std::ctype_base::alnum
test_w(L"W", std::ctype_base::alnum
| std::ctype_base::upper | std::ctype_base::lower, true);
test(L"s", std::ctype_base::space);