cstdio: New.

2006-02-05  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/cstdio: New.
	* include/tr1/stdio.h: Likewise.
	* include/Makefile.am: Add.
	* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: New.
	* testsuite/tr1/headers.cc: Update.	
	* docs/html/ext/tr1.html: Update.

	* include/tr1/cwchar: Simplify, use _GLIBCXX_USE_C99, consistently
	with the facilities in std::.
	* include/tr1/cwctype: Likewise.
	* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Tweak.
	* testsuite/tr1/8_c_compatibility/cwctype/functions.cc: Likewise.
	* acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Remove <wchar.h> and
	<wctype.h> checks.

	* include/Makefile.in: Regenerate.
	* config.h.in: Likewise.
	* configure: Likewise.

From-SVN: r110613
This commit is contained in:
Paolo Carlini 2006-02-05 11:38:57 +00:00 committed by Paolo Carlini
parent dc2cd23211
commit 93638ec794
15 changed files with 239 additions and 273 deletions

View File

@ -1,3 +1,24 @@
2006-02-05 Paolo Carlini <pcarlini@suse.de>
* include/tr1/cstdio: New.
* include/tr1/stdio.h: Likewise.
* include/Makefile.am: Add.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: New.
* testsuite/tr1/headers.cc: Update.
* docs/html/ext/tr1.html: Update.
* include/tr1/cwchar: Simplify, use _GLIBCXX_USE_C99, consistently
with the facilities in std::.
* include/tr1/cwctype: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Tweak.
* testsuite/tr1/8_c_compatibility/cwctype/functions.cc: Likewise.
* acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Remove <wchar.h> and
<wctype.h> checks.
* include/Makefile.in: Regenerate.
* config.h.in: Likewise.
* configure: Likewise.
2006-02-04 Paolo Carlini <pcarlini@suse.de>
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Fix.

View File

@ -1203,50 +1203,6 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
<tr1/cinttypes> in namespace std::tr1.])
fi
# Check for the existence of <wchar.h> functions.
AC_MSG_CHECKING([for ISO C99 support to TR1 in <wchar.h>])
AC_CACHE_VAL(ac_c99_wchar_tr1, [
AC_TRY_COMPILE([#include <wchar.h>
#include <stdio.h>
#include <stdarg.h>],
[const wchar_t* nptr;
const wchar_t* format;
const wchar_t* s;
wchar_t** endptr;
FILE* stream;
va_list arg;
int base;
float fret = wcstof(nptr, endptr);
long double ldret = wcstold(nptr, endptr);
int ret = vfwscanf(stream, format, arg);
ret = vswscanf(s, format, arg);
ret = vwscanf(format, arg);
long long llret = wcstoll(nptr, endptr, base);
unsigned long long ullret = wcstoull(nptr, endptr, base);
],[ac_c99_wchar_tr1=yes], [ac_c99_wchar_tr1=no])
])
AC_MSG_RESULT($ac_c99_wchar_tr1)
if test x"$ac_c99_wchar_tr1" = x"yes"; then
AC_DEFINE(_GLIBCXX_USE_C99_WCHAR_TR1, 1,
[Define if C99 functions in <wchar.h> should be imported in
<tr1/cwchar> in namespace std::tr1.])
fi
# Check for the existence of <wctype.h> functions.
AC_MSG_CHECKING([for ISO C99 support to TR1 in <wctype.h>])
AC_CACHE_VAL(ac_c99_wctype_tr1, [
AC_TRY_COMPILE([#include <wctype.h>],
[wint_t ch;
int ret = iswblank(ch);
],[ac_c99_wctype_tr1=yes], [ac_c99_wctype_tr1=no])
])
AC_MSG_RESULT($ac_c99_wctype_tr1)
if test x"$ac_c99_wctype_tr1" = x"yes"; then
AC_DEFINE(_GLIBCXX_USE_C99_WCTYPE_TR1, 1,
[Define if C99 functions in <wctype.h> should be imported in
<tr1/cwctype> in namespace std::tr1.])
fi
AC_LANG_RESTORE
])

View File

