mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-22 00:59:55 +08:00
4b9aaf6379
2002-01-22 Benjamin Kosnik <bkoz@redhat.com> Audit for LANG independence. * include/bits/localefwd.h: Tweaks. * include/bits/locale_facets.tcc (money_get::do_get(long double)): Use __convert_to_v. (time_get::do_get_year): Same. (__convert_from_v): Add. (num_put::_M_convert_float): Use. (num_put::_M_convert_int): Same. (money_put::do_put): Same. * src/locale-inst.cc: Add instantiations for __convert_from_v. * config/locale/time_members_gnu.cc: Cleanup setlocale usage. * config/locale/time_members_generic.cc: * config/locale/messages_members_gnu.cc: Same. * config/locale/messages_members_gnu.h: Same. * testsuite/22_locale/codecvt_members_wchar_t_char.cc (test02): New. * testsuite/22_locale/codecvt_members_char_char.cc (test02): New. * testsuite/22_locale/collate_members_wchar_t.cc (test02): New. * testsuite/22_locale/collate_members_char.cc (test02): New. * testsuite/22_locale/ctype_members_wchar_t.cc (test03): New. * testsuite/22_locale/ctype_members_char.cc (test03): New. * testsuite/22_locale/messages_members_char.cc (test02): New. * testsuite/22_locale/moneypunct_members_wchar_t.cc (test02): New. * testsuite/22_locale/moneypunct_members_char.cc (test02): New. * testsuite/22_locale/money_get_members_wchar_t.cc (test04): New. * testsuite/22_locale/money_get_members_char.cc (test04): New. * testsuite/22_locale/money_put_members_wchar_t.cc (test04): New. * testsuite/22_locale/money_put_members_char.cc (test04): New. * testsuite/22_locale/numpunct_members_wchar_t.cc (test02): New. * testsuite/22_locale/numpunct_members_char.cc (test02): New. * testsuite/22_locale/time_put_members_wchar_t.cc (test03): New. * testsuite/22_locale/time_put_members_char.cc (test03): New. * testsuite/22_locale/time_get_members_wchar_t.cc (test07): New. * testsuite/22_locale/time_get_members_char.cc (test07): New. * testsuite/22_locale/num_get_members_wchar_t.cc (test03): New. * testsuite/22_locale/num_get_members_char.cc (test03): New. * testsuite/22_locale/num_put_members_wchar_t.cc (test03): New. * testsuite/22_locale/num_put_members_char.cc (test03): New. * testsuite/22_locale/time_get_members_char.cc: Fixups for global locale issues. * testsuite/22_locale/time_get_members_char.cc: Same. 2002-01-22 Benjamin Kosnik <bkoz@redhat.com> libstdc++/5280 * include/bits/localefwd.h: Tweak comments. * include/bits/locale_facets.h (__convert_to_v): Add. * include/bits/locale_facets.tcc (num_get::do_get(double)): Use it. (num_get::do_get(float)): Same. (num_get::do_get(long double)): Same. (num_get::do_get(bool)): Same. (num_get::do_get(long)): Same. (num_get::do_get(long long)): Same. (num_get::do_get(unsigned int)): Same. (num_get::do_get(unsigned short)): Same. (num_get::do_get(unsigned long)): Same. (num_get::do_get(unsigned long long)): Same. * config/locale/c_locale_gnu.cc (__convert_to_v): Specialize. * config/locale/c_locale_generic.cc: Same. From-SVN: r49108
331 lines
12 KiB
C++
331 lines
12 KiB
C++
// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
|
//
|
|
// 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.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
//
|
|
// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
|
|
// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <locale>
|
|
|
|
namespace std
|
|
{
|
|
template<>
|
|
void
|
|
__timepunct<char>::
|
|
_M_put_helper(char* __s, size_t __maxlen, const char* __format,
|
|
const tm* __tm) const
|
|
{
|
|
#if 0
|
|
// Requires glibc 2.3
|
|
if (_M_c_locale_timepunct)
|
|
__strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
|
|
else
|
|
strftime(__s, __maxlen, __format, __tm);
|
|
#else
|
|
const char* __old = setlocale(LC_ALL, _M_name_timepunct);
|
|
strftime(__s, __maxlen, __format, __tm);
|
|
setlocale(LC_ALL, __old);
|
|
#endif
|
|
}
|
|
|
|
template<>
|
|
void
|
|
__timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_date_format = "%m/%d/%y";
|
|
_M_date_era_format = "%m/%d/%y";
|
|
_M_time_format = "%H:%M:%S";
|
|
_M_time_era_format = "%H:%M:%S";
|
|
_M_date_time_format = "";
|
|
_M_date_time_era_format = "";
|
|
_M_am = "AM";
|
|
_M_pm = "PM";
|
|
_M_am_pm_format = "";
|
|
|
|
// Day names, starting with "C"'s Sunday.
|
|
_M_day1 = "Sunday";
|
|
_M_day2 = "Monday";
|
|
_M_day3 = "Tuesday";
|
|
_M_day4 = "Wednesday";
|
|
_M_day5 = "Thursday";
|
|
_M_day6 = "Friday";
|
|
_M_day7 = "Saturday";
|
|
|
|
// Abbreviated day names, starting with "C"'s Sun.
|
|
_M_day_a1 = "Sun";
|
|
_M_day_a2 = "Mon";
|
|
_M_day_a3 = "Tue";
|
|
_M_day_a4 = "Wed";
|
|
_M_day_a5 = "Thu";
|
|
_M_day_a6 = "Fri";
|
|
_M_day_a7 = "Sat";
|
|
|
|
// Month names, starting with "C"'s January.
|
|
_M_month01 = "January";
|
|
_M_month02 = "February";
|
|
_M_month03 = "March";
|
|
_M_month04 = "April";
|
|
_M_month05 = "May";
|
|
_M_month06 = "June";
|
|
_M_month07 = "July";
|
|
_M_month08 = "August";
|
|
_M_month09 = "September";
|
|
_M_month10 = "October";
|
|
_M_month11 = "November";
|
|
_M_month12 = "December";
|
|
|
|
// Abbreviated month names, starting with "C"'s Jan.
|
|
_M_month_a01 = "Jan";
|
|
_M_month_a02 = "Feb";
|
|
_M_month_a03 = "Mar";
|
|
_M_month_a04 = "Apr";
|
|
_M_month_a05 = "May";
|
|
_M_month_a06 = "Jun";
|
|
_M_month_a07 = "July";
|
|
_M_month_a08 = "Aug";
|
|
_M_month_a09 = "Sep";
|
|
_M_month_a10 = "Oct";
|
|
_M_month_a11 = "Nov";
|
|
_M_month_a12 = "Dec";
|
|
}
|
|
else
|
|
{
|
|
_M_c_locale_timepunct = _S_clone_c_locale(__cloc);
|
|
|
|
_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
|
|
_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
|
|
_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
|
|
_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
|
|
_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
|
|
_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT, __cloc);
|
|
_M_am = __nl_langinfo_l(AM_STR, __cloc);
|
|
_M_pm = __nl_langinfo_l(PM_STR, __cloc);
|
|
_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
|
|
|
|
// Day names, starting with "C"'s Sunday.
|
|
_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
|
|
_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
|
|
_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
|
|
_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
|
|
_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
|
|
_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
|
|
_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
|
|
|
|
// Abbreviated day names, starting with "C"'s Sun.
|
|
_M_day_a1 = __nl_langinfo_l(ABDAY_1, __cloc);
|
|
_M_day_a2 = __nl_langinfo_l(ABDAY_2, __cloc);
|
|
_M_day_a3 = __nl_langinfo_l(ABDAY_3, __cloc);
|
|
_M_day_a4 = __nl_langinfo_l(ABDAY_4, __cloc);
|
|
_M_day_a5 = __nl_langinfo_l(ABDAY_5, __cloc);
|
|
_M_day_a6 = __nl_langinfo_l(ABDAY_6, __cloc);
|
|
_M_day_a7 = __nl_langinfo_l(ABDAY_7, __cloc);
|
|
|
|
// Month names, starting with "C"'s January.
|
|
_M_month01 = __nl_langinfo_l(MON_1, __cloc);
|
|
_M_month02 = __nl_langinfo_l(MON_2, __cloc);
|
|
_M_month03 = __nl_langinfo_l(MON_3, __cloc);
|
|
_M_month04 = __nl_langinfo_l(MON_4, __cloc);
|
|
_M_month05 = __nl_langinfo_l(MON_5, __cloc);
|
|
_M_month06 = __nl_langinfo_l(MON_6, __cloc);
|
|
_M_month07 = __nl_langinfo_l(MON_7, __cloc);
|
|
_M_month08 = __nl_langinfo_l(MON_8, __cloc);
|
|
_M_month09 = __nl_langinfo_l(MON_9, __cloc);
|
|
_M_month10 = __nl_langinfo_l(MON_10, __cloc);
|
|
_M_month11 = __nl_langinfo_l(MON_11, __cloc);
|
|
_M_month12 = __nl_langinfo_l(MON_12, __cloc);
|
|
|
|
// Abbreviated month names, starting with "C"'s Jan.
|
|
_M_month_a01 = __nl_langinfo_l(ABMON_1, __cloc);
|
|
_M_month_a02 = __nl_langinfo_l(ABMON_2, __cloc);
|
|
_M_month_a03 = __nl_langinfo_l(ABMON_3, __cloc);
|
|
_M_month_a04 = __nl_langinfo_l(ABMON_4, __cloc);
|
|
_M_month_a05 = __nl_langinfo_l(ABMON_5, __cloc);
|
|
_M_month_a06 = __nl_langinfo_l(ABMON_6, __cloc);
|
|
_M_month_a07 = __nl_langinfo_l(ABMON_7, __cloc);
|
|
_M_month_a08 = __nl_langinfo_l(ABMON_8, __cloc);
|
|
_M_month_a09 = __nl_langinfo_l(ABMON_9, __cloc);
|
|
_M_month_a10 = __nl_langinfo_l(ABMON_10, __cloc);
|
|
_M_month_a11 = __nl_langinfo_l(ABMON_11, __cloc);
|
|
_M_month_a12 = __nl_langinfo_l(ABMON_12, __cloc);
|
|
}
|
|
}
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template<>
|
|
void
|
|
__timepunct<wchar_t>::
|
|
_M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
|
|
const tm* __tm) const
|
|
{
|
|
#if 0
|
|
// Requires glibc 2.3
|
|
if (_M_c_locale_timepunct)
|
|
__wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
|
|
else
|
|
wcsftime(__s, __maxlen, __format, __tm);
|
|
#else
|
|
const char* __old = setlocale(LC_ALL, _M_name_timepunct);
|
|
wcsftime(__s, __maxlen, __format, __tm);
|
|
setlocale(LC_ALL, __old);
|
|
#endif
|
|
}
|
|
|
|
template<>
|
|
void
|
|
__timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_date_format = L"%m/%d/%y";
|
|
_M_date_era_format = L"%m/%d/%y";
|
|
_M_time_format = L"%H:%M:%S";
|
|
_M_time_era_format = L"%H:%M:%S";
|
|
_M_date_time_format = L"";
|
|
_M_date_time_era_format = L"";
|
|
_M_am = L"AM";
|
|
_M_pm = L"PM";
|
|
_M_am_pm_format = L"";
|
|
|
|
// Day names, starting with "C"'s Sunday.
|
|
_M_day1 = L"Sunday";
|
|
_M_day2 = L"Monday";
|
|
_M_day3 = L"Tuesday";
|
|
_M_day4 = L"Wednesday";
|
|
_M_day5 = L"Thursday";
|
|
_M_day6 = L"Friday";
|
|
_M_day7 = L"Saturday";
|
|
|
|
// Abbreviated day names, starting with "C"'s Sun.
|
|
_M_day_a1 = L"Sun";
|
|
_M_day_a2 = L"Mon";
|
|
_M_day_a3 = L"Tue";
|
|
_M_day_a4 = L"Wed";
|
|
_M_day_a5 = L"Thu";
|
|
_M_day_a6 = L"Fri";
|
|
_M_day_a7 = L"Sat";
|
|
|
|
// Month names, starting with "C"'s January.
|
|
_M_month01 = L"January";
|
|
_M_month02 = L"February";
|
|
_M_month03 = L"March";
|
|
_M_month04 = L"April";
|
|
_M_month05 = L"May";
|
|
_M_month06 = L"June";
|
|
_M_month07 = L"July";
|
|
_M_month08 = L"August";
|
|
_M_month09 = L"September";
|
|
_M_month10 = L"October";
|
|
_M_month11 = L"November";
|
|
_M_month12 = L"December";
|
|
|
|
// Abbreviated month names, starting with "C"'s Jan.
|
|
_M_month_a01 = L"Jan";
|
|
_M_month_a02 = L"Feb";
|
|
_M_month_a03 = L"Mar";
|
|
_M_month_a04 = L"Apr";
|
|
_M_month_a05 = L"May";
|
|
_M_month_a06 = L"Jun";
|
|
_M_month_a07 = L"July";
|
|
_M_month_a08 = L"Aug";
|
|
_M_month_a09 = L"Sep";
|
|
_M_month_a10 = L"Oct";
|
|
_M_month_a11 = L"Nov";
|
|
_M_month_a12 = L"Dec";
|
|
}
|
|
else
|
|
{
|
|
_M_c_locale_timepunct = _S_clone_c_locale(__cloc);
|
|
|
|
_M_date_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_FMT, __cloc));
|
|
_M_date_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_FMT, __cloc));
|
|
_M_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT, __cloc));
|
|
_M_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_T_FMT, __cloc));
|
|
_M_date_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_T_FMT, __cloc));
|
|
_M_date_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc));
|
|
_M_am = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WAM_STR, __cloc));
|
|
_M_pm = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WPM_STR, __cloc));
|
|
_M_am_pm_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc));
|
|
|
|
// Day names, starting with "C"'s Sunday.
|
|
_M_day1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_1, __cloc));
|
|
_M_day2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_2, __cloc));
|
|
_M_day3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_3, __cloc));
|
|
_M_day4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_4, __cloc));
|
|
_M_day5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_5, __cloc));
|
|
_M_day6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_6, __cloc));
|
|
_M_day7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_7, __cloc));
|
|
|
|
// Abbreviated day names, starting with "C"'s Sun.
|
|
_M_day_a1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_1, __cloc));
|
|
_M_day_a2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_2, __cloc));
|
|
_M_day_a3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_3, __cloc));
|
|
_M_day_a4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_4, __cloc));
|
|
_M_day_a5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_5, __cloc));
|
|
_M_day_a6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_6, __cloc));
|
|
_M_day_a7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_7, __cloc));
|
|
|
|
// Month names, starting with "C"'s January.
|
|
_M_month01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_1, __cloc));
|
|
_M_month02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_2, __cloc));
|
|
_M_month03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_3, __cloc));
|
|
_M_month04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_4, __cloc));
|
|
_M_month05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_5, __cloc));
|
|
_M_month06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_6, __cloc));
|
|
_M_month07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_7, __cloc));
|
|
_M_month08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_8, __cloc));
|
|
_M_month09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_9, __cloc));
|
|
_M_month10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_10, __cloc));
|
|
_M_month11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_11, __cloc));
|
|
_M_month12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_12, __cloc));
|
|
|
|
// Abbreviated month names, starting with "C"'s Jan.
|
|
_M_month_a01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_1, __cloc));
|
|
_M_month_a02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_2, __cloc));
|
|
_M_month_a03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_3, __cloc));
|
|
_M_month_a04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_4, __cloc));
|
|
_M_month_a05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_5, __cloc));
|
|
_M_month_a06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_6, __cloc));
|
|
_M_month_a07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_7, __cloc));
|
|
_M_month_a08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_8, __cloc));
|
|
_M_month_a09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_9, __cloc));
|
|
_M_month_a10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_10, __cloc));
|
|
_M_month_a11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_11, __cloc));
|
|
_M_month_a12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_12, __cloc));
|
|
}
|
|
}
|
|
#endif
|
|
}
|