diff options
4 files changed, 326 insertions, 277 deletions
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp index 3effa80..bbb67d6 100644 --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp @@ -11,8 +11,6 @@ // NetBSD does not support LC_MONETARY at the moment // XFAIL: netbsd -// XFAIL: LIBCXX-AIX-FIXME - // REQUIRES: locale.fr_FR.UTF-8 // <locale> @@ -32,6 +30,13 @@ #include "platform_support.h" // locale name macros #include "test_macros.h" +#ifdef _AIX +// the AIX libc expects U202F as LC_MONETARY thousands_sep +# define THOUSANDS_SEP L"\u202F" +#else +# define THOUSANDS_SEP L" " +#endif + typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn; class my_facet @@ -432,26 +437,24 @@ int main(int, char**) assert(ex == -1); } { // positive - std::wstring v = convert_thousands_sep(L"1 234 567,89 "); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 "); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); } { // negative - std::wstring v = convert_thousands_sep(L"-1 234 567,89"); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); + std::wstring v = convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89"); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); } { // negative std::wstring v = L"-1234567,89"; @@ -512,64 +515,59 @@ int main(int, char**) assert(ex == -1); } { // positive, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac"); // EURO SIGN + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); } { // positive, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac"); // EURO SIGN + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"-1 234 567,89 \u20ac"); // EURO SIGN - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac"); // EURO SIGN + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -"); - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + 13); - assert(err == std::ios_base::failbit); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR -"); + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + 13); + assert(err == std::ios_base::failbit); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -"); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + 13); - assert(err == std::ios_base::goodbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR -"); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + 13); + assert(err == std::ios_base::goodbit); + assert(ex == 123456789); } } { @@ -598,26 +596,24 @@ int main(int, char**) assert(ex == -1); } { // positive - std::wstring v = convert_thousands_sep(L"1 234 567,89 "); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 "); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); } { // negative - std::wstring v = convert_thousands_sep(L"-1 234 567,89"); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); + std::wstring v = convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89"); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); } { // negative std::wstring v = L"-1234567,89"; @@ -678,64 +674,59 @@ int main(int, char**) assert(ex == -1); } { // positive, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR"); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR"); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); } { // positive, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR"); - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == 123456789); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR"); + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == 123456789); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"-1 234 567,89 EUR"); - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR"); + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-"); - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + 14); - assert(err == std::ios_base::failbit); - std::noshowbase(ios); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 Eu-"); + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + 14); + assert(err == std::ios_base::failbit); + std::noshowbase(ios); } { // negative, showbase - std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-"); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + 13); - assert(err == std::ios_base::goodbit); - assert(ex == 123456789); + std::wstring v = convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 Eu-"); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + 13); + assert(err == std::ios_base::goodbit); + assert(ex == 123456789); } } #endif // TEST_HAS_NO_WIDE_CHARACTERS diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp index 4cdb257..05c09b2 100644 --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp @@ -9,7 +9,6 @@ // NetBSD does not support LC_MONETARY at the moment // XFAIL: netbsd -// XFAIL: LIBCXX-AIX-FIXME // XFAIL: LIBCXX-FREEBSD-FIXME // REQUIRES: locale.zh_CN.UTF-8 @@ -156,28 +155,34 @@ int main(int, char**) std::noshowbase(ios); } { // negative one, showbase - std::string v = currency_symbol + "-0.01"; - typedef cpp17_input_iterator<const char*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); +#ifdef _AIX + std::string v = "-" + currency_symbol + "0.01"; +#else + std::string v = currency_symbol + "-0.01"; +#endif + typedef cpp17_input_iterator<const char*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); } { // negative one, showbase - std::string v = currency_symbol + "-0.01"; - std::showbase(ios); - typedef cpp17_input_iterator<const char*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); - std::noshowbase(ios); +#ifdef _AIX + std::string v = "-" + currency_symbol + "0.01"; +#else + std::string v = currency_symbol + "-0.01"; +#endif + std::showbase(ios); + typedef cpp17_input_iterator<const char*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); + std::noshowbase(ios); } { // positive, showbase std::string v = currency_symbol + "1,234,567.89"; @@ -204,17 +209,20 @@ int main(int, char**) std::noshowbase(ios); } { // negative, showbase - std::string v = currency_symbol + "-1,234,567.89"; - std::showbase(ios); - typedef cpp17_input_iterator<const char*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); - std::noshowbase(ios); +#ifdef _AIX + std::string v = "-" + currency_symbol + "1,234,567.89"; +#else + std::string v = currency_symbol + "-1,234,567.89"; +#endif + std::showbase(ios); + typedef cpp17_input_iterator<const char*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); + std::noshowbase(ios); } { // negative, showbase std::string v = "CNY -1,234,567.89"; @@ -322,8 +330,8 @@ int main(int, char**) std::noshowbase(ios); } { // negative one, showbase -#ifdef TEST_HAS_GLIBC - std::string v = "-" + currency_name + "0.01"; +#if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::string v = "-" + currency_name + "0.01"; #else std::string v = currency_name + "-0.01"; #endif @@ -337,8 +345,8 @@ int main(int, char**) assert(ex == -1); } { // negative one, showbase -#ifdef TEST_HAS_GLIBC - std::string v = "-" + currency_name + "0.01"; +#if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::string v = "-" + currency_name + "0.01"; #else std::string v = currency_name + "-0.01"; #endif @@ -378,8 +386,8 @@ int main(int, char**) std::noshowbase(ios); } { // negative, showbase -#ifdef TEST_HAS_GLIBC - std::string v = "-" + currency_name + "1,234,567.89"; +#if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::string v = "-" + currency_name + "1,234,567.89"; #else std::string v = currency_name + "-1,234,567.89"; #endif @@ -507,28 +515,34 @@ int main(int, char**) std::noshowbase(ios); } { // negative one, showbase - std::wstring v = w_currency_symbol + L"-0.01"; - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); +# ifdef _AIX + std::wstring v = L"-" + w_currency_symbol + L"0.01"; +# else + std::wstring v = w_currency_symbol + L"-0.01"; +# endif + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); } { // negative one, showbase - std::wstring v = w_currency_symbol + L"-0.01"; - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); - std::noshowbase(ios); +# ifdef _AIX + std::wstring v = L"-" + w_currency_symbol + L"0.01"; +# else + std::wstring v = w_currency_symbol + L"-0.01"; +# endif + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); + std::noshowbase(ios); } { // positive, showbase std::wstring v = w_currency_symbol + L"1,234,567.89"; @@ -555,17 +569,20 @@ int main(int, char**) std::noshowbase(ios); } { // negative, showbase - std::wstring v = w_currency_symbol + L"-1,234,567.89"; - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - false, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); - std::noshowbase(ios); +# ifdef _AIX + std::wstring v = L"-" + w_currency_symbol + L"1,234,567.89"; +# else + std::wstring v = w_currency_symbol + L"-1,234,567.89"; +# endif + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), false, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); + std::noshowbase(ios); } { // negative, showbase std::wstring v = L"CNY -1,234,567.89"; @@ -673,36 +690,34 @@ int main(int, char**) std::noshowbase(ios); } { // negative one, showbase -#ifdef TEST_HAS_GLIBC - std::wstring v = L"-" + w_currency_name + L"0.01"; -#else - std::wstring v = w_currency_name + L"-0.01"; -#endif - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); +# if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::wstring v = L"-" + w_currency_name + L"0.01"; +# else + std::wstring v = w_currency_name + L"-0.01"; +# endif + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); } { // negative one, showbase -#ifdef TEST_HAS_GLIBC - std::wstring v = L"-" + w_currency_name + L"0.01"; -#else - std::wstring v = w_currency_name + L"-0.01"; -#endif - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -1); - std::noshowbase(ios); +# if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::wstring v = L"-" + w_currency_name + L"0.01"; +# else + std::wstring v = w_currency_name + L"-0.01"; +# endif + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -1); + std::noshowbase(ios); } { // positive, showbase std::wstring v = w_currency_name + L"1,234,567.89"; @@ -729,21 +744,20 @@ int main(int, char**) std::noshowbase(ios); } { // negative, showbase -#ifdef TEST_HAS_GLIBC - std::wstring v = L"-" + w_currency_name + L"1,234,567.89"; -#else - std::wstring v = w_currency_name + L"-1,234,567.89"; -#endif - std::showbase(ios); - typedef cpp17_input_iterator<const wchar_t*> I; - long double ex; - std::ios_base::iostate err = std::ios_base::goodbit; - I iter = f.get(I(v.data()), I(v.data() + v.size()), - true, ios, err, ex); - assert(base(iter) == v.data() + v.size()); - assert(err == std::ios_base::eofbit); - assert(ex == -123456789); - std::noshowbase(ios); +# if defined(TEST_HAS_GLIBC) || defined(_AIX) + std::wstring v = L"-" + w_currency_name + L"1,234,567.89"; +# else + std::wstring v = w_currency_name + L"-1,234,567.89"; +# endif + std::showbase(ios); + typedef cpp17_input_iterator<const wchar_t*> I; + long double ex; + std::ios_base::iostate err = std::ios_base::goodbit; + I iter = f.get(I(v.data()), I(v.data() + v.size()), true, ios, err, ex); + assert(base(iter) == v.data() + v.size()); + assert(err == std::ios_base::eofbit); + assert(ex == -123456789); + std::noshowbase(ios); } { // negative, showbase std::wstring v = w_currency_symbol + L"-1,234,567.89"; diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp index 05b4ee4..47a48de 100644 --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp @@ -11,8 +11,6 @@ // NetBSD does not support LC_MONETARY at the moment // XFAIL: netbsd -// XFAIL: LIBCXX-AIX-FIXME - // REQUIRES: locale.fr_FR.UTF-8 // <locale> @@ -32,6 +30,13 @@ #include "platform_support.h" // locale name macros #include "test_macros.h" +#ifdef _AIX +// the AIX libc expects U202F as LC_MONETARY thousands_sep +# define THOUSANDS_SEP L"\u202F" +#else +# define THOUSANDS_SEP L" " +#endif + typedef std::money_put<char, cpp17_output_iterator<char*> > Fn; class my_facet @@ -291,14 +296,14 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"1 234 567,89")); + assert(ex == convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89")); } { // negative long double v = -123456789; wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89")); } { // zero, showbase long double v = 0; @@ -322,7 +327,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"1 234 567,89 \u20ac")); + assert(ex == convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac")); } { // negative, showbase long double v = -123456789; @@ -330,7 +335,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 \u20ac")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac")); } { // negative, showbase, left long double v = -123456789; @@ -340,7 +345,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 \u20ac ")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac ")); assert(ios.width() == 0); } { // negative, showbase, internal @@ -351,7 +356,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 \u20ac")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac")); assert(ios.width() == 0); } { // negative, showbase, right @@ -362,7 +367,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L" -1 234 567,89 \u20ac")); + assert(ex == convert_thousands_sep(L" -1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 \u20ac")); assert(ios.width() == 0); } @@ -388,14 +393,14 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"1 234 567,89")); + assert(ex == convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89")); } { // negative long double v = -123456789; wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89")); } { // zero, showbase long double v = 0; @@ -419,7 +424,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"1 234 567,89 EUR")); + assert(ex == convert_thousands_sep(L"1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR")); } { // negative, showbase long double v = -123456789; @@ -427,7 +432,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 EUR")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR")); } { // negative, showbase, left long double v = -123456789; @@ -437,7 +442,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 EUR ")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR ")); assert(ios.width() == 0); } { // negative, showbase, internal @@ -448,7 +453,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L"-1 234 567,89 EUR")); + assert(ex == convert_thousands_sep(L"-1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR")); assert(ios.width() == 0); } { // negative, showbase, right @@ -459,7 +464,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); - assert(ex == convert_thousands_sep(L" -1 234 567,89 EUR")); + assert(ex == convert_thousands_sep(L" -1" THOUSANDS_SEP "234" THOUSANDS_SEP "567,89 EUR")); assert(ios.width() == 0); } } diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp index 1aba059..4d58103 100644 --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp @@ -9,7 +9,6 @@ // NetBSD does not support LC_MONETARY at the moment // XFAIL: netbsd -// XFAIL: LIBCXX-AIX-FIXME // XFAIL: LIBCXX-FREEBSD-FIXME // REQUIRES: locale.zh_CN.UTF-8 @@ -120,7 +119,11 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v); std::string ex(str, base(iter)); +#ifdef _AIX + assert(ex == "-" + currency_symbol + "0.01"); +#else assert(ex == currency_symbol + "-0.01"); +#endif } { // positive, showbase long double v = 123456789; @@ -136,7 +139,11 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v); std::string ex(str, base(iter)); +#ifdef _AIX + assert(ex == "-" + currency_symbol + "1,234,567.89"); +#else assert(ex == currency_symbol + "-1,234,567.89"); +#endif } { // negative, showbase, left long double v = -123456789; @@ -146,7 +153,11 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v); std::string ex(str, base(iter)); +#ifdef _AIX + assert(ex == "-" + currency_symbol + "1,234,567.89" + currency_symbol_padding); +#else assert(ex == currency_symbol + "-1,234,567.89" + currency_symbol_padding); +#endif assert(ios.width() == 0); } { // negative, showbase, internal @@ -157,7 +168,11 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v); std::string ex(str, base(iter)); +#ifdef _AIX + assert(ex == "-" + currency_symbol + currency_symbol_padding + "1,234,567.89"); +#else assert(ex == currency_symbol + "-" + currency_symbol_padding + "1,234,567.89"); +#endif assert(ios.width() == 0); } { // negative, showbase, right @@ -168,7 +183,11 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v); std::string ex(str, base(iter)); +#ifdef _AIX + assert(ex == currency_symbol_padding + "-" + currency_symbol + "1,234,567.89"); +#else assert(ex == currency_symbol_padding + currency_symbol + "-1,234,567.89"); +#endif assert(ios.width() == 0); } @@ -217,7 +236,7 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v); std::string ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +#if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == "-" + currency_name + "0.01"); #else assert(ex == currency_name + "-0.01"); @@ -237,7 +256,7 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v); std::string ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +#if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == "-" + currency_name + "1,234,567.89"); #else assert(ex == currency_name + "-1,234,567.89"); @@ -251,7 +270,7 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v); std::string ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +#if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == "-" + currency_name + "1,234,567.89" + currency_name_padding); #else assert(ex == currency_name + "-1,234,567.89" + currency_name_padding); @@ -266,7 +285,7 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v); std::string ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +#if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == "-" + currency_name + currency_name_padding + "1,234,567.89"); #else assert(ex == currency_name + "-" + currency_name_padding + "1,234,567.89"); @@ -281,7 +300,7 @@ int main(int, char**) char str[100]; cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v); std::string ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +#if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == currency_name_padding + "-" + currency_name + "1,234,567.89"); #else assert(ex == currency_name_padding + currency_name + "-1,234,567.89"); @@ -344,7 +363,11 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); +# ifdef _AIX + assert(ex == L"-" + currency_symbol + L"0.01"); +# else assert(ex == currency_symbol + L"-0.01"); +# endif } { // positive, showbase long double v = 123456789; @@ -360,7 +383,11 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v); std::wstring ex(str, base(iter)); +# ifdef _AIX + assert(ex == L"-" + currency_symbol + L"1,234,567.89"); +# else assert(ex == currency_symbol + L"-1,234,567.89"); +# endif } { // negative, showbase, left long double v = -123456789; @@ -370,7 +397,11 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); +# ifdef _AIX + assert(ex == L"-" + currency_symbol + L"1,234,567.89 "); +# else assert(ex == currency_symbol + L"-1,234,567.89 "); +# endif assert(ios.width() == 0); } { // negative, showbase, internal @@ -381,7 +412,11 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); +# ifdef _AIX + assert(ex == L"-" + currency_symbol + L" 1,234,567.89"); +# else assert(ex == currency_symbol + L"- 1,234,567.89"); +# endif assert(ios.width() == 0); } { // negative, showbase, right @@ -392,7 +427,11 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v); std::wstring ex(str, base(iter)); +# ifdef _AIX + assert(ex == L" -" + currency_symbol + L"1,234,567.89"); +# else assert(ex == L" " + currency_symbol + L"-1,234,567.89"); +# endif assert(ios.width() == 0); } @@ -441,7 +480,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +# if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == L"-" + currency_name + L"0.01"); #else assert(ex == currency_name + L"-0.01"); @@ -461,7 +500,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v); std::wstring ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +# if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == L"-" + currency_name + L"1,234,567.89"); #else assert(ex == currency_name + L"-1,234,567.89"); @@ -475,7 +514,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +# if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == L"-" + currency_name + L"1,234,567.89" + currency_name_padding); #else assert(ex == currency_name + L"-1,234,567.89" + currency_name_padding); @@ -490,7 +529,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +# if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == L"-" + currency_name + currency_name_padding + L"1,234,567.89"); #else assert(ex == currency_name + L"-" + currency_name_padding + L"1,234,567.89"); @@ -505,7 +544,7 @@ int main(int, char**) wchar_t str[100]; cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v); std::wstring ex(str, base(iter)); -#ifdef TEST_HAS_GLIBC +# if defined(TEST_HAS_GLIBC) || defined(_AIX) assert(ex == currency_name_padding + L"-" + currency_name + L"1,234,567.89"); #else assert(ex == currency_name_padding + currency_name + L"-1,234,567.89"); |