ctype: Clean up ctype.h

keith-packard · keith-packard · commit bdf2e11ab62c · 2025-02-04T00:00:13.000-08:00
Use extern inline for all statement macros.  Get rid of
tolower/toupper macros which used __CTYPE_PTR.  Add _ to
ALLOW_NEGATIVE_CTYPE_INDEX to avoid application namespace.  Use
__CTYPE_PTR and __CTYPE_PTR_L instead of __locale_ctype_ptr.

Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
@@ -34,31 +34,29 @@
 #include "locale_private.h"
 #include "../stdlib/local.h"
 
-#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
-/* No static const on Cygwin since it's referenced and potentially overwritten
-   for compatibility with older applications. */
-const
-char _ctype_b[128 + 256] = {
+#if defined(_ALLOW_NEGATIVE_CTYPE_INDEX)
+
+const char _ctype_b[128 + 256] = {
 	_CTYPE_DATA_128_255,
 	_CTYPE_DATA_0_127,
 	_CTYPE_DATA_128_255
 };
 
-#else	/* !ALLOW_NEGATIVE_CTYPE_INDEX */
+#else	/* !_ALLOW_NEGATIVE_CTYPE_INDEX */
 
 const char _ctype_[1 + 256] = {
 	0,
 	_CTYPE_DATA_0_127,
 	_CTYPE_DATA_128_255
 };
 
-#endif	/* !ALLOW_NEGATIVE_CTYPE_INDEX */
+#endif	/* !_ALLOW_NEGATIVE_CTYPE_INDEX */
 
 #ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
 
 #include "ctype_extended.h"
 
-#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
+#if defined(_ALLOW_NEGATIVE_CTYPE_INDEX)
 
 #define __CTYPE(base) [locale_ ## base - locale_EXTENDED_BASE] = { \
         _CTYPE_ ## base ## _128_254,        \
@@ -79,7 +77,7 @@ const char _ctype_[1 + 256] = {
 
 #endif
 
-const char __ctype[locale_END - locale_EXTENDED_BASE][CTYPE_OFFSET + 1 + 256] = {
+const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256] = {
 #ifdef _MB_EXTENDED_CHARSETS_ISO
     __CTYPE(ISO_8859_1),
     __CTYPE(ISO_8859_2),
diff --git a/newlib/libc/ctype/ctype_.h b/newlib/libc/ctype/ctype_.h
@@ -3,24 +3,16 @@
 #include <wchar.h>
 #include "locale_private.h"
 
-# define DEFAULT_CTYPE_PTR	((char *) _ctype_)
-
 #ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
 
-#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
-#define CTYPE_OFFSET    127
-#else
-#define CTYPE_OFFSET    0
-#endif
-
-extern const char __ctype[locale_END - locale_EXTENDED_BASE][CTYPE_OFFSET + 1 + 256];
+extern const char __ctype[locale_END - locale_EXTENDED_BASE][_CTYPE_OFFSET + 1 + 256];
 
 static inline const char *
 __get_ctype(enum locale_id id)
 {
     if (id < locale_EXTENDED_BASE)
         return _ctype_;
-    return __ctype[id - locale_EXTENDED_BASE] + CTYPE_OFFSET;
+    return __ctype[id - locale_EXTENDED_BASE] + _CTYPE_OFFSET;
 }
 
 #endif
diff --git a/newlib/libc/ctype/isalnum_l.c b/newlib/libc/ctype/isalnum_l.c
@@ -13,6 +13,6 @@ isalnum_l (int c, locale_t locale)
     (void) locale;
     return isalnum(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L|_N);
+    return __CTYPE_PTR_L (locale)[c+1] & (_U|_L|_N);
 #endif
 }
diff --git a/newlib/libc/ctype/isalpha_l.c b/newlib/libc/ctype/isalpha_l.c
@@ -13,6 +13,6 @@ isalpha_l (int c, locale_t locale)
     (void) locale;
     return isalpha(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L);
+    return __CTYPE_PTR_L (locale)[c+1] & (_U|_L);
 #endif
 }
diff --git a/newlib/libc/ctype/isblank_l.c b/newlib/libc/ctype/isblank_l.c
@@ -13,6 +13,6 @@ isblank_l (int c, locale_t locale)
     (void) locale;
     return isblank(c);
 #else
-    return (__locale_ctype_ptr_l (locale)[c+1] & _B) || (c == '\t');
+    return (__CTYPE_PTR_L (locale)[c+1] & _B) || (c == '\t');
 #endif
 }
