From 40e4fb68ac53b3581801353dcf6f123cc551ecc8 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 12 May 2017 01:19:01 +0000 Subject: [PATCH] Guard usage of libc++ regex internals inside test. 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 --- .../re/re.traits/lookup_classname.pass.cpp | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/test/std/re/re.traits/lookup_classname.pass.cpp b/test/std/re/re.traits/lookup_classname.pass.cpp index 2215b9043..b61f772b2 100644 --- a/test/std/re/re.traits/lookup_classname.pass.cpp +++ b/test/std/re/re.traits/lookup_classname.pass.cpp @@ -27,39 +27,61 @@ test(const char_type* A, typename std::regex_traits::char_class_type expected, bool icase = false) { + typedef typename std::regex_traits::char_class_type char_class_type; std::regex_traits t; typedef forward_iterator 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 +void +test_w(const char_type* A, + typename std::regex_traits::char_class_type expected, + bool icase = false) +{ + typedef typename std::regex_traits::char_class_type char_class_type; + std::regex_traits t; + typedef forward_iterator 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::__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::__regex_word) == 0); - assert((std::ctype_base::print & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::cntrl & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::upper & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::lower & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::alpha & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::digit & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::punct & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::xdigit & std::regex_traits::__regex_word) == 0); - assert((std::ctype_base::blank & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::space & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::print & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::cntrl & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::upper & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::lower & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::alpha & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::digit & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::punct & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::xdigit & std::regex_traits::__regex_word) == 0); + LIBCPP_ASSERT((std::ctype_base::blank & std::regex_traits::__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::__regex_word | std::ctype_base::alnum - | std::ctype_base::upper | std::ctype_base::lower); - test("W", std::regex_traits::__regex_word | std::ctype_base::alnum - | std::ctype_base::upper | std::ctype_base::lower); - test("w", std::regex_traits::__regex_word | std::ctype_base::alnum - | std::ctype_base::upper | std::ctype_base::lower, true); - test("W", std::regex_traits::__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::__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::__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::__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::__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);