From: Benjamin Kosnik Date: Fri, 14 Sep 2001 22:09:35 +0000 (+0000) Subject: moneypunct_members_gnu.cc: Fix initialization of wchar_t members. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55dea7b14958ca29e9644c56ad9e1e9c90b7ab59;p=gcc.git moneypunct_members_gnu.cc: Fix initialization of wchar_t members. 2001-09-14 Benjamin Kosnik * config/locale/moneypunct_members_gnu.cc: Fix initialization of wchar_t members. * testsuite/22_locale/money_get_members_wchar_t.cc (test02): New file. * testsuite/22_locale/money_put_members_wchar_t.cc (test02): Fix. From-SVN: r45614 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1fcafb6edf5..aaeda2556ba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2001-09-14 Benjamin Kosnik + + * config/locale/moneypunct_members_gnu.cc: Fix initialization of + wchar_t members. + * testsuite/22_locale/money_get_members_wchar_t.cc (test02): New file. + * testsuite/22_locale/money_put_members_wchar_t.cc (test02): Fix. + 2001-09-14 Benjamin Kosnik * include/bits/locale_facets.tcc: Conditionalize use of strtold. diff --git a/libstdc++-v3/config/locale/moneypunct_members_gnu.cc b/libstdc++-v3/config/locale/moneypunct_members_gnu.cc index 83d647efbe2..079f9f13246 100644 --- a/libstdc++-v3/config/locale/moneypunct_members_gnu.cc +++ b/libstdc++-v3/config/locale/moneypunct_members_gnu.cc @@ -322,11 +322,48 @@ namespace std _M_decimal_point = reinterpret_cast(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc)); _M_thousands_sep = reinterpret_cast(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc)); _M_grouping = __nl_langinfo_l(GROUPING, __cloc); - _M_positive_sign = reinterpret_cast(__nl_langinfo_l(__POSITIVE_SIGN, __cloc)); - _M_negative_sign = reinterpret_cast(__nl_langinfo_l(__NEGATIVE_SIGN, __cloc)); + + mbstate_t __state; + const char* __cs; + string __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); + string __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); + string __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); + string::size_type __len = max(__cpossign.size(), __cnegsign.size()); + __len = max(__len, __ccurr.size()) + 1; + wchar_t* __ws = static_cast(__builtin_alloca(sizeof(wchar_t) * __len)); + + // NB: Should swich to __cloc's ctype info first. + if (__cpossign.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __cpossign.c_str(); + mbsrtowcs(__ws, &__cs, __cpossign.size() + 1, &__state); + _M_positive_sign = string_type(__ws); + } + else + _M_positive_sign = string_type(); + + if (__cnegsign.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __cnegsign.c_str(); + mbsrtowcs(__ws, &__cs, __cnegsign.size() + 1, &__state); + _M_negative_sign = string_type(__ws); + } + else + _M_negative_sign = string_type(); // _Intl == true. - _M_curr_symbol = reinterpret_cast(__nl_langinfo_l(__INT_CURR_SYMBOL, __cloc)); + if (__ccurr.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __ccurr.c_str(); + mbsrtowcs(__ws, &__cs, __ccurr.size() + 1, &__state); + _M_curr_symbol = string_type(__ws); + } + else + _M_curr_symbol = string_type(); + _M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc)); char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); @@ -364,11 +401,48 @@ namespace std _M_decimal_point = reinterpret_cast(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc)); _M_thousands_sep = reinterpret_cast(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc)); _M_grouping = __nl_langinfo_l(GROUPING, __cloc); - _M_positive_sign = reinterpret_cast(__nl_langinfo_l(__POSITIVE_SIGN, __cloc)); - _M_negative_sign = reinterpret_cast(__nl_langinfo_l(__NEGATIVE_SIGN, __cloc)); + + mbstate_t __state; + const char* __cs; + string __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); + string __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); + string __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc); + string::size_type __len = max(__cpossign.size(), __cnegsign.size()); + __len = max(__len, __ccurr.size()) + 1; + wchar_t* __ws = static_cast(__builtin_alloca(sizeof(wchar_t) * __len)); + + // NB: Should swich to __cloc's ctype info first. + if (__cpossign.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __cpossign.c_str(); + mbsrtowcs(__ws, &__cs, __cpossign.size() + 1, &__state); + _M_positive_sign = string_type(__ws); + } + else + _M_positive_sign = string_type(); + + if (__cnegsign.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __cnegsign.c_str(); + mbsrtowcs(__ws, &__cs, __cnegsign.size() + 1, &__state); + _M_negative_sign = string_type(__ws); + } + else + _M_negative_sign = string_type(); // _Intl == false. - _M_curr_symbol = reinterpret_cast(__nl_langinfo_l(__CURRENCY_SYMBOL, __cloc)); + if (__ccurr.size()) + { + memset(&__state, 0, sizeof(mbstate_t)); + __cs = __ccurr.c_str(); + mbsrtowcs(__ws, &__cs, __ccurr.size() + 1, &__state); + _M_curr_symbol = string_type(__ws); + } + else + _M_curr_symbol = string_type(); + _M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc)); char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc new file mode 100644 index 00000000000..5062e01b474 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc @@ -0,0 +1,279 @@ +// 2001-09-14 Benjamin Kosnik + +// Copyright (C) 2001 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.6.1.1 money_get members + +#include +#include +#include + +// XXX This test is not working for non-glibc locale models. +// { dg-do run { xfail *-*-* } } + +// test string version +void test01() +{ + using namespace std; + typedef money_base::part part; + typedef money_base::pattern pattern; + typedef istreambuf_iterator iterator_type; + + bool test = true; + string str; + + // basic construction + locale loc_c = locale::classic(); + str = loc_c.name(); + + locale loc_hk("en_HK"); + str = loc_hk.name(); + VERIFY( loc_c != loc_hk ); + + locale loc_fr("fr_FR@euro"); + str = loc_fr.name(); + VERIFY( loc_c != loc_fr ); + + locale loc_de("de_DE"); + str = loc_de.name(); + VERIFY( loc_c != loc_de ); + + VERIFY( loc_hk != loc_fr ); + VERIFY( loc_hk != loc_de ); + VERIFY( loc_de != loc_fr ); + + // cache the moneypunct facets + typedef moneypunct __money_true; + typedef moneypunct __money_false; + const __money_true& monpunct_c_t = use_facet<__money_true>(loc_c); + const __money_true& monpunct_de_t = use_facet<__money_true>(loc_de); + const __money_false& monpunct_c_f = use_facet<__money_false>(loc_c); + const __money_false& monpunct_de_f = use_facet<__money_false>(loc_de); + const __money_true& monpunct_hk_t = use_facet<__money_true>(loc_hk); + const __money_false& monpunct_hk_f = use_facet<__money_false>(loc_hk); + + // sanity check the data is correct. + const wstring empty; + + // total EPA budget FY 2002 + const wstring digits1(L"720000000000"); + + // est. cost, national missile "defense", expressed as a loss in USD 2001 + const wstring digits2(L"-10000000000000"); + + // not valid input + const wstring digits3(L"-A"); + + // input less than frac_digits + const wstring digits4(L"-1"); + + iterator_type end; + wistringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + + iss.str(L"7.200.000.000,00 "); + iterator_type is_it01(iss); + wstring result1; + ios_base::iostate err01 = ios_base::goodbit; + mon_get.get(is_it01, end, true, iss, err01, result1); + VERIFY( result1 == digits1 ); + VERIFY( err01 == ios_base::eofbit ); + + iss.str(L"7.200.000.000,00 "); + iterator_type is_it02(iss); + wstring result2; + ios_base::iostate err02 = ios_base::goodbit; + mon_get.get(is_it02, end, true, iss, err02, result2); + VERIFY( result2 == digits1 ); + VERIFY( err02 == ios_base::eofbit ); + + iss.str(L"7.200.000.000,00 a"); + iterator_type is_it03(iss); + wstring result3; + ios_base::iostate err03 = ios_base::goodbit; + mon_get.get(is_it03, end, true, iss, err03, result3); + VERIFY( result3 == digits1 ); + VERIFY( err03 == ios_base::goodbit ); + + iss.str(L""); + iterator_type is_it04(iss); + wstring result4; + ios_base::iostate err04 = ios_base::goodbit; + mon_get.get(is_it04, end, true, iss, err04, result4); + VERIFY( result4 == empty ); + VERIFY( err04 == ios_base::failbit | ios_base::eofbit ); + + iss.str(L"working for enlightenment and peace in a mad world"); + iterator_type is_it05(iss); + wstring result5; + ios_base::iostate err05 = ios_base::goodbit; + mon_get.get(is_it05, end, true, iss, err05, result5); + VERIFY( result5 == empty ); + VERIFY( err05 == ios_base::failbit ); + + // now try with showbase, to get currency symbol in format + iss.setf(ios_base::showbase); + + iss.str(L"7.200.000.000,00 DEM "); + iterator_type is_it06(iss); + wstring result6; + ios_base::iostate err06 = ios_base::goodbit; + mon_get.get(is_it06, end, true, iss, err06, result6); + VERIFY( result6 == digits1 ); + VERIFY( err06 == ios_base::eofbit ); + + iss.str(L"7.200.000.000,00 DEM "); // Extra space. + iterator_type is_it07(iss); + wstring result7; + ios_base::iostate err07 = ios_base::goodbit; + mon_get.get(is_it07, end, true, iss, err07, result7); + VERIFY( result7 == digits1 ); + VERIFY( err07 == ios_base::goodbit ); + + iss.str(L"7.200.000.000,00 DM"); + iterator_type is_it08(iss); + wstring result8; + ios_base::iostate err08 = ios_base::goodbit; + mon_get.get(is_it08, end, false, iss, err08, result8); + VERIFY( result8 == digits1 ); + VERIFY( err08 == ios_base::eofbit ); + + iss.imbue(loc_hk); + iss.str(L"HK$7,200,000,000.00"); + iterator_type is_it09(iss); + wstring result9; + ios_base::iostate err09 = ios_base::goodbit; + mon_get.get(is_it09, end, false, iss, err09, result9); + VERIFY( result9 == digits1 ); + VERIFY( err09 == ios_base::eofbit ); + + iss.str(L"(HKD 100,000,000,000.00)"); + iterator_type is_it10(iss); + wstring result10; + ios_base::iostate err10 = ios_base::goodbit; + mon_get.get(is_it10, end, true, iss, err10, result10); + VERIFY( result10 == digits2 ); + VERIFY( err10 == ios_base::goodbit ); + + iss.str(L"(HKD .01)"); + iterator_type is_it11(iss); + wstring result11; + ios_base::iostate err11 = ios_base::goodbit; + mon_get.get(is_it11, end, true, iss, err11, result11); + VERIFY( result11 == digits4 ); + VERIFY( err11 == ios_base::goodbit ); +} + +// test double/wstring versions +void test02() +{ + using namespace std; + typedef money_base::part part; + typedef money_base::pattern pattern; + typedef istreambuf_iterator iterator_type; + + bool test = true; + string str; + + // basic construction + locale loc_c = locale::classic(); + str = loc_c.name(); + + locale loc_hk("en_HK"); + str = loc_hk.name(); + VERIFY( loc_c != loc_hk ); + + locale loc_fr("fr_FR@euro"); + str = loc_fr.name(); + VERIFY( loc_c != loc_fr ); + + locale loc_de("de_DE"); + str = loc_de.name(); + VERIFY( loc_c != loc_de ); + + VERIFY( loc_hk != loc_fr ); + VERIFY( loc_hk != loc_de ); + VERIFY( loc_de != loc_fr ); + + // cache the moneypunct facets + typedef moneypunct __money_true; + typedef moneypunct __money_false; + const __money_true& monpunct_c_t = use_facet<__money_true>(loc_c); + const __money_true& monpunct_de_t = use_facet<__money_true>(loc_de); + const __money_false& monpunct_c_f = use_facet<__money_false>(loc_c); + const __money_false& monpunct_de_f = use_facet<__money_false>(loc_de); + const __money_true& monpunct_hk_t = use_facet<__money_true>(loc_hk); + const __money_false& monpunct_hk_f = use_facet<__money_false>(loc_hk); + + // sanity check the data is correct. + const wstring empty; + + // total EPA budget FY 2002 + const long double digits1 = 720000000000; + + // est. cost, national missile "defense", expressed as a loss in USD 2001 + const long double digits2 = -10000000000000; + + // input less than frac_digits + const long double digits4 = -1; + + iterator_type end; + wistringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + iss.str(L"7.200.000.000,00 "); + iterator_type is_it01(iss); + long double result1; + ios_base::iostate err01 = ios_base::goodbit; + mon_get.get(is_it01, end, true, iss, err01, result1); + VERIFY( result1 == digits1 ); + VERIFY( err01 == ios_base::eofbit ); + + iss.str(L"7.200.000.000,00 "); + iterator_type is_it02(iss); + long double result2; + ios_base::iostate err02 = ios_base::goodbit; + mon_get.get(is_it02, end, false, iss, err02, result2); + VERIFY( result2 == digits1 ); + VERIFY( err02 == ios_base::eofbit ); + + // now try with showbase, to get currency symbol in format + iss.setf(ios_base::showbase); + + iss.imbue(loc_hk); + iss.str(L"(HKD .01)"); + iterator_type is_it03(iss); + long double result3; + ios_base::iostate err03 = ios_base::goodbit; + mon_get.get(is_it03, end, true, iss, err03, result3); + VERIFY( result3 == digits4 ); + VERIFY( err03 == ios_base::goodbit ); +} + +int main() +{ + test01(); + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc index 13c368eebdb..6ff9f6fea59 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc @@ -84,7 +84,6 @@ void test01() // input less than frac_digits const wstring digits4(L"-1"); - wostringstream oss; oss.imbue(loc_de); // cache the money_put facet