diff --git a/newlib/libc/ctype/iscntrl_l.c b/newlib/libc/ctype/iscntrl_l.c
@@ -13,6 +13,6 @@ iscntrl_l (int c, locale_t locale)
 #if _PICOLIBC_CTYPE_SMALL
     return (0x00 <= c && c <= 0x1f) || c == 0x7f;
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & _C;
+    return __CTYPE_PTR_L (locale)[c+1] & _C;
 #endif
 }
diff --git a/newlib/libc/ctype/isdigit_l.c b/newlib/libc/ctype/isdigit_l.c
@@ -13,6 +13,6 @@ isdigit_l (int c, locale_t locale)
     (void) locale;
     return isdigit(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & _N;
+    return __CTYPE_PTR_L (locale)[c+1] & _N;
 #endif
 }
diff --git a/newlib/libc/ctype/isgraph_l.c b/newlib/libc/ctype/isgraph_l.c
@@ -14,6 +14,6 @@ isgraph_l (int c, locale_t locale)
     (void) locale;
     return isgraph(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N);
+    return __CTYPE_PTR_L (locale)[c+1] & (_P|_U|_L|_N);
 #endif
 }
diff --git a/newlib/libc/ctype/islower_l.c b/newlib/libc/ctype/islower_l.c
@@ -13,6 +13,6 @@ islower_l (int c, locale_t locale)
     (void) locale;
     return islower(c);
 #else
-    return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _L;
+    return (__CTYPE_PTR_L (locale)[c+1] & (_U|_L)) == _L;
 #endif
 }
diff --git a/newlib/libc/ctype/isprint_l.c b/newlib/libc/ctype/isprint_l.c
@@ -14,6 +14,6 @@ isprint_l (int c, locale_t locale)
     (void) locale;
     return isprint(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N|_B);
+    return __CTYPE_PTR_L (locale)[c+1] & (_P|_U|_L|_N|_B);
 #endif
 }
diff --git a/newlib/libc/ctype/ispunct_l.c b/newlib/libc/ctype/ispunct_l.c
@@ -13,7 +13,7 @@ ispunct_l (int c, locale_t locale)
     (void) locale;
     return ispunct(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & _P;
+    return __CTYPE_PTR_L (locale)[c+1] & _P;
 #endif
 }
 
diff --git a/newlib/libc/ctype/isspace_l.c b/newlib/libc/ctype/isspace_l.c
@@ -13,7 +13,7 @@ isspace_l (int c, locale_t locale)
 #if _PICOLIBC_CTYPE_SMALL
     return isspace(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & _S;
+    return __CTYPE_PTR_L (locale)[c+1] & _S;
 #endif
 }
 
diff --git a/newlib/libc/ctype/isupper_l.c b/newlib/libc/ctype/isupper_l.c
@@ -13,7 +13,7 @@ isupper_l (int c, locale_t locale)
     (void) locale;
     return isupper(c);
 #else
-    return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _U;
+    return (__CTYPE_PTR_L (locale)[c+1] & (_U|_L)) == _U;
 #endif
 }
 
diff --git a/newlib/libc/ctype/isxdigit_l.c b/newlib/libc/ctype/isxdigit_l.c
@@ -14,7 +14,7 @@ isxdigit_l (int c, locale_t locale)
 #if _PICOLIBC_CTYPE_SMALL
     return isxdigit(c);
 #else
-    return __locale_ctype_ptr_l (locale)[c+1] & ((_X)|(_N));
+    return __CTYPE_PTR_L (locale)[c+1] & ((_X)|(_N));
 #endif
 }
 
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
@@ -110,8 +110,8 @@ int toupper_l (int c, locale_t l);
 #if __MISC_VISIBLE
 int isascii_l (int c, locale_t l);
 int toascii_l (int c, locale_t l);
-#define isascii_l(__c,__l)	((__l),(unsigned)(__c)<=0177)
-#define toascii_l(__c,__l)	((__l),(__c)&0177)
+#define isascii_l(__c,__l)	((void) (__l),(unsigned)(__c)<=0177)
+#define toascii_l(__c,__l)	((void) (__l),(__c)&0177)
 #endif
 
 #if _PICOLIBC_CTYPE_SMALL
