mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-24 03:39:02 +08:00
33590f13b2
2001-08-07 Benjamin Kosnik <bkoz@redhat.com> Implement std::messages. Make config a fully-nested directory. * config/locale: New directory. * config/c_locale_generic.cc: Move into locale subdirectory. * config/c_locale_generic.h: Same. * config/c_locale_gnu.cc: Same. * config/c_locale_gnu.h: Same. * config/c_locale_ieee_1003.1-200x.cc: Same. * config/c_locale_ieee_1003.1-200x_.h: Same. * config/codecvt_specializations_generic.h: Same. * config/codecvt_specializations_ieee_1003.1-200x.h: Same. * config/messages_members_gnu.h: Same. * config/messaages_members_gnu.cc: Same. * config/messages_members_generic.h: Same. * config/messaages_members_generic.cc: Same. * config/messages_members_ieee_1003.1-200x.h: Same. * config/messaages_members_ieee_1003.1-200x.cc: Same. * config/io: New directory. * config/basic_file_libio.h: Move into io subdirectory. * config/basic_file_libio.cc: Same. * config/c_io_libio.h: Same. * config/c_io_libio_codecvt.c: Same. * config/basic_file_stdio.h: Same. * config/basic_file_stdio.cc: Same. * config/c_io_stdio.h: Same. * po: New directory. * po/POTFILES.in: New file. * po/Makefile.am: New file. * po/Makefile.in: New file. * po/libstdc++.pot: Generic translation file. * po/fr.po: Preliminary French translation. * po/de.po: Preliminary German translation. * intl: New directory. * intl/Makefile.am: New file. * intl/Makefile.in: New file. * intl/string_literals.cc: New file. * acinclude.m4 (GLIBCPP_CONFIGURE): Bump VERSION to 3.1.0. Add requisite setup for gettext. Re-arrange. * aclocal.m4: Regenerate. * configure.in: Don't call GLIBCPP_CHECK_COMPILER_VERSION. Output Makefile bits for po and intl. * configure: Regenerate. * Makefile.am (SUBDIRS): Add intl, po. Add rule for dist. * Makefile.in: Regenerate. * acconfig.h: Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY. * config.h.in: Regenerate. * acinclude.m4 (AC_REPLACE_STRINGFUNCS): Remove. * include/Makefile.am (install-data-local): Don't install Makefile. * include/Makefile.in: Regenerate. * include/bits/locale_facet.h (locale::facet::_S_clone_c_locale): Add member. * config/locale/c_locale_gnu.cc (_S_clone_c_locale): Add definition. * config/locale/c_locale_generic.cc: Same. * config/locale/c_locale_ieee_1003.1-200x.cc: Same. * include/bits/codecvt.h: Excise non-standard, non-required bits. This includes __enc_traits, and partial specializations of codecvt for __enc_traits. * src/codecvt.cc (__enc_traits::_S_max_size): Guard * config/codecvt_partials_ieee_1003.1-200x.h: New file. * config/codecvt_partials_generic.h: New file. * include/Makefile.am (allstamps): Add stamp-codecvt_model. (stamp-codecvt_model): Add. * include/Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in codecvt configury. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/22_locale/codecvt_unicode_wchar_t.cc: Use macro guard. * testsuite/22_locale/codecvt_unicode_char.cc: Same. * testsuite/22_locale/ctor_copy_dtor.cc: And here. * include/bits/localefwd.h (class locale::facet): Add __enc_traits as a friend for _S_*_c_locale functions. * include/bits/codecvt.h (__enc_traits::__enc_traits): Add locale argument to default constructor so that CODESET information can be deduced. * include/bits/locale_facets.h (messages_byname): Re-implement. Remove specializations. * src/locale.cc (messages_byname<char>): Remove specialization. (messages_byname<wchar_t>): Same. * config/locale/c_locale_ieee_1003.1-200x.cc: New file. * config/locale/c_locale_ieee_1003.1-200x.h: New file. * config/locale/messages_members_ieee_1003.1-200x.cc: New file. * config/locale/messages_members_ieee_1003.1-200x.h: New file. * config/locale/messages_members_gnu.cc: New file. * config/locale/messages_members_gnu.h: New file. * config/locale/messages_members_generic.cc: New file. * config/locale/messages_members_generic.h: New file. * docs/html/configopts.html: Add documentation for new locale model, ieee_1003.1. Adjust other flags for current defaults. * docs/html/22_locale/locale.html: Update. * docs/html/22_locale/howto.html: Add link to messages.html. Organize. * docs/html/22_locale/messages.html: New. * src/Makefile.am (sources): Add messages_virtuals.cc. * src/Makefile.in: Regenerate. * include/Makefile.am (allstamps): Add stamp-messages_model. (stamp-messages_model): Add. * include/Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in messages configury. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite_flags.in (--cxxflags): Add LOCALEDIR. * testsuite/lib/libstdc++-v3-dg.exp: Remove broken LD_LIBRARY_PATH bits for Irix. * acinclude (GLIBCPP_ENABLE_CLOCALE): Set glibcpp_localedir to the build directories message catalog base directory, and export. Eventually this should probably be made to deal with build and install directories. For now, punt on this as the library itself doesn't use message catalogs (yet). * testsuite/22_locale/messages.cc: New file. * testsuite/22_locale/messages_char_members.cc: New file. * testsuite/22_locale/messages_byname.cc: New file. From-SVN: r44702
195 lines
5.7 KiB
C++
195 lines
5.7 KiB
C++
// Wrapper of C-language FILE struct -*- C++ -*-
|
|
|
|
// Copyright (C) 2000, 2001 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: 27.8 File-based streams
|
|
//
|
|
|
|
#include <bits/basic_file.h>
|
|
|
|
namespace std
|
|
{
|
|
// __basic_file<char> definitions
|
|
__basic_file<char>::__basic_file(__c_lock* __lock)
|
|
{
|
|
#ifdef _IO_MTSAFE_IO
|
|
_lock = __lock;
|
|
#endif
|
|
// Don't set the orientation of the stream when initializing.
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
_IO_no_init(this, 0, 0, &_M_wfile, 0);
|
|
#else /* !defined(_GLIBCPP_USE_WCHAR_T) */
|
|
_IO_no_init(this, 0, 0, NULL, 0);
|
|
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
|
|
_IO_JUMPS((_IO_FILE_plus *) this) = &_IO_file_jumps;
|
|
_IO_file_init((_IO_FILE_plus*)this);
|
|
}
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<char>::overflow(int __c)
|
|
{ return _IO_file_overflow(this, __c); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<char>::underflow()
|
|
{ return _IO_file_underflow(this); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<char>::uflow()
|
|
{ return _IO_default_uflow(this); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<char>::pbackfail(int __c)
|
|
{ return _IO_default_pbackfail(this, __c); }
|
|
|
|
streamsize
|
|
__basic_file<char>::xsputn(const char* __s, streamsize __n)
|
|
{ return _IO_file_xsputn(this, __s, __n); }
|
|
|
|
streamoff
|
|
__basic_file<char>::seekoff(streamoff __off, ios_base::seekdir __way,
|
|
ios_base::openmode __mode)
|
|
{ return _IO_file_seekoff(this, __off, __way, __mode); }
|
|
|
|
streamoff
|
|
__basic_file<char>::seekpos(streamoff __pos, ios_base::openmode __mode)
|
|
{ return _IO_file_seekoff(this, __pos, ios_base::beg, __mode); }
|
|
|
|
// NB: Unused.
|
|
streambuf*
|
|
__basic_file<char>::setbuf(char* __b, int __len)
|
|
{ return (streambuf*) _IO_file_setbuf(this,__b, __len); }
|
|
|
|
int
|
|
__basic_file<char>::sync()
|
|
{ return _IO_file_sync(this); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<char>::doallocate()
|
|
{ return _IO_file_doallocate(this); }
|
|
|
|
// __basic_file<wchar_t> definitions
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
__basic_file<wchar_t>::__basic_file(__c_lock* __lock)
|
|
{
|
|
#ifdef _IO_MTSAFE_IO
|
|
_lock = __lock;
|
|
#endif
|
|
// Don't set the orientation of the stream when initializing.
|
|
_IO_no_init(this, 0, 0, &_M_wfile, &_IO_wfile_jumps);
|
|
_IO_JUMPS((_IO_FILE_plus *) this) = &_IO_wfile_jumps;
|
|
_IO_file_init((_IO_FILE_plus*)this);
|
|
|
|
// In addition, need to allocate the buffer...
|
|
_IO_wdoallocbuf(this);
|
|
// Setup initial positions for this buffer...
|
|
// if (!(_flags & _IO_NO_READS))
|
|
_IO_wsetg(this, _wide_data->_IO_buf_base, _wide_data->_IO_buf_base,
|
|
_wide_data->_IO_buf_base);
|
|
// if (!(_flags & _IO_NO_WRITES))
|
|
_IO_wsetp(this, _wide_data->_IO_buf_base, _wide_data->_IO_buf_base);
|
|
|
|
// Setup codecvt bits...
|
|
_codecvt = &__c_libio_codecvt;
|
|
|
|
// Do the same for narrow bits...
|
|
if (_IO_write_base == NULL)
|
|
{
|
|
_IO_doallocbuf(this);
|
|
// if (!(_flags & _IO_NO_READS))
|
|
_IO_setg(this, _IO_buf_base, _IO_buf_base, _IO_buf_base);
|
|
// if (!(_flags & _IO_NO_WRITES))
|
|
_IO_setp(this, _IO_buf_base, _IO_buf_base);
|
|
}
|
|
}
|
|
|
|
int
|
|
__basic_file<wchar_t>::overflow(int __c)
|
|
{ return _IO_wfile_overflow(this, __c); }
|
|
|
|
int
|
|
__basic_file<wchar_t>::underflow()
|
|
{ return _IO_wfile_underflow(this); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<wchar_t>::uflow()
|
|
{ return _IO_wdefault_uflow(this); }
|
|
|
|
// NB: Unused.
|
|
int
|
|
__basic_file<wchar_t>::pbackfail(int __c)
|
|
{ return _IO_wdefault_pbackfail(this, __c); }
|
|
|
|
streamsize
|
|
__basic_file<wchar_t>::xsputn(const wchar_t* __s, streamsize __n)
|
|
{ return _IO_wfile_xsputn(this, __s, __n); }
|
|
|
|
streamoff
|
|
__basic_file<wchar_t>::seekoff(streamoff __off, ios_base::seekdir __way,
|
|
ios_base::openmode __mode)
|
|
{ return _IO_wfile_seekoff(this, __off, __way, __mode); }
|
|
|
|
streamoff
|
|
__basic_file<wchar_t>::seekpos(streamoff __pos, ios_base::openmode __mode)
|
|
{ return _IO_wfile_seekoff(this, __pos, ios_base::beg, __mode); }
|
|
|
|
streambuf*
|
|
__basic_file<wchar_t>::setbuf(wchar_t* __b, int __len)
|
|
{ return (streambuf*) _IO_wfile_setbuf(this,__b, __len); }
|
|
|
|
int
|
|
__basic_file<wchar_t>::sync()
|
|
{ return _IO_wfile_sync(this); }
|
|
|
|
int
|
|
__basic_file<wchar_t>::doallocate()
|
|
{ return _IO_wfile_doallocate(this); }
|
|
#endif
|
|
|
|
// Need to instantiate base class here for type-info bits, etc
|
|
template struct __basic_file_base<char>;
|
|
template class __basic_file<char>;
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template struct __basic_file_base<wchar_t>;
|
|
template class __basic_file<wchar_t>;
|
|
#endif
|
|
} // namespace std
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|