From 16133e1530309622f8593c1411f7c4ed1847e672 Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Thu, 12 Aug 2004 09:33:47 +0000 Subject: [PATCH] Move some internal macros and inlines from ctype.h to a new file, _ctype.h, which has been repo-copied from ctype.h. This will allow us to remove namespace pollution from and to make wcwidth() an inline function without introducing more pollution. --- include/Makefile | 3 +- include/_ctype.h | 94 ++++-------------------------------------------- include/ctype.h | 90 +--------------------------------------------- 3 files changed, 9 insertions(+), 178 deletions(-) diff --git a/include/Makefile b/include/Makefile index 985f61e7d3d5..6fdef2a76a78 100644 --- a/include/Makefile +++ b/include/Makefile @@ -5,7 +5,8 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ +INCS= _ctype.h a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h \ + db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ fts.h ftw.h getopt.h glob.h grp.h \ hesiod.h histedit.h ieeefp.h ifaddrs.h \ diff --git a/include/_ctype.h b/include/_ctype.h index 194959e19b4a..acea53909cff 100644 --- a/include/_ctype.h +++ b/include/_ctype.h @@ -38,12 +38,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD$ + * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 + * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp + * $FreeBSD$ */ -#ifndef _CTYPE_H_ -#define _CTYPE_H_ +#ifndef __CTYPE_H_ +#define __CTYPE_H_ #include #include @@ -67,89 +68,6 @@ #define _CTYPE_SW2 0x80000000L /* 2 width character */ #define _CTYPE_SW3 0xc0000000L /* 3 width character */ -__BEGIN_DECLS -int isalnum(int); -int isalpha(int); -int iscntrl(int); -int isdigit(int); -int isgraph(int); -int islower(int); -int isprint(int); -int ispunct(int); -int isspace(int); -int isupper(int); -int isxdigit(int); -int tolower(int); -int toupper(int); - -#if __XSI_VISIBLE -int _tolower(int); -int _toupper(int); -int isascii(int); -int toascii(int); -#endif - -#if __ISO_C_VISIBLE >= 1999 -int isblank(int); -#endif - -#if __BSD_VISIBLE -int digittoint(int); -int ishexnumber(int); -int isideogram(int); -int isnumber(int); -int isphonogram(int); -int isrune(int); -int isspecial(int); -#endif -__END_DECLS - -#define isalnum(c) __istype((c), _CTYPE_A|_CTYPE_D) -#define isalpha(c) __istype((c), _CTYPE_A) -#define iscntrl(c) __istype((c), _CTYPE_C) -#define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */ -#define isgraph(c) __istype((c), _CTYPE_G) -#define islower(c) __istype((c), _CTYPE_L) -#define isprint(c) __istype((c), _CTYPE_R) -#define ispunct(c) __istype((c), _CTYPE_P) -#define isspace(c) __istype((c), _CTYPE_S) -#define isupper(c) __istype((c), _CTYPE_U) -#define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */ -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) - -#if __XSI_VISIBLE -/* - * POSIX.1-2001 specifies _tolower() and _toupper() to be macros equivalent to - * tolower() and toupper() respectively, minus extra checking to ensure that - * the argument is a lower or uppercase letter respectively. We've chosen to - * implement these macros with the same error checking as tolower() and - * toupper() since this doesn't violate the specification itself, only its - * intent. We purposely leave _tolower() and _toupper() undocumented to - * discourage their use. - * - * XXX isascii() and toascii() should similarly be undocumented. - */ -#define _tolower(c) __tolower(c) -#define _toupper(c) __toupper(c) -#define isascii(c) (((c) & ~0x7F) == 0) -#define toascii(c) ((c) & 0x7F) -#endif - -#if __ISO_C_VISIBLE >= 1999 -#define isblank(c) __istype((c), _CTYPE_B) -#endif - -#if __BSD_VISIBLE -#define digittoint(c) __maskrune((c), 0xFF) -#define ishexnumber(c) __istype((c), _CTYPE_X) -#define isideogram(c) __istype((c), _CTYPE_I) -#define isnumber(c) __istype((c), _CTYPE_D) -#define isphonogram(c) __istype((c), _CTYPE_Q) -#define isrune(c) __istype((c), 0xFFFFFF00L) -#define isspecial(c) __istype((c), _CTYPE_T) -#endif - /* See comments in about __ct_rune_t. */ __BEGIN_DECLS unsigned long ___runetype(__ct_rune_t); @@ -220,4 +138,4 @@ __ct_rune_t __tolower(__ct_rune_t); __END_DECLS #endif /* using inlines */ -#endif /* !_CTYPE_H_ */ +#endif /* !__CTYPE_H_ */ diff --git a/include/ctype.h b/include/ctype.h index 194959e19b4a..0825ff652c28 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -47,25 +47,7 @@ #include #include - -#define _CTYPE_A 0x00000100L /* Alpha */ -#define _CTYPE_C 0x00000200L /* Control */ -#define _CTYPE_D 0x00000400L /* Digit */ -#define _CTYPE_G 0x00000800L /* Graph */ -#define _CTYPE_L 0x00001000L /* Lower */ -#define _CTYPE_P 0x00002000L /* Punct */ -#define _CTYPE_S 0x00004000L /* Space */ -#define _CTYPE_U 0x00008000L /* Upper */ -#define _CTYPE_X 0x00010000L /* X digit */ -#define _CTYPE_B 0x00020000L /* Blank */ -#define _CTYPE_R 0x00040000L /* Print */ -#define _CTYPE_I 0x00080000L /* Ideogram */ -#define _CTYPE_T 0x00100000L /* Special */ -#define _CTYPE_Q 0x00200000L /* Phonogram */ -#define _CTYPE_SW0 0x20000000L /* 0 width character */ -#define _CTYPE_SW1 0x40000000L /* 1 width character */ -#define _CTYPE_SW2 0x80000000L /* 2 width character */ -#define _CTYPE_SW3 0xc0000000L /* 3 width character */ +#include <_ctype.h> __BEGIN_DECLS int isalnum(int); @@ -150,74 +132,4 @@ __END_DECLS #define isspecial(c) __istype((c), _CTYPE_T) #endif -/* See comments in about __ct_rune_t. */ -__BEGIN_DECLS -unsigned long ___runetype(__ct_rune_t); -__ct_rune_t ___tolower(__ct_rune_t); -__ct_rune_t ___toupper(__ct_rune_t); -__END_DECLS - -/* - * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us - * to generate code for extern versions of all our inline functions. - */ -#ifdef _EXTERNALIZE_CTYPE_INLINES_ -#define _USE_CTYPE_INLINE_ -#define static -#define __inline -#endif - -/* - * Use inline functions if we are allowed to and the compiler supports them. - */ -#if !defined(_DONT_USE_CTYPE_INLINE_) && \ - (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus)) - -#include - -static __inline int -__maskrune(__ct_rune_t _c, unsigned long _f) -{ - return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) : - _CurrentRuneLocale->__runetype[_c]) & _f; -} - -static __inline int -__istype(__ct_rune_t _c, unsigned long _f) -{ - return (!!__maskrune(_c, _f)); -} - -static __inline int -__isctype(__ct_rune_t _c, unsigned long _f) -{ - return (_c < 0 || _c >= _CACHED_RUNES) ? 0 : - !!(_DefaultRuneLocale.__runetype[_c] & _f); -} - -static __inline __ct_rune_t -__toupper(__ct_rune_t _c) -{ - return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) : - _CurrentRuneLocale->__mapupper[_c]; -} - -static __inline __ct_rune_t -__tolower(__ct_rune_t _c) -{ - return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) : - _CurrentRuneLocale->__maplower[_c]; -} - -#else /* not using inlines */ - -__BEGIN_DECLS -int __maskrune(__ct_rune_t, unsigned long); -int __istype(__ct_rune_t, unsigned long); -int __isctype(__ct_rune_t, unsigned long); -__ct_rune_t __toupper(__ct_rune_t); -__ct_rune_t __tolower(__ct_rune_t); -__END_DECLS -#endif /* using inlines */ - #endif /* !_CTYPE_H_ */