mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-27 14:16:08 +00:00
f909b2229a
There are 2 problems today that this PR resolves: libcxx tests assume the thousands separator for fr_FR locale is x00A0 on Windows. This currently fails when run on newer versions of Windows (it seems to have been updated to the new correct value of 0x202F around windows 11. The exact windows version where it changed doesn't seem to be documented anywhere). Depending the OS version, you need different values. There are several ifdefs to determine the environment/platform-specific locale conversion values and it leads to maintenance as things change over time. This PR includes the following changes: - Provide the environment's locale conversion values through a substitution. The test can opt in by placing the substitution value in a define flag. - Remove the platform ifdefs (the swapping of values between Windows, Linux, Apple, AIX). This is accomplished through a lit feature action that fetches the environment's locale conversions (lconv) for members like 'thousands_sep' that we need to provide. This should ensure that we don't lose the effectiveness of the test itself. In addition, as a result of the above, this PR: - Fixes a handful of locale tests which unexpectedly fail on newer Windows versions. - Resolves 3 XFAIL FIX-MEs. Originally submitted in https://github.com/llvm/llvm-project/pull/86649. Co-authored-by: Rodrigo Salazar <4rodrigosalazar@gmail.com>
92 lines
2.3 KiB
C++
92 lines
2.3 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H
|
|
#define LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H
|
|
|
|
#include <string>
|
|
#include "platform_support.h"
|
|
#include "test_macros.h"
|
|
#include "make_string.h"
|
|
|
|
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
|
|
|
|
#include <cwctype>
|
|
|
|
#endif // TEST_HAS_NO_WIDE_CHARACTERS
|
|
|
|
namespace LocaleHelpers {
|
|
|
|
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
|
|
|
|
std::wstring convert_thousands_sep(std::wstring const& in, wchar_t sep) {
|
|
std::wstring out;
|
|
bool seen_num_start = false;
|
|
bool seen_decimal = false;
|
|
for (unsigned i = 0; i < in.size(); ++i) {
|
|
seen_decimal |= in[i] == L',';
|
|
seen_num_start |= in[i] == L'-' || std::iswdigit(in[i]);
|
|
if (seen_decimal || !seen_num_start || in[i] != L' ') {
|
|
out.push_back(in[i]);
|
|
continue;
|
|
}
|
|
assert(in[i] == L' ');
|
|
out.push_back(sep);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
std::wstring negate_en_US(std::wstring s) {
|
|
#if defined(_WIN32)
|
|
return L"(" + s + L")";
|
|
#else
|
|
return L"-" + s;
|
|
#endif
|
|
}
|
|
|
|
wchar_t thousands_sep_or_default(std::wstring s) { return !s.empty() ? s[0] : L','; }
|
|
|
|
wchar_t mon_thousands_sep_or_default(std::wstring s) { return thousands_sep_or_default(s); }
|
|
|
|
wchar_t decimal_point_or_default(std::wstring s) { return !s.empty() ? s[0] : L'.'; }
|
|
|
|
#endif // TEST_HAS_NO_WIDE_CHARACTERS
|
|
|
|
std::string negate_en_US(std::string s) {
|
|
#if defined(_WIN32)
|
|
return "(" + s + ")";
|
|
#else
|
|
return "-" + s;
|
|
#endif
|
|
}
|
|
|
|
MultiStringType currency_symbol_ru_RU() {
|
|
#if defined(_CS_GNU_LIBC_VERSION)
|
|
if (glibc_version_less_than("2.24"))
|
|
return MKSTR("\u0440\u0443\u0431");
|
|
else
|
|
return MKSTR("\u20BD"); // U+20BD RUBLE SIGN
|
|
#elif defined(_WIN32) || defined(__FreeBSD__) || defined(_AIX)
|
|
return MKSTR("\u20BD"); // U+20BD RUBLE SIGN
|
|
#else
|
|
return MKSTR("\u0440\u0443\u0431.");
|
|
#endif
|
|
}
|
|
|
|
MultiStringType currency_symbol_zh_CN() {
|
|
#if defined(_WIN32)
|
|
return MKSTR("\u00A5"); // U+00A5 YEN SIGN
|
|
#else
|
|
return MKSTR("\uFFE5"); // U+FFE5 FULLWIDTH YEN SIGN
|
|
#endif
|
|
}
|
|
|
|
} // namespace LocaleHelpers
|
|
|
|
#endif // LIBCXX_TEST_SUPPORT_LOCALE_HELPERS_H
|