86ade44cb2
2001-11-27 Benjamin Kosnik <bkoz@redhat.com> Numeric facets cleanup. * include/bits/locale_facets.h (__num_base::_S_atoms): Add, remove + and - signs. (__num_base::_M_zero): Add (__num_base::_M_e): Add. (__num_base::_M_E): Add. * include/bits/locale_facets.tcc (num_get::_M_extract): Remove. (num_get::_M_extract_float): New. (num_get::_M_extract_int): New. * src/locale.cc (num_get::_M_extract): Remove. * include/bits/locale_facets.tcc (num_put::_M_insert_float): Simplify, use _M_insert. (num_put::do_put(bool)): Simplify, remove __pad. (__pad): Remove. (__pad_output): Change to __pad. * include/bits/ostream.tcc: And here. * src/locale-inst: Remove instantiations. * include/bits/locale_facets.h: Move helper functions in to class num_put. (num_put::_M_insert_float): Same, for __output_integer. (num_put::_M_insert_int): Same, for __output_float. (num_put::_M_insert): New. (__num_base): Add. (__num_base::_S_format_float): Move __build_float_format into class __num_base. (__num_base::_S_format_int): Move __build_int_format into class __num_base. * include/bits/locale_facets.tcc (__group_digits): Change to (__add_grouping): This. * src/locale-inst.cc: And here. Tweak instantiations. * src/misc-inst.cc: Remove instantiations. * include/bits/ostream.tcc (__pad_char): Rename, adjust inserters for new calling conventions, move to... * include/bits/locale_facets.tcc (__pad_output): Here. Adjust signature to make it useful for both ostream and num_put. (__pad_numeric): Remove. * src/misc-inst.cc: Remove instantiations. * src/locale-inst.cc: Same. * include/bits/locale_facets.h (_Numeric_get): Remove. (_Numeric_put): Remove. (num_get::get(short)): Remove. (num_get::get(int)): Remove. (num_get::do_get(short)): Remove. (num_get::do_get(int)): Remove. * include/bits/istream.tcc (istream::operator>>(short)): Fix as per DR 118. (istream::operator>>(int)): Same. * include/bits/locale_facets.h (_Format_cache): Remove. * include/bits/locale_facets.tcc: Same. * src/locale.cc: Same. * src/locale-inst.cc: Same. * include/bits/ostream.tcc: Same. * src/ios.cc (ios_base::imbue): Remove here as well. * testsuite/22_locale/num_get.cc: New file. * testsuite/22_locale/num_get_members_char.cc: New file. * testsuite/22_locale/num_get_members_wchar_t.cc: New. * testsuite/22_locale/numpunct_members_wchar_t.cc: New file. * testsuite/22_locale/num_put.cc: New file. * testsuite/22_locale/num_put_members_char.cc: New file. * testsuite/22_locale/num_put_members_wchar_t.cc: New file. * testsuite/27_io/ostream_inserter_arith.cc: Fix. * testsuite/27_io/istream_extractor_arith.cc: Fix. From-SVN: r47397
92 lines
2.6 KiB
C++
92 lines
2.6 KiB
C++
// 2001-01-17 Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
// 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.3.1.1 nunpunct members
|
|
|
|
#include <locale>
|
|
#include <testsuite_hooks.h>
|
|
|
|
// XXX This test is not working for non-glibc locale models.
|
|
// { dg-do run { xfail *-*-* } }
|
|
|
|
void test01()
|
|
{
|
|
using namespace std;
|
|
|
|
bool test = true;
|
|
|
|
// basic construction
|
|
locale loc_c = locale::classic();
|
|
locale loc_us("en_US");
|
|
locale loc_fr("fr_FR");
|
|
locale loc_de("de_DE");
|
|
VERIFY( loc_c != loc_de );
|
|
VERIFY( loc_us != loc_fr );
|
|
VERIFY( loc_us != loc_de );
|
|
VERIFY( loc_de != loc_fr );
|
|
|
|
// cache the numpunct facets
|
|
const numpunct<char>& nump_c = use_facet<numpunct<char> >(loc_c);
|
|
const numpunct<char>& nump_us = use_facet<numpunct<char> >(loc_us);
|
|
const numpunct<char>& nump_fr = use_facet<numpunct<char> >(loc_fr);
|
|
const numpunct<char>& nump_de = use_facet<numpunct<char> >(loc_de);
|
|
|
|
// sanity check the data is correct.
|
|
char dp1 = nump_c.decimal_point();
|
|
char th1 = nump_c.thousands_sep();
|
|
string g1 = nump_c.grouping();
|
|
string t1 = nump_c.truename();
|
|
string f1 = nump_c.falsename();
|
|
|
|
char dp2 = nump_us.decimal_point();
|
|
char th2 = nump_us.thousands_sep();
|
|
string g2 = nump_us.grouping();
|
|
string t2 = nump_us.truename();
|
|
string f2 = nump_us.falsename();
|
|
|
|
char dp3 = nump_fr.decimal_point();
|
|
char th3 = nump_fr.thousands_sep();
|
|
string g3 = nump_fr.grouping();
|
|
string t3 = nump_fr.truename();
|
|
string f3 = nump_fr.falsename();
|
|
|
|
char dp4 = nump_de.decimal_point();
|
|
char th4 = nump_de.thousands_sep();
|
|
string g4 = nump_de.grouping();
|
|
string t4 = nump_de.truename();
|
|
string f4 = nump_de.falsename();
|
|
|
|
VERIFY( dp2 != dp3 );
|
|
VERIFY( th2 != th3 );
|
|
|
|
VERIFY( dp2 != dp4 );
|
|
VERIFY( th2 != th4 );
|
|
// XXX This isn't actually supported right now.
|
|
// VERIFY( t2 != t3 );
|
|
// VERIFY( f2 != f3 );
|
|
}
|
|
|
|
int main()
|
|
{
|
|
test01();
|
|
|
|
return 0;
|
|
}
|