-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Boston, MA 02111-1307, USA. */
/*
- * ISO C Standard, Amendment 1, 7.15:
- * Wide-character classification and mapping utilities <wctype.h>
+ * ISO C99 Standard: 7.25
+ * Wide character classification and mapping utilities <wctype.h>
*/
#ifndef _WCTYPE_H
+#include <features.h>
+#include <bits/types.h>
+
#ifndef __need_iswxxx
# define _WCTYPE_H 1
-# include <features.h>
-# include <bits/types.h>
-
/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
there. So define it ourselves if it remains undefined. */
# define __need_wint_t
character classifications. */
typedef unsigned long int wctype_t;
-# ifndef _ISbit
+# ifndef _ISwbit
/* The characteristics are stored always in network byte order (big
endian). We define the bit value interpretations here dependent on the
machine's byte order. */
# include <endian.h>
# if __BYTE_ORDER == __BIG_ENDIAN
-# define _ISbit(bit) (1 << bit)
+# define _ISwbit(bit) (1 << (bit))
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
-# define _ISbit(bit) (bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8))
+# define _ISwbit(bit) \
+ ((bit) < 8 ? (int) ((1UL << (bit)) << 24) \
+ : ((bit) < 16 ? (int) ((1UL << (bit)) << 8) \
+ : ((bit) < 24 ? (int) ((1UL << (bit)) >> 8) \
+ : (int) ((1UL << (bit)) >> 24))))
# endif
enum
{
- _ISupper = _ISbit (0), /* UPPERCASE. */
- _ISlower = _ISbit (1), /* lowercase. */
- _ISalpha = _ISbit (2), /* Alphabetic. */
- _ISdigit = _ISbit (3), /* Numeric. */
- _ISxdigit = _ISbit (4), /* Hexadecimal numeric. */
- _ISspace = _ISbit (5), /* Whitespace. */
- _ISprint = _ISbit (6), /* Printing. */
- _ISgraph = _ISbit (7), /* Graphical. */
- _ISblank = _ISbit (8), /* Blank (usually SPC and TAB). */
- _IScntrl = _ISbit (9), /* Control character. */
- _ISpunct = _ISbit (10), /* Punctuation. */
- _ISalnum = _ISbit (11) /* Alphanumeric. */
+ __ISwupper = 0, /* UPPERCASE. */
+ __ISwlower = 1, /* lowercase. */
+ __ISwalpha = 2, /* Alphabetic. */
+ __ISwdigit = 3, /* Numeric. */
+ __ISwxdigit = 4, /* Hexadecimal numeric. */
+ __ISwspace = 5, /* Whitespace. */
+ __ISwprint = 6, /* Printing. */
+ __ISwgraph = 7, /* Graphical. */
+ __ISwblank = 8, /* Blank (usually SPC and TAB). */
+ __ISwcntrl = 9, /* Control character. */
+ __ISwpunct = 10, /* Punctuation. */
+ __ISwalnum = 11, /* Alphanumeric. */
+
+ _ISwupper = _ISwbit (__ISwupper), /* UPPERCASE. */
+ _ISwlower = _ISwbit (__ISwlower), /* lowercase. */
+ _ISwalpha = _ISwbit (__ISwalpha), /* Alphabetic. */
+ _ISwdigit = _ISwbit (__ISwdigit), /* Numeric. */
+ _ISwxdigit = _ISwbit (__ISwxdigit), /* Hexadecimal numeric. */
+ _ISwspace = _ISwbit (__ISwspace), /* Whitespace. */
+ _ISwprint = _ISwbit (__ISwprint), /* Printing. */
+ _ISwgraph = _ISwbit (__ISwgraph), /* Graphical. */
+ _ISwblank = _ISwbit (__ISwblank), /* Blank (usually SPC and TAB). */
+ _ISwcntrl = _ISwbit (__ISwcntrl), /* Control character. */
+ _ISwpunct = _ISwbit (__ISwpunct), /* Punctuation. */
+ _ISwalnum = _ISwbit (__ISwalnum) /* Alphanumeric. */
};
-# endif /* Not _ISbit */
+# endif /* Not _ISwbit */
__BEGIN_DECLS
/* Test for any wide character for which `iswalpha' or `iswdigit' is
true. */
-extern int iswalnum __P ((wint_t __wc));
+extern int iswalnum (wint_t __wc) __THROW;
/* Test for any wide character for which `iswupper' or 'iswlower' is
true, or any wide character that is one of a locale-specific set of
wide-characters for which none of `iswcntrl', `iswdigit',
`iswpunct', or `iswspace' is true. */
-extern int iswalpha __P ((wint_t __wc));
+extern int iswalpha (wint_t __wc) __THROW;
/* Test for any control wide character. */
-extern int iswcntrl __P ((wint_t __wc));
+extern int iswcntrl (wint_t __wc) __THROW;
/* Test for any wide character that corresponds to a decimal-digit
character. */
-extern int iswdigit __P ((wint_t __wc));
+extern int iswdigit (wint_t __wc) __THROW;
/* Test for any wide character for which `iswprint' is true and
`iswspace' is false. */
-extern int iswgraph __P ((wint_t __wc));
+extern int iswgraph (wint_t __wc) __THROW;
/* Test for any wide character that corresponds to a lowercase letter
or is one of a locale-specific set of wide characters for which
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
-extern int iswlower __P ((wint_t __wc));
+extern int iswlower (wint_t __wc) __THROW;
/* Test for any printing wide character. */
-extern int iswprint __P ((wint_t __wc));
+extern int iswprint (wint_t __wc) __THROW;
/* Test for any printing wide character that is one of a
locale-specific et of wide characters for which neither `iswspace'
nor `iswalnum' is true. */
-extern int iswpunct __P ((wint_t __wc));
+extern int iswpunct (wint_t __wc) __THROW;
/* Test for any wide character that corresponds to a locale-specific
set of wide characters for which none of `iswalnum', `iswgraph', or
`iswpunct' is true. */
-extern int iswspace __P ((wint_t __wc));
+extern int iswspace (wint_t __wc) __THROW;
/* Test for any wide character that corresponds to an uppercase letter
or is one of a locale-specific set of wide character for which none
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
-extern int iswupper __P ((wint_t __wc));
+extern int iswupper (wint_t __wc) __THROW;
/* Test for any wide character that corresponds to a hexadecimal-digit
character equivalent to that performed be the functions described
in the previous subclause. */
-extern int iswxdigit __P ((wint_t __wc));
+extern int iswxdigit (wint_t __wc) __THROW;
+
+/* Test for any wide character that corresponds to a standard blank
+ wide character or a locale-specific set of wide characters for
+ which `iswalnum' is false. */
+# ifdef __USE_ISOC99
+extern int iswblank (wint_t __wc) __THROW;
+# endif
/*
* Extensible wide-character classification functions: 7.15.2.2.
/* Construct value that describes a class of wide characters identified
by the string argument PROPERTY. */
-extern wctype_t wctype __P ((__const char *__property));
+extern wctype_t wctype (__const char *__property) __THROW;
/* Determine whether the wide-character WC has the property described by
DESC. */
-extern int __iswctype __P ((wint_t __wc, wctype_t __desc));
-extern int iswctype __P ((wint_t __wc, wctype_t __desc));
+extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
+
+#if __GNUC__ >= 2 && defined __OPTIMIZE__
+/* The tables are always organized in a way which allows direct access
+ for single byte characters. */
+extern unsigned int *__ctype32_b;
+
+# define iswalnum(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwalnum) : iswalnum (wc)))
+# define iswalpha(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwalpha) : iswalpha (wc)))
+# define iswcntrl(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwcntrl) : iswcntrl (wc)))
+# define iswdigit(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwdigit) : iswdigit (wc)))
+# define iswlower(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwlower) : iswlower (wc)))
+# define iswgraph(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwgraph) : iswgraph (wc)))
+# define iswprint(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwprint) : iswprint (wc)))
+# define iswpunct(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwpunct) : iswpunct (wc)))
+# define iswspace(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwspace) : iswspace (wc)))
+# define iswupper(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwupper) : iswupper (wc)))
+# define iswxdigit(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwxdigit) : iswxdigit (wc)))
+
+# ifdef __USE_ISOC99
+# define iswblank(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (int) (__ctype32_b[(wint_t) (wc)] & _ISwblank) : iswblank (wc)))
+# endif
+#endif /* gcc && optimizing */
/*
* Wide-character case-mapping functions: 7.15.3.1.
typedef __const __int32_t *wctrans_t;
/* Converts an uppercase letter to the corresponding lowercase letter. */
-extern wint_t towlower __P ((wint_t __wc));
+extern wint_t towlower (wint_t __wc) __THROW;
/* Converts an lowercase letter to the corresponding uppercase letter. */
-extern wint_t towupper __P ((wint_t __wc));
-
-/* Map the wide character WC using the mapping described by DESC. */
-extern wint_t __towctrans __P ((wint_t __wc, wctrans_t __desc));
-
-
-# ifndef __NO_WCTYPE
-# define iswalnum(wc) __iswctype ((wc), _ISalnum)
-# define iswalpha(wc) __iswctype ((wc), _ISalpha)
-# define iswcntrl(wc) __iswctype ((wc), _IScntrl)
-# define iswdigit(wc) __iswctype ((wc), _ISdigit)
-# define iswlower(wc) __iswctype ((wc), _ISlower)
-# define iswgraph(wc) __iswctype ((wc), _ISgraph)
-# define iswprint(wc) __iswctype ((wc), _ISprint)
-# define iswpunct(wc) __iswctype ((wc), _ISpunct)
-# define iswspace(wc) __iswctype ((wc), _ISspace)
-# define iswupper(wc) __iswctype ((wc), _ISupper)
-# define iswxdigit(wc) __iswctype ((wc), _ISxdigit)
-
-# ifdef __USE_GNU
-# define iswblank(wc) __iswctype ((wc), _ISblank)
-# endif
+extern wint_t towupper (wint_t __wc) __THROW;
+#if __GNUC__ >= 2 && defined __OPTIMIZE__
+/* The tables are always organized in a way which allows direct access
+ for single byte characters. */
+extern const wint_t *__ctype32_tolower;
+extern const wint_t *__ctype32_toupper;
-/* Pointer to conversion tables. */
-extern __const __int32_t *__ctype_tolower; /* Case conversions. */
-extern __const __int32_t *__ctype_toupper; /* Case conversions. */
+# define towlower(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (wint_t) __ctype32_tolower[(wint_t) (wc)] : towlower (wc)))
-# define towlower(wc) __towctrans ((wc), __ctype_tolower)
-# define towupper(wc) __towctrans ((wc), __ctype_toupper)
+# define towupper(wc) \
+ (__extension__ \
+ (__builtin_constant_p (wc) && (wint_t) (wc) <= L'\xff' \
+ ? (wint_t) __ctype32_toupper[(wint_t) (wc)] : towupper (wc)))
-# endif /* Not __NO_WCTYPE. */
+#endif /* gcc && optimizing */
__END_DECLS
/* Construct value that describes a mapping between wide characters
identified by the string argument PROPERTY. */
-extern wctrans_t wctrans __P ((__const char *__property));
+extern wctrans_t wctrans (__const char *__property) __THROW;
/* Map the wide character WC using the mapping described by DESC. */
-extern wint_t towctrans __P ((wint_t __wc, wctrans_t __desc));
+extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW;
# ifdef __USE_GNU
/* Declare the interface to extended locale model. */
/* Test for any wide character for which `iswalpha' or `iswdigit' is
true. */
-extern int __iswalnum_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswalnum_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character for which `iswupper' or 'iswlower' is
true, or any wide character that is one of a locale-specific set of
wide-characters for which none of `iswcntrl', `iswdigit',
`iswpunct', or `iswspace' is true. */
-extern int __iswalpha_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswalpha_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any control wide character. */
-extern int __iswcntrl_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character that corresponds to a decimal-digit
character. */
-extern int __iswdigit_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswdigit_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character for which `iswprint' is true and
`iswspace' is false. */
-extern int __iswgraph_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswgraph_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character that corresponds to a lowercase letter
or is one of a locale-specific set of wide characters for which
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
-extern int __iswlower_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswlower_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any printing wide character. */
-extern int __iswprint_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswprint_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any printing wide character that is one of a
locale-specific et of wide characters for which neither `iswspace'
nor `iswalnum' is true. */
-extern int __iswpunct_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswpunct_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character that corresponds to a locale-specific
set of wide characters for which none of `iswalnum', `iswgraph', or
`iswpunct' is true. */
-extern int __iswspace_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswspace_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character that corresponds to an uppercase letter
or is one of a locale-specific set of wide character for which none
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
-extern int __iswupper_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswupper_l (wint_t __wc, __locale_t __locale) __THROW;
/* Test for any wide character that corresponds to a hexadecimal-digit
character equivalent to that performed be the functions described
in the previous subclause. */
-extern int __iswxdigit_l __P ((wint_t __wc, __locale_t __locale));
+extern int __iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW;
+/* Test for any wide character that corresponds to a standard blank
+ wide character or a locale-specific set of wide characters for
+ which `iswalnum' is false. */
+extern int __iswblank_l (wint_t __wc, __locale_t __locale) __THROW;
/* Construct value that describes a class of wide characters identified
by the string argument PROPERTY. */
-extern wctype_t __wctype_l __P ((__const char *__property,
- __locale_t __locale));
+extern wctype_t __wctype_l (__const char *__property, __locale_t __locale)
+ __THROW;
/* Determine whether the wide-character WC has the property described by
DESC. */
-extern int __iswctype_l __P ((wint_t __wc, wctype_t __desc,
- __locale_t __locale));
+extern int __iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale)
+ __THROW;
/*
*/
/* Converts an uppercase letter to the corresponding lowercase letter. */
-extern wint_t __towlower_l __P ((wint_t __wc, __locale_t __locale));
+extern wint_t __towlower_l (wint_t __wc, __locale_t __locale) __THROW;
/* Converts an lowercase letter to the corresponding uppercase letter. */
-extern wint_t __towupper_l __P ((wint_t __wc, __locale_t __locale));
+extern wint_t __towupper_l (wint_t __wc, __locale_t __locale) __THROW;
+
+/* Construct value that describes a mapping between wide characters
+ identified by the string argument PROPERTY. */
+extern wctrans_t __wctrans_l (__const char *__property, __locale_t __locale)
+ __THROW;
/* Map the wide character WC using the mapping described by DESC. */
-extern wint_t __towctrans_l __P ((wint_t __wc, wctrans_t __desc,
- __locale_t __locale));
-
-
-# ifndef __NO_WCTYPE
-# define __iswalnum_l(wc, loc) __iswctype_l ((wc), _ISalnum, (loc))
-# define __iswalpha_l(wc, loc) __iswctype_l ((wc), _ISalpha, (loc))
-# define __iswcntrl_l(wc, loc) __iswctype_l ((wc), _IScntrl, (loc))
-# define __iswdigit_l(wc, loc) __iswctype_l ((wc), _ISdigit, (loc))
-# define __iswlower_l(wc, loc) __iswctype_l ((wc), _ISlower, (loc))
-# define __iswgraph_l(wc, loc) __iswctype_l ((wc), _ISgraph, (loc))
-# define __iswprint_l(wc, loc) __iswctype_l ((wc), _ISprint, (loc))
-# define __iswpunct_l(wc, loc) __iswctype_l ((wc), _ISpunct, (loc))
-# define __iswspace_l(wc, loc) __iswctype_l ((wc), _ISspace, (loc))
-# define __iswupper_l(wc, loc) __iswctype_l ((wc), _ISupper, (loc))
-# define __iswxdigit_l(wc, loc) __iswctype_l ((wc), _ISxdigit, (loc))
-
-# define __iswblank_l(wc, loc) __iswctype_l ((wc), _ISblank, (loc))
-
-# define __towlower_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_tolower, \
- (loc))
-# define __towupper_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_toupper, \
- (loc))
-
-# endif /* Not __NO_WCTYPE. */
+extern wint_t __towctrans_l (wint_t __wc, wctrans_t __desc,
+ __locale_t __locale) __THROW;
# endif /* Use GNU. */
projects / thirdparty / glibc.git / blobdiff