@@ -214,9 +214,26 @@ __declare_extern_inline(int) tolower_l (int c, locale_t l) { (void) l; return to
 __declare_extern_inline(int) toupper_l (int c, locale_t l) { (void) l; return toupper(c); }
 #endif
 
+#endif /* __declare_extern_inline */
+
+#else  /* _PICOLIBC_CTYPE_SMALL */
+
+#ifndef __CHAR_UNSIGNED__
+#define _ALLOW_NEGATIVE_CTYPE_INDEX
 #endif
 
+#if defined(_ALLOW_NEGATIVE_CTYPE_INDEX)
+extern const char	_ctype_b[];
+#define _CTYPE_OFFSET   127
+#define _ctype_ (_ctype_b + _CTYPE_OFFSET)
 #else
+#define _CTYPE_OFFSET   0
+extern const char	_ctype_[];
+#endif
+
+extern const short _ctype_wide[];
+
+#ifndef __cplusplus
 
 #define	_U	0x001    /* upper */
 #define	_L	0x002    /* lower */
@@ -229,29 +246,14 @@ __declare_extern_inline(int) toupper_l (int c, locale_t l) { (void) l; return to
 /* _T used for _ctype_wide table */
 #define _T      0x100    /* tab */
 
-#ifndef __CHAR_UNSIGNED__
-#define ALLOW_NEGATIVE_CTYPE_INDEX
-#endif
-
-#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
-extern const char	_ctype_b[];
-#define _ctype_ (_ctype_b + 127)
-#else
-extern const char	_ctype_[];
-#endif
-
-extern const short _ctype_wide[];
-
 #ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
 const char *__locale_ctype_ptr (void);
+#define __CTYPE_PTR     __locale_ctype_ptr()
 #else
-#define __locale_ctype_ptr()	_ctype_
+#define __CTYPE_PTR	_ctype_
 #endif
 
-# define __CTYPE_PTR	(__locale_ctype_ptr ())
-
-#ifndef __cplusplus
-static __inline char __ctype_lookup(int c) { return (__CTYPE_PTR + 1)[c]; }
+#define __ctype_lookup(__c) (__CTYPE_PTR + 1)[(int) (__c)]
 
 #define	isalpha(__c)	(__ctype_lookup(__c)&(_U|_L))
 #define	isupper(__c)	((__ctype_lookup(__c)&(_U|_L))==_U)
@@ -265,29 +267,22 @@ static __inline char __ctype_lookup(int c) { return (__CTYPE_PTR + 1)[c]; }
 #define	isgraph(__c)	(__ctype_lookup(__c)&(_P|_U|_L|_N))
 #define iscntrl(__c)	(__ctype_lookup(__c)&_C)
 
-#if __ISO_C_VISIBLE >= 1999
-#if defined(__GNUC__)
-#define isblank(__c)                                            \
-    __extension__ ({ __typeof__ (__c) __x = (__c);		\
-            (__ctype_lookup(__x)&_B) || (int) (__x) == '\t';})
-#endif
+#if __ISO_C_VISIBLE >= 1999 && defined(__declare_extern_inline)
+__declare_extern_inline(int) isblank(int c) {
+    return c == '\t' || __ctype_lookup(c) & _B;
+}
 #endif
 
 #if __POSIX_VISIBLE >= 200809
+
 #ifdef _MB_EXTENDED_CHARSETS_NON_UNICODE
 const char *__locale_ctype_ptr_l (locale_t);
+#define __CTYPE_PTR_L(__l)        __locale_ctype_ptr_l(__l)
 #else
-static __inline const char *
-__locale_ctype_ptr_l(locale_t _l)
-{
-	(void)_l;
-	return __locale_ctype_ptr();
-}
+#define __CTYPE_PTR_L(__l) ((void) (__l), _ctype_)
 #endif
 
-static __inline char __ctype_lookup_l(int c, locale_t l) {
-	return (__locale_ctype_ptr_l(l)+1)[(int)(c)];
-}
+#define __ctype_lookup_l(__c, __l) ((__CTYPE_PTR_L(__l)+1)[(int)(__c)])
 
 #define	isalpha_l(__c,__l)	(__ctype_lookup_l(__c,__l)&(_U|_L))
 #define	isupper_l(__c,__l)	((__ctype_lookup_l(__c,__l)&(_U|_L))==_U)
@@ -301,37 +296,14 @@ static __inline char __ctype_lookup_l(int c, locale_t l) {
 #define	isgraph_l(__c,__l)	(__ctype_lookup_l(__c,__l)&(_P|_U|_L|_N))
 #define iscntrl_l(__c,__l)	(__ctype_lookup_l(__c,__l)&_C)
 
-#if defined(__GNUC__)
-#define isblank_l(__c, __l) \
-  __extension__ ({ __typeof__ (__c) __x = (__c);		\
-        (__ctype_lookup_l(__x,__l)&_B) || (int) (__x) == '\t';})
+#ifdef __declare_extern_inline
+__declare_extern_inline(int) isblank_l(int c, locale_t l) {
+    return c == '\t' || (__ctype_lookup_l(c, l) & _B);
+}
 #endif
 
 #endif /* __POSIX_VISIBLE >= 200809 */
 
-/* Non-gcc versions will get the library versions, and will be
-   slightly slower.  These macros are not NLS-aware so they are
-   disabled if the system supports the extended character sets. */
-# if defined(__GNUC__)
-#  ifndef _MB_EXTENDED_CHARSETS_NON_UNICODE
-#   define toupper(__c) \
-  __extension__ ({ __typeof__ (__c) __x = (__c);	\
-      islower (__x) ? (int) __x - 'a' + 'A' : (int) __x;})
-#   define tolower(__c) \
-  __extension__ ({ __typeof__ (__c) __x = (__c);	\
-      isupper (__x) ? (int) __x - 'A' + 'a' : (int) __x;})
-#  else /* _MB_EXTENDED_CHARSETS_NON_UNICODE */
-/* Allow a gcc warning if the user passed 'char', but defer to the
-   function.  */
-#   define toupper(__c) \
-  __extension__ ({ __typeof__ (__c) __x = (__c);	\
-      (void) __CTYPE_PTR[(int) __x]; (toupper) (__x);})
-#   define tolower(__c) \
-  __extension__ ({ __typeof__ (__c) __x = (__c);	\
-      (void) __CTYPE_PTR[(int) __x]; (tolower) (__x);})
-#  endif /* _MB_EXTENDED_CHARSETS_NON_UNICODE */
-# endif /* __GNUC__ */
-
 #endif /* !__cplusplus */
 
 #endif /* else _PICOLIBC_CTYPE_SMALL */

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ isalnum_l (int c, locale_t locale)`
`13`	`13`	`(void) locale;`
`14`	`14`	`return isalnum(c);`
`15`	`15`	`#else`
`16`		`- return __locale_ctype_ptr_l (locale)[c+1] & (_U\|_L\|_N);`
	`16`	`+ return __CTYPE_PTR_L (locale)[c+1] & (_U\|_L\|_N);`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ isalpha_l (int c, locale_t locale)`
`13`	`13`	`(void) locale;`
`14`	`14`	`return isalpha(c);`
`15`	`15`	`#else`
`16`		`- return __locale_ctype_ptr_l (locale)[c+1] & (_U\|_L);`
	`16`	`+ return __CTYPE_PTR_L (locale)[c+1] & (_U\|_L);`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ isblank_l (int c, locale_t locale)`
`13`	`13`	`(void) locale;`
`14`	`14`	`return isblank(c);`
`15`	`15`	`#else`
`16`		`- return (__locale_ctype_ptr_l (locale)[c+1] & _B) \|\| (c == '\t');`
	`16`	`+ return (__CTYPE_PTR_L (locale)[c+1] & _B) \|\| (c == '\t');`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ iscntrl_l (int c, locale_t locale)`
`13`	`13`	`#if _PICOLIBC_CTYPE_SMALL`
`14`	`14`	`return (0x00 <= c && c <= 0x1f) \|\| c == 0x7f;`
`15`	`15`	`#else`
`16`		`- return __locale_ctype_ptr_l (locale)[c+1] & _C;`
	`16`	`+ return __CTYPE_PTR_L (locale)[c+1] & _C;`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ isdigit_l (int c, locale_t locale)`
`13`	`13`	`(void) locale;`
`14`	`14`	`return isdigit(c);`
`15`	`15`	`#else`
`16`		`- return __locale_ctype_ptr_l (locale)[c+1] & _N;`
	`16`	`+ return __CTYPE_PTR_L (locale)[c+1] & _N;`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ isgraph_l (int c, locale_t locale)`
`14`	`14`	`(void) locale;`
`15`	`15`	`return isgraph(c);`
`16`	`16`	`#else`
`17`		`- return __locale_ctype_ptr_l (locale)[c+1] & (_P\|_U\|_L\|_N);`
	`17`	`+ return __CTYPE_PTR_L (locale)[c+1] & (_P\|_U\|_L\|_N);`
`18`	`18`	`#endif`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ islower_l (int c, locale_t locale)`
`13`	`13`	`(void) locale;`
`14`	`14`	`return islower(c);`
`15`	`15`	`#else`
`16`		`- return (__locale_ctype_ptr_l (locale)[c+1] & (_U\|_L)) == _L;`
	`16`	`+ return (__CTYPE_PTR_L (locale)[c+1] & (_U\|_L)) == _L;`
`17`	`17`	`#endif`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ isprint_l (int c, locale_t locale)`
`14`	`14`	`(void) locale;`
`15`	`15`	`return isprint(c);`
`16`	`16`	`#else`
`17`		`- return __locale_ctype_ptr_l (locale)[c+1] & (_P\|_U\|_L\|_N\|_B);`
	`17`	`+ return __CTYPE_PTR_L (locale)[c+1] & (_P\|_U\|_L\|_N\|_B);`
`18`	`18`	`#endif`
`19`	`19`	`}`