mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
18c34920f8
Fix numerous ANSI conformance bugs and other nits. ctype.h: o There were no prototypes behind the macros (conformance bug). o isascii() didn't have enough parentheses (plain bug). o tolower() and toupper were always static inline (conformance bug? You could undef them and take their address, but this gave different addresses in different modules. You couldn't undef them and declare them (correctly) again). <stdio.h>'s treatment of putc() shows one way to handle this problem, but it only works because the putc() macro is allowed to reevaluate its args. I used a hack controlled by _EXTERNALIZE_CTYPE_INLINES_ to get <ctype.h> to generate the code (the previous hack involving _ANSI_LIBRARY_ goes away). This has the advantage that the core of the functions is only written down once and the disadvantage that another layer of functions is required. The extra layer goes away if inline functions are used, leaving only the problem of understanding why there are functions named toupper(), __toupper and ___toupper() as well as a macro named toupper. o Nothing seems to define _USE_CTYPE_LIBRARY_. Eliminate it o Let the user set _USE_CTYPE_INLINE_ and _DONT_USE_CTYPE_INLINE_ for full control over inlining. o The args for the inline functions didn't have enough underscores (conformance bug). o The formatting and ordering was inconsistent (style bug). o TODO: fix conformance bugs brought by including <runetype.h>.
188 lines
6.2 KiB
C
188 lines
6.2 KiB
C
/*
|
|
* Copyright (c) 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
* (c) UNIX System Laboratories, Inc.
|
|
* All or some portions of this file are derived from material licensed
|
|
* to the University of California by American Telephone and Telegraph
|
|
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
|
|
* the permission of UNIX System Laboratories, Inc.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Paul Borman at Krystal Technologies.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
|
|
*/
|
|
|
|
#ifndef _CTYPE_H_
|
|
#define _CTYPE_H_
|
|
|
|
/*
|
|
* XXX <runetype.h> brings massive namespace pollution (rune_t and struct
|
|
* member names).
|
|
*/
|
|
#include <runetype.h>
|
|
|
|
#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 */
|
|
|
|
__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 isascii __P((int));
|
|
int isblank __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 isascii(c) (((c) & ~0x7F) == 0)
|
|
#define isblank(c) __istype((c), _B)
|
|
#define toascii(c) ((c) & 0x7F)
|
|
|
|
/* XXX the following macros are not backed up by functions. */
|
|
#define digittoint(c) __istype((c), 0xFF)
|
|
#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)
|
|
#endif
|
|
|
|
/* See comments in <machine/ansi.h> about _BSD_RUNE_T_. */
|
|
__BEGIN_DECLS
|
|
unsigned long ___runetype __P((_BSD_RUNE_T_));
|
|
_BSD_RUNE_T_ ___tolower __P((_BSD_RUNE_T_));
|
|
_BSD_RUNE_T_ ___toupper __P((_BSD_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))
|
|
static __inline int
|
|
__istype(_BSD_RUNE_T_ _c, unsigned long _f)
|
|
{
|
|
if (_c < 0)
|
|
_c = (unsigned char) _c;
|
|
return((((_c & _CRMASK) ? ___runetype(_c) :
|
|
_CurrentRuneLocale->runetype[_c]) & _f) ? 1 : 0);
|
|
}
|
|
|
|
static __inline int
|
|
__isctype(_BSD_RUNE_T_ _c, unsigned long _f)
|
|
{
|
|
if (_c < 0)
|
|
_c = (unsigned char) _c;
|
|
return((((_c & _CRMASK) ? 0 :
|
|
_DefaultRuneLocale.runetype[_c]) & _f) ? 1 : 0);
|
|
}
|
|
|
|
static __inline _BSD_RUNE_T_
|
|
__toupper(_BSD_RUNE_T_ _c)
|
|
{
|
|
if (_c < 0)
|
|
_c = (unsigned char) _c;
|
|
return((_c & _CRMASK) ?
|
|
___toupper(_c) : _CurrentRuneLocale->mapupper[_c]);
|
|
}
|
|
|
|
static __inline _BSD_RUNE_T_
|
|
__tolower(_BSD_RUNE_T_ _c)
|
|
{
|
|
if (_c < 0)
|
|
_c = (unsigned char) _c;
|
|
return((_c & _CRMASK) ?
|
|
___tolower(_c) : _CurrentRuneLocale->maplower[_c]);
|
|
}
|
|
|
|
#else /* not using inlines */
|
|
|
|
__BEGIN_DECLS
|
|
int __istype __P((_BSD_RUNE_T_, unsigned long));
|
|
int __isctype __P((_BSD_RUNE_T_, unsigned long));
|
|
_BSD_RUNE_T_ __toupper __P((_BSD_RUNE_T_));
|
|
_BSD_RUNE_T_ __tolower __P((_BSD_RUNE_T_));
|
|
__END_DECLS
|
|
#endif /* using inlines */
|
|
|
|
#endif /* !_CTYPE_H_ */
|