@ -719,14 +719,6 @@
namespace std::tr1. */
#undef _GLIBCXX_USE_C99_STDINT_TR1
/* Define if C99 functions in <wchar.h> should be imported in <tr1/cwchar> in
namespace std::tr1. */
#undef _GLIBCXX_USE_C99_WCHAR_TR1
/* Define if C99 functions in <wctype.h> should be imported in <tr1/cwctype>
in namespace std::tr1. */
#undef _GLIBCXX_USE_C99_WCTYPE_TR1
/* Define if iconv and related functions exist and are usable. */
#undef _GLIBCXX_USE_ICONV

148
libstdc++-v3/configure vendored
View File

@ -30679,154 +30679,6 @@ _ACEOF
fi
# Check for the existence of <wchar.h> functions.
echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <wchar.h>" >&5
echo $ECHO_N "checking for ISO C99 support to TR1 in <wchar.h>... $ECHO_C" >&6
if test "${ac_c99_wchar_tr1+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <wchar.h>
#include <stdio.h>
#include <stdarg.h>
int
main ()
{
const wchar_t* nptr;
const wchar_t* format;
const wchar_t* s;
wchar_t** endptr;
FILE* stream;
va_list arg;
int base;
float fret = wcstof(nptr, endptr);
long double ldret = wcstold(nptr, endptr);
int ret = vfwscanf(stream, format, arg);
ret = vswscanf(s, format, arg);
ret = vwscanf(format, arg);
long long llret = wcstoll(nptr, endptr, base);
unsigned long long ullret = wcstoull(nptr, endptr, base);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_c99_wchar_tr1=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c99_wchar_tr1=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_c99_wchar_tr1" >&5
echo "${ECHO_T}$ac_c99_wchar_tr1" >&6
if test x"$ac_c99_wchar_tr1" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
#define _GLIBCXX_USE_C99_WCHAR_TR1 1
_ACEOF
fi
# Check for the existence of <wctype.h> functions.
echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <wctype.h>" >&5
echo $ECHO_N "checking for ISO C99 support to TR1 in <wctype.h>... $ECHO_C" >&6
if test "${ac_c99_wctype_tr1+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <wctype.h>
int
main ()
{
wint_t ch;
int ret = iswblank(ch);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_c99_wctype_tr1=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c99_wctype_tr1=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_c99_wctype_tr1" >&5
echo "${ECHO_T}$ac_c99_wctype_tr1" >&6
if test x"$ac_c99_wctype_tr1" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
#define _GLIBCXX_USE_C99_WCTYPE_TR1 1
_ACEOF
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

View File

@ -2075,41 +2075,41 @@ release.
<tr>
<td>8.24</td>
<td>Additions to header <code>&lt;cstdio&gt;</code></td>
<td>done</td>
<td></td>
<td></td>
<td>missing</td>
<td></td>
</tr>
<tr>
<td>8.24.1</td>
<td>Synopsis</td>
<td>done</td>
<td></td>
<td></td>
<td>missing</td>
<td></td>
</tr>
<tr>
<td>8.24.2</td>
<td>Definitions</td>
<td>done</td>
<td></td>
<td></td>
<td>missing</td>
<td></td>
</tr>
<tr>
<td>8.24.3</td>
<td>Additional format specifiers</td>
<td>done</td>
<td></td>
<td></td>
<td>missing</td>
<td></td>
<td>C library responsability</td>
</tr>
<tr>
<td>8.24.4</td>
<td>Additions to header <code>&lt;stdio.h&gt;</code></td>
<td>done</td>
<td></td>
<td></td>
<td>missing</td>
<td></td>
</tr>
<tr>
@ -2214,7 +2214,7 @@ release.
<td>done</td>
<td></td>
<td></td>
<td></td>
<td>C library responsability</td>
</tr>
<tr>
<td>8.31</td>
@ -2307,7 +2307,7 @@ permitted in any medium, provided this notice is preserved.
<table width="100%" border="0">
<tr>
<td>
<!-- IGNORE DIFF -->Last modified 2006-02-03
<!-- IGNORE DIFF -->Last modified 2006-02-05
</td>
<td align="right" valign="bottom">
<a href="http://validator.w3.org/check/referer">

View File

@ -493,6 +493,7 @@ tr1_headers = \
${tr1_srcdir}/complex \
${tr1_srcdir}/cstdarg \
${tr1_srcdir}/cstdint \
${tr1_srcdir}/cstdio \
${tr1_srcdir}/ctype.h \
${tr1_srcdir}/cwchar \
${tr1_srcdir}/cwctype \
@ -510,6 +511,7 @@ tr1_headers = \
${tr1_srcdir}/repeat.h \
${tr1_srcdir}/stdarg.h \
${tr1_srcdir}/stdint.h \
${tr1_srcdir}/stdio.h \
${tr1_srcdir}/tuple \
${tr1_srcdir}/tuple_iterate.h \
${tr1_srcdir}/type_traits \

View File

@ -710,6 +710,7 @@ tr1_headers = \
${tr1_srcdir}/complex \
${tr1_srcdir}/cstdarg \
${tr1_srcdir}/cstdint \
${tr1_srcdir}/cstdio \
${tr1_srcdir}/ctype.h \
${tr1_srcdir}/cwchar \
${tr1_srcdir}/cwctype \
@ -727,6 +728,7 @@ tr1_headers = \
${tr1_srcdir}/repeat.h \
${tr1_srcdir}/stdarg.h \
${tr1_srcdir}/stdint.h \
${tr1_srcdir}/stdio.h \
${tr1_srcdir}/tuple \
${tr1_srcdir}/tuple_iterate.h \
${tr1_srcdir}/type_traits \

View File

@ -0,0 +1,57 @@
// TR1 cstdio -*- C++ -*-
// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// 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.
/** @file
* This is a TR1 C++ Library header.
*/
#ifndef _TR1_CSTDIO
#define _TR1_CSTDIO 1
#include <bits/c++config.h>
#include <cstdio>
// namespace std::tr1
namespace std
{
_GLIBCXX_BEGIN_NAMESPACE(tr1)
#if _GLIBCXX_USE_C99
using std::snprintf;
using std::vsnprintf;
using std::vfscanf;
using std::vscanf;
using std::vsscanf;
#endif
_GLIBCXX_END_NAMESPACE
}
#endif

View File

@ -40,51 +40,29 @@
#include <cwchar>
#if _GLIBCXX_USE_C99_WCHAR_TR1
#undef wcstof
#undef wcstold
#undef wcstoll
#undef wcstoull
#undef vfwscanf
#undef vswscanf
#undef vwscanf
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
extern "C" long double
(wcstold)(const wchar_t * restrict, wchar_t ** restrict);
#endif
#if !_GLIBCXX_USE_C99_DYNAMIC
using ::wcstold;
#endif
#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
extern "C" long long int
(wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int);
extern "C" unsigned long long int
(wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int);
#endif
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
using ::wcstoll;
using ::wcstoull;
#endif
_GLIBCXX_END_NAMESPACE
// namespace std::tr1
namespace std
{
_GLIBCXX_BEGIN_NAMESPACE(tr1)
using ::wcstof;
using ::__gnu_cxx::wcstold;
using ::__gnu_cxx::wcstoll;
using ::__gnu_cxx::wcstoull;
#if _GLIBCXX_HAVE_WCSTOF
using std::wcstof;
#endif
#if _GLIBCXX_HAVE_VFWSCANF
using std::vfwscanf;
#endif
#if _GLIBCXX_HAVE_VSWSCANF
using std::vswscanf;
#endif
#if _GLIBCXX_HAVE_VWSCANF
using std::vwscanf;
#endif
using ::vfwscanf;
using ::vswscanf;
using ::vwscanf;
#if _GLIBCXX_USE_C99
using std::wcstold;
using std::wcstoll;
using std::wcstoull;
#endif
_GLIBCXX_END_NAMESPACE
}
@ -92,5 +70,3 @@ _GLIBCXX_END_NAMESPACE
#endif
#endif
#endif

View File

@ -40,16 +40,14 @@
#include <cwctype>
#if _GLIBCXX_USE_C99_WCTYPE_TR1
#undef iswblank
// namespace std::tr1
namespace std
{
_GLIBCXX_BEGIN_NAMESPACE(tr1)
using ::iswblank;
#if _GLIBCXX_HAVE_ISWBLANK
using std::iswblank;
#endif
_GLIBCXX_END_NAMESPACE
}
@ -57,5 +55,3 @@ _GLIBCXX_END_NAMESPACE
#endif
#endif
#endif

View File

@ -0,0 +1,39 @@
// TR1 stdio.h -*- C++ -*-
// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// 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.
/** @file
* This is a TR1 C++ Library header.
*/
#ifndef _TR1_STDIO_H
#define _TR1_STDIO_H 1
#include <tr1/cstdio>
#endif

View File

@ -0,0 +1,52 @@
// { dg-do compile }
// 2006-02-05 Paolo Carlini <pcarlini@suse.de>
//
// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 8.24 Additions to header <cstdio>
#include <tr1/cstdio>
#include <cstdarg>
#include <cstddef>
void test01(int dummy, ...)
{
std::va_list ap;
va_start(ap, dummy);
#if _GLIBCXX_USE_C99
char* s = 0;
const char* cs = 0;
const char* format = "%i";
FILE* stream = 0;
std::size_t n = 0;
int ret;
ret = std::tr1::snprintf(s, n, format, dummy);
ret = std::tr1::vsnprintf(s, n, format, ap);
ret = std::tr1::vfscanf(stream, format, ap);
ret = std::tr1::vscanf(format, ap);
ret = std::tr1::vsscanf(cs, format, ap);
#endif
}

View File

@ -30,32 +30,51 @@
void test01(int dummy, ...)
{
#if _GLIBCXX_USE_C99_WCHAR_TR1
const wchar_t* nptr = 0;
const wchar_t* format = 0;
const wchar_t* s = 0;
wchar_t** endptr = 0;
FILE* stream = 0;
std::va_list arg;
va_start(arg, dummy);
#if _GLIBCXX_HAVE_WCSTOF
const wchar_t* nptr1 = 0;
wchar_t** endptr1 = 0;
float fret;
long double ldret;
int ret;
fret = std::tr1::wcstof(nptr1, endptr1);
#endif
fret = std::tr1::wcstof(nptr, endptr);
ldret = std::tr1::wcstold(nptr, endptr);
ret = std::tr1::vfwscanf(stream, format, arg);
ret = std::tr1::vswscanf(s, format, arg);
ret = std::tr1::vwscanf(format, arg);
#if _GLIBCXX_HAVE_VFWSCANF
FILE* stream = 0;
const wchar_t* format1 = 0;
int ret1;
ret1 = std::tr1::vfwscanf(stream, format1, arg);
#endif
#if _GLIBCXX_HAVE_VSWSCANF
const wchar_t* s = 0;
const wchar_t* format2 = 0;
int ret2;
ret2 = std::tr1::vswscanf(s, format2, arg);
#endif
#if _GLIBCXX_HAVE_VWSCANF
const wchar_t* format3 = 0;
int ret3;
ret3 = std::tr1::vwscanf(format3, arg);
#endif
#if _GLIBCXX_USE_C99
const wchar_t* nptr2 = 0;
wchar_t** endptr2 = 0;
long double ldret;
ldret = std::tr1::wcstold(nptr2, endptr2);
#ifdef _GLIBCXX_USE_LONG_LONG
const wchar_t* nptr3 = 0;
wchar_t** endptr3 = 0;
int base = 0;
long long llret;
unsigned long long ullret;
llret = std::tr1::wcstoll(nptr, endptr, base);
ullret = std::tr1::wcstoull(nptr, endptr, base);
llret = std::tr1::wcstoll(nptr3, endptr3, base);
ullret = std::tr1::wcstoull(nptr3, endptr3, base);
#endif
#endif

View File

@ -28,7 +28,7 @@
void test01()
{
#if _GLIBCXX_USE_C99_WCTYPE_TR1
#if _GLIBCXX_HAVE_ISWBLANK
std::wint_t ch = 0;
int ret;

View File

@ -29,6 +29,7 @@
#include <tr1/complex>
#include <tr1/cstdarg>
#include <tr1/cstdint>
#include <tr1/cstdio>
#include <tr1/ctype.h>
#include <tr1/cwchar>
#include <tr1/cwctype>
@ -41,6 +42,7 @@
#include <tr1/memory>
#include <tr1/stdarg.h>
#include <tr1/stdint.h>
#include <tr1/stdio.h>
#include <tr1/tuple>
#include <tr1/type_traits>
#include <tr1/unordered_set>