Rework the C strings tests to use ASSERT_SAME_TYPE. NFC there. Also change cwchar.pass.cpp to avoid constructing a couple things from zero - since apparently they can be enums in some weird C library. NFC there, either, since the values were never used.

llvm-svn: 349522

1 files changed, 66 insertions, 64 deletions

diff --git a/libcxx/test/std/strings/c.strings/cwchar.pass.cpp b/libcxx/test/std/strings/c.strings/cwchar.pass.cpp
index 2b7c3c465f6..b70dcc52b8c 100644
--- a/libcxx/test/std/strings/c.strings/cwchar.pass.cpp
+++ b/libcxx/test/std/strings/c.strings/cwchar.pass.cpp
@@ -13,6 +13,8 @@
 #include <cstdarg>
 #include <type_traits>
 
+#include "test_macros.h"
+
 #ifndef NULL
 #error NULL not defined
 #endif
@@ -50,80 +52,80 @@ int main()
     ((void)ns); // Prevent unused warning
     ((void)ws); // Prevent unused warning
 
-    static_assert((std::is_same<decltype(std::fwprintf(fp, L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::fwscanf(fp, L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::swprintf(ws, s, L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::swscanf(L"", L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::vfwprintf(fp, L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::vfwscanf(fp, L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::vswprintf(ws, s, L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::vswscanf(L"", L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::fgetwc(fp)), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::fgetws(ws, 0, fp)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::fputwc(L' ', fp)), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::fputws(L"", fp)), int>::value), "");
-    static_assert((std::is_same<decltype(std::fwide(fp, 0)), int>::value), "");
-    static_assert((std::is_same<decltype(std::getwc(fp)), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::putwc(L' ', fp)), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::ungetwc(L' ', fp)), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcstod(L"", (wchar_t**)0)), double>::value), "");
-    static_assert((std::is_same<decltype(std::wcstof(L"", (wchar_t**)0)), float>::value), "");
-    static_assert((std::is_same<decltype(std::wcstold(L"", (wchar_t**)0)), long double>::value), "");
-    static_assert((std::is_same<decltype(std::wcstol(L"", (wchar_t**)0, 0)), long>::value), "");
-    static_assert((std::is_same<decltype(std::wcstoll(L"", (wchar_t**)0, 0)), long long>::value), "");
-    static_assert((std::is_same<decltype(std::wcstoul(L"", (wchar_t**)0, 0)), unsigned long>::value), "");
-    static_assert((std::is_same<decltype(std::wcstoull(L"", (wchar_t**)0, 0)), unsigned long long>::value), "");
-    static_assert((std::is_same<decltype(std::wcscpy(ws, L"")), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsncpy(ws, L"", s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcscat(ws, L"")), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsncat(ws, L"", s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcscmp(L"", L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::wcscoll(L"", L"")), int>::value), "");
-    static_assert((std::is_same<decltype(std::wcsncmp(L"", L"", s)), int>::value), "");
-    static_assert((std::is_same<decltype(std::wcsxfrm(ws, L"", s)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcschr((wchar_t*)0, L' ')), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcscspn(L"", L"")), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcslen(L"")), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcspbrk((wchar_t*)0, L"")), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsrchr((wchar_t*)0, L' ')), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsspn(L"", L"")), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcsstr((wchar_t*)0, L"")), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcstok(ws, L"", (wchar_t**)0)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wmemchr((wchar_t*)0, L' ', s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wmemcmp(L"", L"", s)), int>::value), "");
-    static_assert((std::is_same<decltype(std::wmemcpy(ws, L"", s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wmemmove(ws, L"", s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wmemset(ws, L' ', s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsftime(ws, s, L"", tm)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::btowc(0)), wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::wctob(w)), int>::value), "");
-    static_assert((std::is_same<decltype(std::mbsinit(&mb)), int>::value), "");
-    static_assert((std::is_same<decltype(std::mbrlen("", s, &mb)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::mbrtowc(ws, "", s, &mb)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcrtomb(ns, L' ', &mb)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::mbsrtowcs(ws, (const char**)0, s, &mb)), std::size_t>::value), "");
-    static_assert((std::is_same<decltype(std::wcsrtombs(ns, (const wchar_t**)0, s, &mb)), std::size_t>::value), "");
+    ASSERT_SAME_TYPE(int,                decltype(std::fwprintf(fp, L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::fwscanf(fp, L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::swprintf(ws, s, L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::swscanf(L"", L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::vfwprintf(fp, L"", va)));
+    ASSERT_SAME_TYPE(int,                decltype(std::vfwscanf(fp, L"", va)));
+    ASSERT_SAME_TYPE(int,                decltype(std::vswprintf(ws, s, L"", va)));
+    ASSERT_SAME_TYPE(int,                decltype(std::vswscanf(L"", L"", va)));
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::fgetwc(fp)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::fgetws(ws, 0, fp)));
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::fputwc(L' ', fp)));
+    ASSERT_SAME_TYPE(int,                decltype(std::fputws(L"", fp)));
+    ASSERT_SAME_TYPE(int,                decltype(std::fwide(fp, 0)));
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::getwc(fp)));
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::putwc(L' ', fp)));
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::ungetwc(L' ', fp)));
+    ASSERT_SAME_TYPE(double,             decltype(std::wcstod(L"", (wchar_t**)0)));
+    ASSERT_SAME_TYPE(float,              decltype(std::wcstof(L"", (wchar_t**)0)));
+    ASSERT_SAME_TYPE(long double,        decltype(std::wcstold(L"", (wchar_t**)0)));
+    ASSERT_SAME_TYPE(long,               decltype(std::wcstol(L"", (wchar_t**)0, 0)));
+    ASSERT_SAME_TYPE(long long,          decltype(std::wcstoll(L"", (wchar_t**)0, 0)));
+    ASSERT_SAME_TYPE(unsigned long,      decltype(std::wcstoul(L"", (wchar_t**)0, 0)));
+    ASSERT_SAME_TYPE(unsigned long long, decltype(std::wcstoull(L"", (wchar_t**)0, 0)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcscpy(ws, L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcsncpy(ws, L"", s)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcscat(ws, L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcsncat(ws, L"", s)));
+    ASSERT_SAME_TYPE(int,                decltype(std::wcscmp(L"", L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::wcscoll(L"", L"")));
+    ASSERT_SAME_TYPE(int,                decltype(std::wcsncmp(L"", L"", s)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcsxfrm(ws, L"", s)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcschr((wchar_t*)0, L' ')));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcscspn(L"", L"")));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcslen(L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcspbrk((wchar_t*)0, L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcsrchr((wchar_t*)0, L' ')));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcsspn(L"", L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcsstr((wchar_t*)0, L"")));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wcstok(ws, L"", (wchar_t**)0)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wmemchr((wchar_t*)0, L' ', s)));
+    ASSERT_SAME_TYPE(int,                decltype(std::wmemcmp(L"", L"", s)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wmemcpy(ws, L"", s)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wmemmove(ws, L"", s)));
+    ASSERT_SAME_TYPE(wchar_t*,           decltype(std::wmemset(ws, L' ', s)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcsftime(ws, s, L"", tm)));
+    ASSERT_SAME_TYPE(wint_t,             decltype(std::btowc(0)));
+    ASSERT_SAME_TYPE(int,                decltype(std::wctob(w)));
+    ASSERT_SAME_TYPE(int,                decltype(std::mbsinit(&mb)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::mbrlen("", s, &mb)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::mbrtowc(ws, "", s, &mb)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcrtomb(ns, L' ', &mb)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::mbsrtowcs(ws, (const char**)0, s, &mb)));
+    ASSERT_SAME_TYPE(std::size_t,        decltype(std::wcsrtombs(ns, (const wchar_t**)0, s, &mb)));
 
     // These tests fail on systems whose C library doesn't provide a correct overload
     // set for wcschr, wcspbrk, wcsrchr, wcsstr, and wmemchr, unless the compiler is
     // a suitably recent version of Clang.
 #if !defined(__APPLE__) || defined(_LIBCPP_PREFERRED_OVERLOAD)
