qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use expensive wide char lookups in isw* functions if character is in ASCII range.

This commit is contained in:
Ulrich Drepper 2005-10-17 15:48:30 +00:00
parent ae0d550c3e
commit 5d953aef3c
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wctype/wcfuncs.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. /* Copyright (C) 1996-2001, 2002, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -16,6 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <ctype.h>
#include <wctype.h> #include <wctype.h>
#include <locale/localeinfo.h> #include <locale/localeinfo.h>
@ -24,45 +25,47 @@
/* Provide real-function versions of all the wctype macros. */ /* Provide real-function versions of all the wctype macros. */
#define func(name, type) \ #define func(name, type) \
extern int __##name (wint_t __wc); \ extern int __isw##name (wint_t __wc); \
int \ int \
__##name (wint_t wc) \ __isw##name (wint_t wc) \
{ \ { \
if (isascii (wc)) \
return is##name ((int) wc); \
size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + type; \ size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + type; \
const char *desc = _NL_CURRENT (LC_CTYPE, i); \ const char *desc = _NL_CURRENT (LC_CTYPE, i); \
return wctype_table_lookup (desc, wc); \ return wctype_table_lookup (desc, wc); \
} \ } \
weak_alias (__##name, name) weak_alias (__isw##name, isw##name)
#undef iswalnum #undef iswalnum
func (iswalnum, __ISwalnum) func (alnum, __ISwalnum)
libc_hidden_weak (iswalnum) libc_hidden_weak (iswalnum)
#undef iswalpha #undef iswalpha
func (iswalpha, __ISwalpha) func (alpha, __ISwalpha)
libc_hidden_weak (iswalpha) libc_hidden_weak (iswalpha)
#undef iswblank #undef iswblank
func (iswblank, __ISwblank) func (blank, __ISwblank)
#undef iswcntrl #undef iswcntrl
func (iswcntrl, __ISwcntrl) func (cntrl, __ISwcntrl)
#undef iswdigit #undef iswdigit
func (iswdigit, __ISwdigit) func (digit, __ISwdigit)
libc_hidden_weak (iswdigit) libc_hidden_weak (iswdigit)
#undef iswlower #undef iswlower
func (iswlower, __ISwlower) func (lower, __ISwlower)
libc_hidden_weak (iswlower) libc_hidden_weak (iswlower)
#undef iswgraph #undef iswgraph
func (iswgraph, __ISwgraph) func (graph, __ISwgraph)
#undef iswprint #undef iswprint
func (iswprint, __ISwprint) func (print, __ISwprint)
#undef iswpunct #undef iswpunct
func (iswpunct, __ISwpunct) func (punct, __ISwpunct)
#undef iswspace #undef iswspace
func (iswspace, __ISwspace) func (space, __ISwspace)
libc_hidden_weak (iswspace) libc_hidden_weak (iswspace)
#undef iswupper #undef iswupper
func (iswupper, __ISwupper) func (upper, __ISwupper)
#undef iswxdigit #undef iswxdigit
func (iswxdigit, __ISwxdigit) func (xdigit, __ISwxdigit)
libc_hidden_weak (iswxdigit) libc_hidden_weak (iswxdigit)
#undef towlower #undef towlower

35
wctype/wcfuncs_l.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996,1997,2000,2001,2002,2004 Free Software Foundation, Inc. /* Copyright (C) 1996,1997,2000-2002,2004,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -16,6 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <ctype.h>
#include <wctype.h> #include <wctype.h>
#include <stdint.h> #include <stdint.h>
#include <locale.h> #include <locale.h>
@ -27,29 +28,31 @@
/* Provide real-function versions of all the wctype macros. */ /* Provide real-function versions of all the wctype macros. */
#define func(name, type) \ #define func(name, type) \
int __##name (wint_t wc, __locale_t locale) \ int __isw##name (wint_t wc, __locale_t locale) \
{ \ { \
if (isascii (wc)) \
return is##name ((int) wc, locale); \
size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \ size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \
const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \ const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \
return wctype_table_lookup (desc, wc); \ return wctype_table_lookup (desc, wc); \
} \ } \
libc_hidden_def (__##name) \ libc_hidden_def (__isw##name) \
weak_alias (__##name, name) weak_alias (__isw##name, isw##name)
func (iswalnum_l, __ISwalnum) func (alnum_l, __ISwalnum)
func (iswalpha_l, __ISwalpha) func (alpha_l, __ISwalpha)
func (iswblank_l, __ISwblank) func (blank_l, __ISwblank)
func (iswcntrl_l, __ISwcntrl) func (cntrl_l, __ISwcntrl)
#undef iswdigit_l #undef iswdigit_l
#undef __iswdigit_l #undef __iswdigit_l
func (iswdigit_l, __ISwdigit) func (digit_l, __ISwdigit)
func (iswlower_l, __ISwlower) func (lower_l, __ISwlower)
func (iswgraph_l, __ISwgraph) func (graph_l, __ISwgraph)
func (iswprint_l, __ISwprint) func (print_l, __ISwprint)
func (iswpunct_l, __ISwpunct) func (punct_l, __ISwpunct)
func (iswspace_l, __ISwspace) func (space_l, __ISwspace)
func (iswupper_l, __ISwupper) func (upper_l, __ISwupper)
func (iswxdigit_l, __ISwxdigit) func (xdigit_l, __ISwxdigit)
wint_t wint_t
(__towlower_l) (wint_t wc, __locale_t locale) (__towlower_l) (wint_t wc, __locale_t locale)