[PATCH] wcstod/wcstof
Jeff Johnston
jjohnstn@redhat.com
Fri Feb 13 14:29:00 GMT 2009
Patch checked in with modifications. I added _wcstof_r and fixed a typo
in stdlib.tex
where wcstod and wcstol were mixed up in their descriptions.
Thanks,
-- Jeff J.
Corinna Vinschen wrote:
> Hi,
>
> below is my patch for a wcstod/wcstof implementation. It's using the
> FreeBSD implementation and is just converted to providing reentrancy as
> well. For now I decided to ignore the potential problem of a multibyte
> decimalpoint. It's currently ignored in all three BSD variants as well.
>
> Ok to apply?
>
>
> Thanks,
> Corinna
>
>
> * libc/include/wchar.h (_wcstod_r): Declare.
> (wcstod): Declare.
> (wcstof): Declare.
> * libc/stdlib/Makefile.am (GENERAL_SOURCES): Add wcstod.c.
> (CHEWOUT_FILES): Add wcstol.def.
> * libc/stdlib/Makefile.in: Regenerate.
> * libc/stdlib/stdlib.tex: Add wcstod.
> * libc/stdlib/wcstod.c: New file.
>
>
> Index: libc/include/wchar.h
> ===================================================================
> RCS file: /cvs/src/src/newlib/libc/include/wchar.h,v
> retrieving revision 1.19
> diff -u -p -r1.19 wchar.h
> --- libc/include/wchar.h 12 Dec 2008 19:47:05 -0000 1.19
> +++ libc/include/wchar.h 12 Feb 2009 15:20:27 -0000
> @@ -74,6 +74,9 @@ wchar_t *_EXFUN(wcsrchr, (const wchar_t
> size_t _EXFUN(wcsspn, (const wchar_t *, const wchar_t *));
> wchar_t *_EXFUN(wcsstr, (const wchar_t *, const wchar_t *));
> wchar_t *_EXFUN(wcstok, (wchar_t *, const wchar_t *, wchar_t **));
> +double _EXFUN(_wcstod_r, (struct _reent *, const wchar_t *, wchar_t **));
> +double _EXFUN(wcstod, (const wchar_t *, wchar_t **));
> +float _EXFUN(wcstof, (const wchar_t *, wchar_t **));
> int _EXFUN(wcswidth, (const wchar_t *, size_t));
> size_t _EXFUN(wcsxfrm, (wchar_t *, const wchar_t *, size_t));
> int _EXFUN(wcwidth, (const wchar_t));
> Index: libc/stdlib/Makefile.am
> ===================================================================
> RCS file: /cvs/src/src/newlib/libc/stdlib/Makefile.am,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile.am
> --- libc/stdlib/Makefile.am 19 Nov 2008 20:55:52 -0000 1.25
> +++ libc/stdlib/Makefile.am 12 Feb 2009 15:20:27 -0000
> @@ -51,6 +51,7 @@ GENERAL_SOURCES = \
> strtod.c \
> strtol.c \
> strtoul.c \
> + wcstod.c \
> wcstol.c \
> wcstoul.c \
> wcstombs.c \
> @@ -238,12 +239,12 @@ CHEWOUT_FILES= \
> strtoll.def \
> strtoul.def \
> strtoull.def \
> + wcstod.def \
> wcstol.def \
> wcstoll.def \
> wcstoul.def \
> wcstoull.def \
> system.def \
> - wcstol.def \
> wcstombs.def \
> wctomb.def
>
> Index: libc/stdlib/stdlib.tex
> ===================================================================
> RCS file: /cvs/src/src/newlib/libc/stdlib/stdlib.tex,v
> retrieving revision 1.7
> diff -u -p -r1.7 stdlib.tex
> --- libc/stdlib/stdlib.tex 6 Jul 2007 20:03:28 -0000 1.7
> +++ libc/stdlib/stdlib.tex 12 Feb 2009 15:20:27 -0000
> @@ -40,7 +40,8 @@ The corresponding declarations are in th
> * strtoll:: String to long long
> * strtoul:: String to unsigned long
> * strtoull:: String to unsigned long long
> -* wcstol:: Wide string to long
> +* wcstod:: Wide string to long
> +* wcstol:: Wide string to double or float
> * wcstoll:: Wide string to long long
> * wcstoul:: Wide string to unsigned long
> * wcstoull:: Wide string to unsigned long long
> @@ -152,6 +153,9 @@ The corresponding declarations are in th
> @include stdlib/strtoull.def
>
> @page
> +@include stdlib/wcstod.def
> +
> +@page
> @include stdlib/wcstol.def
>
> @page
> Index: libc/stdlib/wcstod.c
> ===================================================================
> RCS file: libc/stdlib/wcstod.c
> diff -N libc/stdlib/wcstod.c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ libc/stdlib/wcstod.c 12 Feb 2009 15:20:27 -0000
> @@ -0,0 +1,187 @@
> +/*
> +FUNCTION
> + <<wcstod>>, <<wcstof>>---wide char string to double or float
> +
> +INDEX
> + wcstod
> +INDEX
> + _wcstod_r
> +INDEX
> + wcstof
> +
> +ANSI_SYNOPSIS
> + #include <stdlib.h>
> + double wcstod(const wchar_t *<[str]>, wchar_t **<[tail]>);
> + float wcstof(const wchar_t *<[str]>, wchar_t **<[tail]>);
> +
> + double _wcstod_r(void *<[reent]>,
> + const wchar_t *<[str]>, wchar_t **<[tail]>);
> +
> +TRAD_SYNOPSIS
> + #include <stdlib.h>
> + double wcstod(<[str]>,<[tail]>)
> + wchar_t *<[str]>;
> + wchar_t **<[tail]>;
> +
> + float wcstof(<[str]>,<[tail]>)
> + wchar_t *<[str]>;
> + wchar_t **<[tail]>;
> +
> + double _wcstod_r(<[reent]>,<[str]>,<[tail]>)
> + wchar_t *<[reent]>;
> + wchar_t *<[str]>;
> + wchar_t **<[tail]>;
> +
> +DESCRIPTION
> + The function <<wcstod>> parses the wide character string <[str]>,
> + producing a substring which can be converted to a double
> + value. The substring converted is the longest initial
> + subsequence of <[str]>, beginning with the first
> + non-whitespace character, that has one of these formats:
> + .[+|-]<[digits]>[.[<[digits]>]][(e|E)[+|-]<[digits]>]
> + .[+|-].<[digits]>[(e|E)[+|-]<[digits]>]
> + .[+|-](i|I)(n|N)(f|F)[(i|I)(n|N)(i|I)(t|T)(y|Y)]
> + .[+|-](n|N)(a|A)(n|N)[<(>[<[hexdigits]>]<)>]
> + .[+|-]0(x|X)<[hexdigits]>[.[<[hexdigits]>]][(p|P)[+|-]<[digits]>]
> + .[+|-]0(x|X).<[hexdigits]>[(p|P)[+|-]<[digits]>]
> + The substring contains no characters if <[str]> is empty, consists
> + entirely of whitespace, or if the first non-whitespace
> + character is something other than <<+>>, <<->>, <<.>>, or a
> + digit, and cannot be parsed as infinity or NaN. If the platform
> + does not support NaN, then NaN is treated as an empty substring.
> + If the substring is empty, no conversion is done, and
> + the value of <[str]> is stored in <<*<[tail]>>>. Otherwise,
> + the substring is converted, and a pointer to the final string
> + (which will contain at least the terminating null character of
> + <[str]>) is stored in <<*<[tail]>>>. If you want no
> + assignment to <<*<[tail]>>>, pass a null pointer as <[tail]>.
> + <<wcstof>> is identical to <<wcstod>> except for its return type.
> +
> + This implementation returns the nearest machine number to the
> + input decimal string. Ties are broken by using the IEEE
> + round-even rule. However, <<wcstof>> is currently subject to
> + double rounding errors.
> +
> + The alternate function <<_wcstod_r>> is a reentrant version.
> + The extra argument <[reent]> is a pointer to a reentrancy structure.
> +
> +RETURNS
> + <<wcstod>> returns the converted substring value, if any. If
> + no conversion could be performed, 0 is returned. If the
> + correct value is out of the range of representable values,
> + plus or minus <<HUGE_VAL>> is returned, and <<ERANGE>> is
> + stored in errno. If the correct value would cause underflow, 0
> + is returned and <<ERANGE>> is stored in errno.
> +
> +Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
> +<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
> +*/
> +
> +/*-
> + * Copyright (c) 2002 Tim J. Robbins
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.
> + */
> +
> +#include <_ansi.h>
> +#include <errno.h>
> +#include <stdlib.h>
> +#include <wchar.h>
> +
> +double
> +_DEFUN (_wcstod_r, (ptr, nptr, endptr),
> + struct _reent *ptr _AND
> + _CONST wchar_t *nptr _AND
> + wchar_t **endptr)
> +{
> + static const mbstate_t initial;
> + mbstate_t mbs;
> + double val;
> + char *buf, *end;
> + const wchar_t *wcp;
> + size_t len;
> +
> + while (iswspace(*nptr))
> + nptr++;
> +
> + /*
> + * Convert the supplied numeric wide char. string to multibyte.
> + *
> + * We could attempt to find the end of the numeric portion of the
> + * wide char. string to avoid converting unneeded characters but
> + * choose not to bother; optimising the uncommon case where
> + * the input string contains a lot of text after the number
> + * duplicates a lot of strtod()'s functionality and slows down the
> + * most common cases.
> + */
> + wcp = nptr;
> + mbs = initial;
> + if ((len = _wcsrtombs_r(ptr, NULL, &wcp, 0, &mbs)) == (size_t)-1) {
> + if (endptr != NULL)
> + *endptr = (wchar_t *)nptr;
> + return (0.0);
> + }
> + if ((buf = _malloc_r(ptr, len + 1)) == NULL)
> + return (0.0);
> + mbs = initial;
> + _wcsrtombs_r(ptr, buf, &wcp, len + 1, &mbs);
> +
> + /* Let strtod() do most of the work for us. */
> + val = _strtod_r(ptr, buf, &end);
> +
> + /*
> + * We only know where the number ended in the _multibyte_
> + * representation of the string. If the caller wants to know
> + * where it ended, count multibyte characters to find the
> + * corresponding position in the wide char string.
> + */
> + if (endptr != NULL)
> + /* XXX Assume each wide char is one byte. */
> + *endptr = (wchar_t *)nptr + (end - buf);
> +
> + _free_r(ptr, buf);
> +
> + return (val);
> +}
> +
> +#ifndef NO_REENT
> +
> +double
> +_DEFUN (wcstod, (nptr, endptr),
> + _CONST wchar_t *nptr _AND wchar_t **endptr)
> +{
> + return _wcstod_r (_REENT, nptr, endptr);
> +}
> +
> +float
> +_DEFUN (wcstof, (nptr, endptr),
> + _CONST wchar_t *nptr _AND
> + wchar_t **endptr)
> +{
> + double retval = _wcstod_r (_REENT, nptr, endptr);
> + if (isnan (retval))
> + return nanf (NULL);
> + return (float)retval;
> +}
> +
> +#endif
>
>
>
More information about the Newlib
mailing list