Finish preliminary wchar_t implementation, with trivial encodings.

2000-08-09  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	Finish preliminary wchar_t implementation, with trivial encodings.
	* docs/configopts.html: Add bits about canonical configure option
	checking.

	* testsuite/27_io/iostream_objects.cc: Replace this file (which
	has newly-declared-illegal mixing of wide/narrow stdstreams) with...
	* testsuite/27_io/narrow_stream_objects.cc: New file.
	* testsuite/27_io/wide_stream_objects.cc: New file.

	* bits/fstream.tcc (underflow): Temporarily hack a solution
	together that writes from the external file to the internal
	buffers. This removes codecvt from the loop, and is incorrect.
	(_M_really_overflow): Same here.

	* testsuite/21_strings/inserters_extractors.cc (test05): Tweaks.

From-SVN: r35582
This commit is contained in:
Benjamin Kosnik 2000-08-09 07:28:54 +00:00
parent 08e72a1929
commit 86b8dde633
2 changed files with 102 additions and 15 deletions

View File

@ -0,0 +1,99 @@
// 2000-08-02 bkoz
// Copyright (C) 2000 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 all the headers except for iostream.
#include <algorithm>
#include <bitset>
#include <complex>
#include <deque>
#include <exception>
#include <fstream>
#include <functional>
#include <iomanip>
#include <ios>
#include <iosfwd>
#include <istream>
#include <iterator>
#include <limits>
#include <list>
#include <locale>
#include <map>
#include <memory>
#include <new>
#include <numeric>
#include <ostream>
#include <queue>
#include <set>
#include <sstream>
#include <stack>
#include <stdexcept>
#include <streambuf>
#include <string>
#include <typeinfo>
#include <utility>
#include <valarray>
#include <vector>
#include <cassert>
#include <cctype>
#include <cerrno>
#include <cfloat>
#include <ciso646>
#include <climits>
#include <clocale>
#include <cmath>
#include <csetjmp>
#include <csignal>
#include <cstdarg>
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>
// Include iostream last, just to make is as difficult as possible to
// properly initialize the standard iostream objects.
#include <iostream>
// Make sure all the standard streams are defined.
bool test01()
{
bool test = true;
char array1[20];
typedef std::ios::traits_type ctraits_type;
ctraits_type::int_type i = 15;
ctraits_type::copy(array1, "testing istream", i);
array1[i] = '\0';
std::cout << "testing cout" << std::endl;
std::cerr << "testing cerr" << std::endl;
test &= std::cerr.flags() & std::ios_base::unitbuf;
std::clog << "testing clog" << std::endl;
// std::cin >> array1; // requires somebody to type something in.
test &= std::cin.tie() == &std::cout;
return test;
}
int main(void)
{
test01();
return 0;
}

View File

@ -1,6 +1,6 @@
// 990519 bkoz
// 2000-08-02 bkoz
// Copyright (C) 1997-1999 Free Software Foundation, Inc.
// Copyright (C) 2000 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
@ -81,18 +81,6 @@ bool test01()
{
bool test = true;
char array1[20];
typedef std::ios::traits_type ctraits_type;
ctraits_type::int_type i = 15;
ctraits_type::copy(array1, "testing istream", i);
array1[i] = '\0';
std::cout << "testing cout" << std::endl;
std::cerr << "testing cerr" << std::endl;
test &= std::cerr.flags() & std::ios_base::unitbuf;
std::clog << "testing clog" << std::endl;
// std::cin >> array1; // requires somebody to type something in.
test &= std::cin.tie() == &std::cout;
#ifdef _GLIBCPP_USE_WCHAR_T
wchar_t array2[20];
typedef std::wios::traits_type wtraits_type;
@ -106,7 +94,7 @@ bool test01()
test &= std::wcin.tie() == &std::wcout;
#endif
return true;
return test;
}