mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Thu Mar 16 00:04:41 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/C-ctype.c: New correct data generated by drepper. * Rules: Don't use $(libc.a). Parsing of grouped numbers contributed by Ulrich Drepper. * stdlib/strtol.c (__strtol_internal): Renamed from strtol. Take new flag arg; if nonzero, parse locale-dependent thousands grouping and interpret only the prefix that is correctly grouped. (strtol): Define this to call _strtol_internal with zero for the flag. Use a weak symbol for the definition. * stdlib/strtod.c (strtod, __strtod_internal): Likewise. Check for the exponent of the number overflowing the float format. * stdlib/stdlib.h (__strtof, __strtold): Declarations removed. (__strto{f,d,ld,l,ul,q,uq}_internal): Declare these functions. [__OPTIMIZE__]: Define inline functions calling those. * stdlib/grouping.h: New file, written by drepper. * stdlib/Makefile (distribute): Add grouping.h. * stdio/vfscanf.c: Grok %' modifier to numeric conversions. Call __strtoX_internal with the grouping flag set iff the modifier is present. Wed Mar 15 00:40:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/generic/memchr.c: Fix typos: limit.h -> limits.h. * mach/Machrules: Produce static deps for all object flavors. [interface-library]: Remove all these variables and rules. ($(interface-library)-routines): Define this variable. (extra-libs): Append $(interface-library) to this. * mach/Makefile (interface-library): Omit .a suffix. * hurd/Makefile: Likewise. Tue Mar 14 23:40:31 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * stdio/internals.c (flushbuf): If !FLUSH_ONLY, don't skip out early if no new data in buffer after priming. * Makerules (object-suffixes, libtypes): Move all these variables to Makeconfig. * Makeconfig (object-suffixes, libtypes): Moved here from Makerules. * Makerules (build-extra-lib): New canned sequence. * sysdeps/mach/hurd/euidaccess.c: Include fcntl.h. Declare ERR; fix uses of FILE and PORT. Remove bogus weak alias for `access'. * sysdeps/mach/hurd/dirfd.c: Include hurd/fd.h and errno.h. Add missing semicolon. * sysdeps/mach/hurd/opendir.c: Include hurd/fd.h. Use a `struct hurd_fd *' temp var, since DIRP->__fd is a `void *'. * sysdeps/mach/hurd/readdir.c: Include hurd/fd.h. * stdlib/wcstombs.c: #if 0 out code for non-ASCII chars until the locale data format is implemented. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Pass &__sigreturn on the stack to the trampoline code, so it is not position-dependent. * stdio/printf_fp.c (NDEBUG): Define this to disable assert. Don't include <stdarg.h>. (__printf_fp): Last arg ARGS is now `const void **const'; dereference ARGS[0] instead of using va_arg. * locale/setlocale.c: In LC_ALL case, initialize CATEGORY before loop to install data. * locale/loadlocale.c (_nl_category_num_items): Use _NL_ITEM_INDEX to extract number from item code. (_nl_load_locale): Close the descriptor when finished. * malloc/realloc.c (_realloc_internal): Call _malloc_internal in place of malloc. * time/tzfile.c (__tzfile_default): Initialize RULE_STDOFF to zero.
This commit is contained in:
123
stdlib/grouping.h
Normal file
123
stdlib/grouping.h
Normal file
@ -0,0 +1,123 @@
|
||||
/* Internal header for proving correct grouping in strings of numbers.
|
||||
Copyright (C) 1995 Free Software Foundation, Inc.
|
||||
Contributed by Ulrich Drepper.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a,b) ({ typeof(a) _a = (a); typeof(b) _b = (b); \
|
||||
_a > _b ? _a : _b; })
|
||||
#endif
|
||||
|
||||
/* Find the maximum prefix of the string between BEGIN and END which
|
||||
satisfies the grouping rules. It is assumed that at least one digit
|
||||
follows BEGIN directly. */
|
||||
|
||||
static inline const char *
|
||||
correctly_grouped_prefix (const char *begin, const char *end,
|
||||
wchar_t thousands, const char *grouping)
|
||||
{
|
||||
if (! grouping)
|
||||
return end;
|
||||
|
||||
while (end > begin)
|
||||
{
|
||||
const char *cp = end - 1;
|
||||
const char *gp = grouping;
|
||||
|
||||
/* Check first group. */
|
||||
while (cp >= begin && (wchar_t) *cp != thousands)
|
||||
--cp;
|
||||
|
||||
if (end - cp == (int) *gp + 1)
|
||||
{
|
||||
/* This group matches the specification. */
|
||||
|
||||
const char *new_end;
|
||||
|
||||
if (cp < begin)
|
||||
/* There is just one complete group. We are done. */
|
||||
return end;
|
||||
|
||||
/* CP points to a thousands separator character. The preceding
|
||||
remainder of the string from BEGIN to NEW_END is the part we
|
||||
will consider if there is a grouping error in this trailing
|
||||
portion from CP to END. */
|
||||
new_end = cp - 1;
|
||||
|
||||
/* Loop while the grouping is correct. */
|
||||
while (1)
|
||||
{
|
||||
/* Get the next grouping rule. */
|
||||
++gp;
|
||||
if (*gp == 0)
|
||||
/* If end is reached use last rule. */
|
||||
--gp;
|
||||
|
||||
/* Skip the thousands separator. */
|
||||
--cp;
|
||||
|
||||
if (*gp == CHAR_MAX || *gp < 0)
|
||||
{
|
||||
/* No more thousands separators are allowed to follow. */
|
||||
while (cp >= begin && (wchar_t) *cp != thousands)
|
||||
--cp;
|
||||
|
||||
if (cp < begin)
|
||||
/* OK, only digits followed. */
|
||||
return end;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Check the next group. */
|
||||
const char *group_end = cp;
|
||||
|
||||
while (cp >= begin && (wchar_t) *cp != thousands)
|
||||
--cp;
|
||||
|
||||
if (cp < begin && group_end - cp <= (int) *gp)
|
||||
/* Final group is correct. */
|
||||
return end;
|
||||
|
||||
if (cp < begin || group_end - cp != (int) *gp)
|
||||
/* Incorrect group. Punt. */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* The trailing portion of the string starting at NEW_END
|
||||
contains a grouping error. So we will look for a correctly
|
||||
gouped number in the preceding portion instead. */
|
||||
end = new_end;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Even the first group was wrong; determine maximum shift. */
|
||||
if (end - cp > (int) *gp + 1)
|
||||
end = cp + (int) *gp + 1;
|
||||
else if (cp < begin)
|
||||
/* This number does not fill the first group, but is correct. */
|
||||
return end;
|
||||
else
|
||||
/* CP points to a thousands seperator character. */
|
||||
end = cp;
|
||||
}
|
||||
}
|
||||
|
||||
return MAX (begin, end);
|
||||
}
|
Reference in New Issue
Block a user