Loading...
--- Libc/Libc-583/include/ctype.h
+++ Libc/Libc-262/include/ctype.h
@@ -1,22 +1,21 @@
/*
- * Copyright (c) 2000, 2005, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
@@ -63,80 +62,114 @@
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
*/
-//Begin-Libc
-#include "xlocale_private.h"
-//End-Libc
#ifndef _CTYPE_H_
#define _CTYPE_H_
#include <runetype.h>
-#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 */
-#define _CTYPE_SWM 0xe0000000L /* Mask for screen width data */
-#define _CTYPE_SWS 30 /* Bits to shift to get width */
-
-#ifdef _NONSTD_SOURCE
-/*
- * Backward compatibility
- */
-#define _A _CTYPE_A /* Alpha */
-#define _C _CTYPE_C /* Control */
-#define _D _CTYPE_D /* Digit */
-#define _G _CTYPE_G /* Graph */
-#define _L _CTYPE_L /* Lower */
-#define _P _CTYPE_P /* Punct */
-#define _S _CTYPE_S /* Space */
-#define _U _CTYPE_U /* Upper */
-#define _X _CTYPE_X /* X digit */
-#define _B _CTYPE_B /* Blank */
-#define _R _CTYPE_R /* Print */
-#define _I _CTYPE_I /* Ideogram */
-#define _T _CTYPE_T /* Special */
-#define _Q _CTYPE_Q /* Phonogram */
-#define _SW0 _CTYPE_SW0 /* 0 width character */
-#define _SW1 _CTYPE_SW1 /* 1 width character */
-#define _SW2 _CTYPE_SW2 /* 2 width character */
-#define _SW3 _CTYPE_SW3 /* 3 width character */
-#endif /* _NONSTD_SOURCE */
+#define _A 0x00000100L /* Alpha */
+#define _C 0x00000200L /* Control */
+#define _D 0x00000400L /* Digit */
+#define _G 0x00000800L /* Graph */
+#define _L 0x00001000L /* Lower */
+#define _P 0x00002000L /* Punct */
+#define _S 0x00004000L /* Space */
+#define _U 0x00008000L /* Upper */
+#define _X 0x00010000L /* X digit */
+#define _B 0x00020000L /* Blank */
+#define _R 0x00040000L /* Print */
+#define _I 0x00080000L /* Ideogram */
+#define _T 0x00100000L /* Special */
+#define _Q 0x00200000L /* Phonogram */
+
+#define _CTYPE_A _A
+#define _CTYPE_C _C
+#define _CTYPE_D _D
+#define _CTYPE_G _G
+#define _CTYPE_L _L
+#define _CTYPE_P _P
+#define _CTYPE_S _S
+#define _CTYPE_U _U
+#define _CTYPE_X _X
+#define _CTYPE_B _B
+#define _CTYPE_R _R
+#define _CTYPE_I _I
+#define _CTYPE_T _T
+#define _CTYPE_Q _Q
+
+__BEGIN_DECLS
+int isalnum __P((int));
+int isalpha __P((int));
+int iscntrl __P((int));
+int isdigit __P((int));
+int isgraph __P((int));
+int islower __P((int));
+int isprint __P((int));
+int ispunct __P((int));
+int isspace __P((int));
+int isupper __P((int));
+int isxdigit __P((int));
+int tolower __P((int));
+int toupper __P((int));
+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+int digittoint __P((int));
+int isascii __P((int));
+int isblank __P((int));
+int ishexnumber __P((int));
+int isideogram __P((int));
+int isnumber __P((int));
+int isphonogram __P((int));
+int isrune __P((int));
+int isspecial __P((int));
+int toascii __P((int));
+#endif
+__END_DECLS
+
+
+#define isalnum(c) __istype((c), (_A|_D))
+#define isalpha(c) __istype((c), _A)
+#define iscntrl(c) __istype((c), _C)
+#define isdigit(c) __isctype((c), _D) /* ANSI -- locale independent */
+#define isgraph(c) __istype((c), _G)
+#define islower(c) __istype((c), _L)
+#define isprint(c) __istype((c), _R)
+#define ispunct(c) __istype((c), _P)
+#define isspace(c) __istype((c), _S)
+#define isupper(c) __istype((c), _U)
+#define isxdigit(c) __isctype((c), _X) /* ANSI -- locale independent */
+#define tolower(c) __tolower(c)
+#define toupper(c) __toupper(c)
+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#define digittoint(c) __maskrune((c), 0xFF)
+#define isascii(c) ((c & ~0x7F) == 0)
+#define isblank(c) __istype((c), _B)
+#define ishexnumber(c) __istype((c), _X)
+#define isideogram(c) __istype((c), _I)
+#define isnumber(c) __istype((c), _D)
+#define isphonogram(c) __istype((c), _T)
+#define isrune(c) __istype((c), 0xFFFFFF00L)
+#define isspecial(c) __istype((c), _Q)
+#define toascii(c) ((c) & 0x7F)
+#endif
+
+/* See comments in <machine/ansi.h> about _BSD_RUNE_T_. */
+__BEGIN_DECLS
+unsigned long ___runetype __P((_BSD_CT_RUNE_T_));
+_BSD_CT_RUNE_T_ ___tolower __P((_BSD_CT_RUNE_T_));
+_BSD_CT_RUNE_T_ ___toupper __P((_BSD_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 intermediate inline functions.
+ * to generate code for extern versions of all our inline functions.
*/
#ifdef _EXTERNALIZE_CTYPE_INLINES_
#define _USE_CTYPE_INLINE_
-#define __DARWIN_CTYPE_static_inline
-#else /* !_EXTERNALIZE_CTYPE_INLINES_ */
-#define __DARWIN_CTYPE_static_inline static __inline
-#endif /* !_EXTERNALIZE_CTYPE_INLINES_ */
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_TOP_ is defined in locale/isctype.c to tell us
- * to generate code for extern versions of all top-level inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_TOP_
-#define _USE_CTYPE_INLINE_
-#define __DARWIN_CTYPE_TOP_static_inline
-#else /* !_EXTERNALIZE_CTYPE_INLINES_TOP_ */
-#define __DARWIN_CTYPE_TOP_static_inline static __inline
-#endif /* _EXTERNALIZE_CTYPE_INLINES_TOP_ */
+#define static
+#define __inline
+#endif
/*
* Use inline functions if we are allowed to and the compiler supports them.
@@ -144,295 +177,49 @@
#if !defined(_DONT_USE_CTYPE_INLINE_) && \
(defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-/* See comments in <machine/_type.h> about __darwin_ct_rune_t. */
+static __inline int
+__maskrune(_BSD_CT_RUNE_T_ _c, unsigned long _f)
+{
+ return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
+ _CurrentRuneLocale->runetype[_c]) & _f;
+}
+
+static __inline int
+__istype(_BSD_CT_RUNE_T_ c, unsigned long f)
+{
+ return !!(__maskrune(c, f));
+}
+
+static __inline _BSD_CT_RUNE_T_
+__isctype(_BSD_CT_RUNE_T_ _c, unsigned long _f)
+{
+ return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
+ !!(_DefaultRuneLocale.runetype[_c] & _f);
+}
+
+static __inline _BSD_CT_RUNE_T_
+__toupper(_BSD_CT_RUNE_T_ _c)
+{
+ return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
+ _CurrentRuneLocale->mapupper[_c];
+}
+
+static __inline _BSD_CT_RUNE_T_
+__tolower(_BSD_CT_RUNE_T_ _c)
+{
+ return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
+ _CurrentRuneLocale->maplower[_c];
+}
+
+#else /* not using inlines */
+
__BEGIN_DECLS
-unsigned long ___runetype(__darwin_ct_rune_t);
-__darwin_ct_rune_t ___tolower(__darwin_ct_rune_t);
-__darwin_ct_rune_t ___toupper(__darwin_ct_rune_t);
+int __maskrune __P((_BSD_CT_RUNE_T_, unsigned long));
+int __istype __P((_BSD_CT_RUNE_T_, unsigned long));
+int __isctype __P((_BSD_CT_RUNE_T_, unsigned long));
+_BSD_CT_RUNE_T_ __toupper __P((_BSD_CT_RUNE_T_));
+_BSD_CT_RUNE_T_ __tolower __P((_BSD_CT_RUNE_T_));
__END_DECLS
-
-__DARWIN_CTYPE_TOP_static_inline int
-isascii(int _c)
-{
- return ((_c & ~0x7F) == 0);
-}
-
-#ifdef USE_ASCII
-__DARWIN_CTYPE_static_inline int
-__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
-{
- return _DefaultRuneLocale.__runetype[_c & 0xff] & _f;
-}
-//Begin-Libc
-#elif defined(__LIBC__)
-__DARWIN_CTYPE_static_inline int
-__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
-{
- return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
- __current_locale()->__lc_ctype->_CurrentRuneLocale.__runetype[_c]) & _f;
-}
-//End-Libc
-#else /* !USE_ASCII */
-__BEGIN_DECLS
-int __maskrune(__darwin_ct_rune_t, unsigned long);
-__END_DECLS
-#endif /* USE_ASCII */
-
-__DARWIN_CTYPE_static_inline int
-__istype(__darwin_ct_rune_t _c, unsigned long _f)
-{
-#ifdef USE_ASCII
- return !!(__maskrune(_c, _f));
-#else /* USE_ASCII */
- return (isascii(_c) ? !!(_DefaultRuneLocale.__runetype[_c] & _f)
- : !!__maskrune(_c, _f));
-#endif /* USE_ASCII */
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__isctype(__darwin_ct_rune_t _c, unsigned long _f)
-{
-#ifdef USE_ASCII
- return !!(__maskrune(_c, _f));
-#else /* USE_ASCII */
- return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
- !!(_DefaultRuneLocale.__runetype[_c] & _f);
-#endif /* USE_ASCII */
-}
-
-#ifdef USE_ASCII
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__toupper(__darwin_ct_rune_t _c)
-{
- return _DefaultRuneLocale.__mapupper[_c & 0xff];
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__tolower(__darwin_ct_rune_t _c)
-{
- return _DefaultRuneLocale.__maplower[_c & 0xff];
-}
-//Begin-Libc
-#elif defined(__LIBC__)
-/*
- * We can't do what we do for __toupper_l() (check for ASCII first, then call
- * ___toupper_l() otherwise) because versions of ___toupper() before Tiger
- * assume c >= _CACHED_RUNES. So we are stuck making __toupper() a routine
- * to hide the extended locale details, outside of Libc.
- */
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__toupper(__darwin_ct_rune_t _c)
-{
- return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
- __current_locale()->__lc_ctype->_CurrentRuneLocale.__mapupper[_c];
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__tolower(__darwin_ct_rune_t _c)
-{
- return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
- __current_locale()->__lc_ctype->_CurrentRuneLocale.__maplower[_c];
-}
-//End-Libc
-#else /* !USE_ASCII */
-__BEGIN_DECLS
-__darwin_ct_rune_t __toupper(__darwin_ct_rune_t);
-__darwin_ct_rune_t __tolower(__darwin_ct_rune_t);
-__END_DECLS
-#endif /* USE_ASCII */
-
-__DARWIN_CTYPE_static_inline int
-__wcwidth(__darwin_ct_rune_t _c)
-{
- unsigned int _x;
-
- if (_c == 0)
- return (0);
- _x = (unsigned int)__maskrune(_c, _CTYPE_SWM|_CTYPE_R);
- if ((_x & _CTYPE_SWM) != 0)
- return ((_x & _CTYPE_SWM) >> _CTYPE_SWS);
- return ((_x & _CTYPE_R) != 0 ? 1 : -1);
-}
-
-#ifndef _EXTERNALIZE_CTYPE_INLINES_
-
-#define _tolower(c) __tolower(c)
-#define _toupper(c) __toupper(c)
-
-__DARWIN_CTYPE_TOP_static_inline int
-isalnum(int _c)
-{
- return (__istype(_c, _CTYPE_A|_CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isalpha(int _c)
-{
- return (__istype(_c, _CTYPE_A));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isblank(int _c)
-{
- return (__istype(_c, _CTYPE_B));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-iscntrl(int _c)
-{
- return (__istype(_c, _CTYPE_C));
-}
-
-/* ANSI -- locale independent */
-__DARWIN_CTYPE_TOP_static_inline int
-isdigit(int _c)
-{
- return (__isctype(_c, _CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isgraph(int _c)
-{
- return (__istype(_c, _CTYPE_G));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-islower(int _c)
-{
- return (__istype(_c, _CTYPE_L));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isprint(int _c)
-{
- return (__istype(_c, _CTYPE_R));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-ispunct(int _c)
-{
- return (__istype(_c, _CTYPE_P));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isspace(int _c)
-{
- return (__istype(_c, _CTYPE_S));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isupper(int _c)
-{
- return (__istype(_c, _CTYPE_U));
-}
-
-/* ANSI -- locale independent */
-__DARWIN_CTYPE_TOP_static_inline int
-isxdigit(int _c)
-{
- return (__isctype(_c, _CTYPE_X));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-toascii(int _c)
-{
- return (_c & 0x7F);
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-tolower(int _c)
-{
- return (__tolower(_c));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-toupper(int _c)
-{
- return (__toupper(_c));
-}
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-__DARWIN_CTYPE_TOP_static_inline int
-digittoint(int _c)
-{
- return (__maskrune(_c, 0x0F));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-ishexnumber(int _c)
-{
- return (__istype(_c, _CTYPE_X));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isideogram(int _c)
-{
- return (__istype(_c, _CTYPE_I));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isnumber(int _c)
-{
- return (__istype(_c, _CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isphonogram(int _c)
-{
- return (__istype(_c, _CTYPE_Q));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isrune(int _c)
-{
- return (__istype(_c, 0xFFFFFFF0L));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isspecial(int _c)
-{
- return (__istype(_c, _CTYPE_T));
-}
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* _EXTERNALIZE_CTYPE_INLINES_ */
-
-#else /* not using inlines */
-
-__BEGIN_DECLS
-int isalnum(int);
-int isalpha(int);
-int isblank(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);
-int isascii(int);
-int toascii(int);
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-int _tolower(int);
-int _toupper(int);
-int digittoint(int);
-int ishexnumber(int);
-int isideogram(int);
-int isnumber(int);
-int isphonogram(int);
-int isrune(int);
-int isspecial(int);
-#endif
-__END_DECLS
-
#endif /* using inlines */
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_ctype.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
#endif /* !_CTYPE_H_ */