-    static_assert((std::is_same<decltype(std::wcschr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcspbrk((const wchar_t*)0, L"")), const wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsrchr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsstr((const wchar_t*)0, L"")), const wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wmemchr((const wchar_t*)0, L' ', s)), const wchar_t*>::value), "");
+    ASSERT_SAME_TYPE(const wchar_t*,     decltype(std::wcschr((const wchar_t*)0, L' ')));
+    ASSERT_SAME_TYPE(const wchar_t*,     decltype(std::wcspbrk((const wchar_t*)0, L"")));
+    ASSERT_SAME_TYPE(const wchar_t*,     decltype(std::wcsrchr((const wchar_t*)0, L' ')));
+    ASSERT_SAME_TYPE(const wchar_t*,     decltype(std::wcsstr((const wchar_t*)0, L"")));
+    ASSERT_SAME_TYPE(const wchar_t*,     decltype(std::wmemchr((const wchar_t*)0, L' ', s)));
 #endif
 
 #ifndef _LIBCPP_HAS_NO_STDIN
-    static_assert((std::is_same<decltype(std::getwchar()), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::vwscanf(L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::wscanf(L"")), int>::value), "");
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::getwchar()));
+    ASSERT_SAME_TYPE(int,                decltype(std::vwscanf(L"", va)));
+    ASSERT_SAME_TYPE(int,                decltype(std::wscanf(L"")));
 #endif
 
 #ifndef _LIBCPP_HAS_NO_STDOUT
-    static_assert((std::is_same<decltype(std::putwchar(L' ')), std::wint_t>::value), "");
-    static_assert((std::is_same<decltype(std::vwprintf(L"", va)), int>::value), "");
-    static_assert((std::is_same<decltype(std::wprintf(L"")), int>::value), "");
+    ASSERT_SAME_TYPE(std::wint_t,        decltype(std::putwchar(L' ')));
+    ASSERT_SAME_TYPE(int,                decltype(std::vwprintf(L"", va)));
+    ASSERT_SAME_TYPE(int,                decltype(std::wprintf(L"")));
 #endif
 }