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
321 lines
9.3 KiB
C++
321 lines
9.3 KiB
C++
// 1999-11-15 Kevin Ediger <kediger@licor.com>
|
|
// test the floating point inserters (facet num_put)
|
|
|
|
// Copyright (C) 1999 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.
|
|
|
|
#include <cstdio> // for sprintf
|
|
#include <iostream>
|
|
#include <iomanip>
|
|
#include <locale>
|
|
#include <sstream>
|
|
#include <limits>
|
|
#include <testsuite_hooks.h>
|
|
|
|
using namespace std;
|
|
|
|
#ifndef DEBUG_ASSERT
|
|
# define TEST_NUMPUT_VERBOSE 1
|
|
#endif
|
|
|
|
struct _TestCase
|
|
{
|
|
double val;
|
|
|
|
int precision;
|
|
int width;
|
|
char decimal;
|
|
char fill;
|
|
|
|
bool fixed;
|
|
bool scientific;
|
|
bool showpos;
|
|
bool showpoint;
|
|
bool uppercase;
|
|
bool internal;
|
|
bool left;
|
|
bool right;
|
|
|
|
const char* result;
|
|
#if _GLIBCPP_USE_WCHAR_T
|
|
const wchar_t* wresult;
|
|
#endif
|
|
};
|
|
|
|
static bool T=true;
|
|
static bool F=false;
|
|
|
|
static _TestCase testcases[] =
|
|
{
|
|
#if _GLIBCPP_USE_WCHAR_T
|
|
// standard output (no formatting applied) 1-4
|
|
{ 1.2, 6,0,'.',' ', F,F,F,F,F,F,F,F, "1.2",L"1.2" },
|
|
{ 54, 6,0,'.',' ', F,F,F,F,F,F,F,F, "54",L"54" },
|
|
{ -.012, 6,0,'.',' ', F,F,F,F,F,F,F,F, "-0.012",L"-0.012" },
|
|
{ -.00000012, 6,0,'.',' ', F,F,F,F,F,F,F,F, "-1.2e-07",L"-1.2e-07" },
|
|
|
|
// fixed formatting 5-11
|
|
{ 10.2345, 0,0,'.',' ', T,F,F,F,F,F,F,F, "10",L"10" },
|
|
{ 10.2345, 0,0,'.',' ', T,F,F,T,F,F,F,F, "10.",L"10." },
|
|
{ 10.2345, 1,0,'.',' ', T,F,F,F,F,F,F,F, "10.2",L"10.2" },
|
|
{ 10.2345, 4,0,'.',' ', T,F,F,F,F,F,F,F, "10.2345",L"10.2345" },
|
|
{ 10.2345, 6,0,'.',' ', T,F,T,F,F,F,F,F, "+10.234500",L"+10.234500" },
|
|
{ -10.2345, 6,0,'.',' ', T,F,F,F,F,F,F,F, "-10.234500",L"-10.234500" },
|
|
{ -10.2345, 6,0,',',' ', T,F,F,F,F,F,F,F, "-10,234500",L"-10,234500" },
|
|
|
|
// fixed formatting with width 12-22
|
|
{ 10.2345, 4,5,'.',' ', T,F,F,F,F,F,F,F, "10.2345",L"10.2345" },
|
|
{ 10.2345, 4,6,'.',' ', T,F,F,F,F,F,F,F, "10.2345",L"10.2345" },
|
|
{ 10.2345, 4,7,'.',' ', T,F,F,F,F,F,F,F, "10.2345",L"10.2345" },
|
|
{ 10.2345, 4,8,'.',' ', T,F,F,F,F,F,F,F, " 10.2345",L" 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,F,F, " 10.2345",L" 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,T,F, "10.2345 ",L"10.2345 " },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,F,T, " 10.2345",L" 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,T,F,F, " 10.2345",L" 10.2345" },
|
|
{ -10.2345, 4,10,'.',' ', T,F,F,F,F,T,F,F, "- 10.2345",L"- 10.2345" },
|
|
{ -10.2345, 4,10,'.','A', T,F,F,F,F,T,F,F, "-AA10.2345",L"-AA10.2345" },
|
|
{ 10.2345, 4,10,'.','#', T,F,T,F,F,T,F,F, "+##10.2345",L"+##10.2345" },
|
|
|
|
// scientific formatting 23-29
|
|
{ 1.23e+12, 1,0,'.',' ', F,T,F,F,F,F,F,F, "1.2e+12",L"1.2e+12" },
|
|
{ 1.23e+12, 1,0,'.',' ', F,T,F,F,T,F,F,F, "1.2E+12",L"1.2E+12" },
|
|
{ 1.23e+12, 2,0,'.',' ', F,T,F,F,F,F,F,F, "1.23e+12",L"1.23e+12" },
|
|
{ 1.23e+12, 3,0,'.',' ', F,T,F,F,F,F,F,F, "1.230e+12",L"1.230e+12" },
|
|
{ 1.23e+12, 3,0,'.',' ', F,T,T,F,F,F,F,F, "+1.230e+12",L"+1.230e+12" },
|
|
{ -1.23e-12, 3,0,'.',' ', F,T,F,F,F,F,F,F, "-1.230e-12",L"-1.230e-12" },
|
|
{ 1.23e+12, 3,0,',',' ', F,T,F,F,F,F,F,F, "1,230e+12",L"1,230e+12" },
|
|
#else
|
|
// standard output (no formatting applied)
|
|
{ 1.2, 6,0,'.',' ', F,F,F,F,F,F,F,F, "1.2" },
|
|
{ 54, 6,0,'.',' ', F,F,F,F,F,F,F,F, "54" },
|
|
{ -.012, 6,0,'.',' ', F,F,F,F,F,F,F,F, "-0.012" },
|
|
{ -.00000012, 6,0,'.',' ', F,F,F,F,F,F,F,F, "-1.2e-07" },
|
|
|
|
// fixed formatting
|
|
{ 10.2345, 0,0,'.',' ', T,F,F,F,F,F,F,F, "10" },
|
|
{ 10.2345, 0,0,'.',' ', T,F,F,T,F,F,F,F, "10." },
|
|
{ 10.2345, 1,0,'.',' ', T,F,F,F,F,F,F,F, "10.2" },
|
|
{ 10.2345, 4,0,'.',' ', T,F,F,F,F,F,F,F, "10.2345" },
|
|
{ 10.2345, 6,0,'.',' ', T,F,T,F,F,F,F,F, "+10.234500" },
|
|
{ -10.2345, 6,0,'.',' ', T,F,F,F,F,F,F,F, "-10.234500" },
|
|
{ -10.2345, 6,0,',',' ', T,F,F,F,F,F,F,F, "-10,234500" },
|
|
|
|
// fixed formatting with width
|
|
{ 10.2345, 4,5,'.',' ', T,F,F,F,F,F,F,F, "10.2345" },
|
|
{ 10.2345, 4,6,'.',' ', T,F,F,F,F,F,F,F, "10.2345" },
|
|
{ 10.2345, 4,7,'.',' ', T,F,F,F,F,F,F,F, "10.2345" },
|
|
{ 10.2345, 4,8,'.',' ', T,F,F,F,F,F,F,F, " 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,F,F, " 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,T,F, "10.2345 " },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,F,F,T, " 10.2345" },
|
|
{ 10.2345, 4,10,'.',' ', T,F,F,F,F,T,F,F, " 10.2345" },
|
|
{ -10.2345, 4,10,'.',' ', T,F,F,F,F,T,F,F, "- 10.2345" },
|
|
{ -10.2345, 4,10,'.','A', T,F,F,F,F,T,F,F, "-AA10.2345" },
|
|
{ 10.2345, 4,10,'.','#', T,F,T,F,F,T,F,F, "+##10.2345" },
|
|
|
|
// scientific formatting
|
|
{ 1.23e+12, 1,0,'.',' ', F,T,F,F,F,F,F,F, "1.2e+12" },
|
|
{ 1.23e+12, 1,0,'.',' ', F,T,F,F,T,F,F,F, "1.2E+12" },
|
|
{ 1.23e+12, 2,0,'.',' ', F,T,F,F,F,F,F,F, "1.23e+12" },
|
|
{ 1.23e+12, 3,0,'.',' ', F,T,F,F,F,F,F,F, "1.230e+12" },
|
|
{ 1.23e+12, 3,0,'.',' ', F,T,T,F,F,F,F,F, "+1.230e+12" },
|
|
{ -1.23e-12, 3,0,'.',' ', F,T,F,F,F,F,F,F, "-1.230e-12" },
|
|
{ 1.23e+12, 3,0,',',' ', F,T,F,F,F,F,F,F, "1,230e+12" },
|
|
#endif
|
|
};
|
|
|
|
template<typename _CharT>
|
|
class testpunct : public numpunct<_CharT>
|
|
{
|
|
public:
|
|
typedef _CharT char_type;
|
|
const char_type dchar;
|
|
|
|
explicit
|
|
testpunct(char_type decimal_char) : numpunct<_CharT>(), dchar(decimal_char)
|
|
{ }
|
|
|
|
protected:
|
|
char_type
|
|
do_decimal_point() const
|
|
{ return dchar; }
|
|
|
|
char_type
|
|
do_thousands_sep() const
|
|
{ return ','; }
|
|
|
|
string
|
|
do_grouping() const
|
|
{ return string(); }
|
|
};
|
|
|
|
template<typename _CharT>
|
|
void apply_formatting(const _TestCase & tc, basic_ostream<_CharT> & os)
|
|
{
|
|
os.precision(tc.precision);
|
|
os.width(tc.width);
|
|
os.fill(static_cast<_CharT>(tc.fill));
|
|
if (tc.fixed)
|
|
os.setf(ios::fixed);
|
|
if (tc.scientific)
|
|
os.setf(ios::scientific);
|
|
if (tc.showpos)
|
|
os.setf(ios::showpos);
|
|
if (tc.showpoint)
|
|
os.setf(ios::showpoint);
|
|
if (tc.uppercase)
|
|
os.setf(ios::uppercase);
|
|
if (tc.internal)
|
|
os.setf(ios::internal);
|
|
if (tc.left)
|
|
os.setf(ios::left);
|
|
if (tc.right)
|
|
os.setf(ios::right);
|
|
}
|
|
|
|
int
|
|
test01()
|
|
{
|
|
bool test = true;
|
|
for (int j=0; j<sizeof(testcases)/sizeof(testcases[0]); j++)
|
|
{
|
|
_TestCase & tc = testcases[j];
|
|
#ifdef TEST_NUMPUT_VERBOSE
|
|
cout << "expect: " << tc.result << endl;
|
|
#endif
|
|
// test double with char type
|
|
{
|
|
testpunct<char>* __tp = new testpunct<char>(tc.decimal);
|
|
ostringstream os;
|
|
locale __loc(os.getloc(), __tp);
|
|
os.imbue(__loc);
|
|
apply_formatting(tc, os);
|
|
os << tc.val;
|
|
#ifdef TEST_NUMPUT_VERBOSE
|
|
cout << j << "result 1: " << os.str() << endl;
|
|
#endif
|
|
VERIFY( os && os.str() == tc.result );
|
|
}
|
|
// test long double with char type
|
|
{
|
|
testpunct<char>* __tp = new testpunct<char>(tc.decimal);
|
|
ostringstream os;
|
|
locale __loc(os.getloc(), __tp);
|
|
os.imbue(__loc);
|
|
apply_formatting(tc, os);
|
|
os << (long double)tc.val;
|
|
#ifdef TEST_NUMPUT_VERBOSE
|
|
cout << j << "result 2: " << os.str() << endl;
|
|
#endif
|
|
VERIFY( os && os.str() == tc.result );
|
|
}
|
|
#if _GLIBCPP_USE_WCHAR_T
|
|
// test double with wchar_t type
|
|
{
|
|
testpunct<wchar_t>* __tp = new testpunct<wchar_t>(tc.decimal);
|
|
wostringstream os;
|
|
locale __loc(os.getloc(), __tp);
|
|
os.imbue(__loc);
|
|
apply_formatting(tc, os);
|
|
os << tc.val;
|
|
VERIFY( os && os.str() == tc.wresult );
|
|
}
|
|
// test long double with wchar_t type
|
|
{
|
|
testpunct<wchar_t>* __tp = new testpunct<wchar_t>(tc.decimal);
|
|
wostringstream os;
|
|
locale __loc(os.getloc(), __tp);
|
|
os.imbue(__loc);
|
|
apply_formatting(tc, os);
|
|
os << (long double)tc.val;
|
|
VERIFY( os && os.str() == tc.wresult );
|
|
}
|
|
#endif
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
test02()
|
|
{
|
|
bool test = true;
|
|
// make sure we can output a very long float
|
|
long double val = 1.2345678901234567890123456789e+1000L;
|
|
int prec = numeric_limits<long double>::digits10;
|
|
|
|
ostringstream os;
|
|
os.precision(prec);
|
|
os.setf(ios::scientific);
|
|
os << val;
|
|
|
|
char largebuf[512];
|
|
sprintf(largebuf, "%.*Le", prec, val);
|
|
#ifdef TEST_NUMPUT_VERBOSE
|
|
cout << "expect: " << largebuf << endl;
|
|
cout << "result: " << os.str() << endl;
|
|
#endif
|
|
VERIFY(os && os.str() == largebuf);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
test03()
|
|
{
|
|
short s = -1;
|
|
int i = -1;
|
|
long l = -1;
|
|
bool test = true;
|
|
|
|
const string str_blank;
|
|
string str_tmp;
|
|
stringbuf strbuf;
|
|
ostream o(&strbuf);
|
|
|
|
o << oct << s << ' ' << hex << s;
|
|
VERIFY( strbuf.str() == "177777 ffff" ); // Assuming 2byte-shorts
|
|
strbuf.str(str_blank);
|
|
|
|
o << oct << i << ' ' << hex << i;
|
|
VERIFY( strbuf.str() == "37777777777 ffffffff" );
|
|
strbuf.str(str_blank);
|
|
|
|
o << oct << l << ' ' << hex << l;
|
|
VERIFY( strbuf.str() == "37777777777 ffffffff" );
|
|
strbuf.str(str_blank);
|
|
|
|
o << showpos << hex << showbase << 11;
|
|
VERIFY( strbuf.str() == "0xb" );
|
|
|
|
VERIFY(test);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
test01();
|
|
test02();
|
|
#ifdef TEST_NUMPUT_VERBOSE
|
|
cout << "Test passed!" << endl;
|
|
#endif
|
|
return 0;
|
|
}
|