aboutsummaryrefslogtreecommitdiff
path: root/wctype
diff options
context:
space:
mode:
Diffstat (limited to 'wctype')
-rw-r--r--wctype/Makefile2
-rw-r--r--wctype/test_wctype.c22
-rw-r--r--wctype/wctype.c15
-rw-r--r--wctype/wctype.h21
-rw-r--r--wctype/wctype_l.c53
5 files changed, 89 insertions, 24 deletions
diff --git a/wctype/Makefile b/wctype/Makefile
index 731b43abe5..16a7f329fa 100644
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -24,7 +24,7 @@ subdir := wctype
headers := wctype.h
distribute := cname-lookup.h
routines := wcfuncs wctype iswctype wctrans towctrans wcextra \
- wcfuncs_l iswctype_l towctrans_l
+ wcfuncs_l iswctype_l towctrans_l wctype_l
tests := test_wctype
diff --git a/wctype/test_wctype.c b/wctype/test_wctype.c
index 300b86972d..1c9bf5aa3b 100644
--- a/wctype/test_wctype.c
+++ b/wctype/test_wctype.c
@@ -46,14 +46,22 @@ main (int argc, char *argv[])
for (ch = 0; ch < 256; ++ch)
{
-#define TEST(test) \
+#define TEST(test) \
do \
- if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0)) \
- { \
- printf ("class `%s' test for character \\%o failed\n", \
- #test, ch); \
- result = 1; \
- } \
+ { \
+ if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0)) \
+ { \
+ printf ("`iswctype' class `%s' test " \
+ "for character \\%o failed\n", #test, ch); \
+ result = 1; \
+ } \
+ if ((is##test (ch) == 0) != (isw##test (ch) == 0)) \
+ { \
+ printf ("`isw%s' test for character \\%o failed\n", \
+ #test, ch); \
+ result = 1; \
+ } \
+ } \
while (0)
TEST (alnum);
diff --git a/wctype/wctype.c b/wctype/wctype.c
index 01746be03b..07cb518ad3 100644
--- a/wctype/wctype.c
+++ b/wctype/wctype.c
@@ -20,21 +20,24 @@
#include <endian.h>
#include <string.h>
#include <wctype.h>
-#include "../locale/localeinfo.h"
+#include <locale/localeinfo.h>
wctype_t
wctype (const char *property)
{
const char *names;
wctype_t result;
+ size_t proplen = strlen (property);
names = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS_NAMES);
for (result = 1; result != 0; result <<= 1)
{
- if (strcmp (property, names) == 0)
+ size_t nameslen = strlen (names);
+
+ if (proplen == nameslen && memcmp (property, names, proplen) == 0)
break;
- names = strchr (names, '\0') + 1;
+ names += nameslen + 1;
if (names[0] == '\0')
return 0;
}
@@ -42,9 +45,9 @@ wctype (const char *property)
#if __BYTE_ORDER == __BIG_ENDIAN
return result;
#else
-# define SWAPU32(w) \
- (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24))
+#define XSWAPU32(w) \
+ ((((w) & 0xff00ff00) >> 8) | (((w) & 0xff00ff) << 8))
- return SWAPU32 (result);
+ return XSWAPU32 (result);
#endif
}
diff --git a/wctype/wctype.h b/wctype/wctype.h
index 91a1678192..ffa4b25808 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -57,11 +57,7 @@ typedef unsigned long int wctype_t;
#endif
#ifndef _ISbit
-/* These are all the characteristics of characters.
- If there get to be more than 16 distinct characteristics,
- many things must be changed that use `unsigned short int's.
-
- The characteristics are stored always in network byte order (big
+/* 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. */
@@ -260,25 +256,30 @@ extern int __iswupper_l __P ((wint_t __wc, __locale_t __locale));
extern int __iswxdigit_l __P ((wint_t __wc, __locale_t __locale));
+/* 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));
+
/* 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));
+ __locale_t __locale));
/*
- * Wide-character case-mapping functions: 7.15.3.1.
+ * Wide-character case-mapping functions.
*/
/* 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 __P ((wint_t __wc, __locale_t __locale));
/* 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 __P ((wint_t __wc, __locale_t __locale));
/* 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));
+ __locale_t __locale));
# ifndef __NO_WCTYPE
diff --git a/wctype/wctype_l.c b/wctype/wctype_l.c
new file mode 100644
index 0000000000..6a8d469fa8
--- /dev/null
+++ b/wctype/wctype_l.c
@@ -0,0 +1,53 @@
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <endian.h>
+#include <string.h>
+#include <wctype.h>
+#include <locale/localeinfo.h>
+
+wctype_t
+__wctype_l (const char *property, __locale_t locale)
+{
+ const char *names;
+ wctype_t result;
+ size_t proplen = strlen (property);
+
+ names = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_NAMES)].string;
+ for (result = 1; result != 0; result <<= 1)
+ {
+ size_t nameslen = strlen (names);
+
+ if (proplen == nameslen && memcmp (property, names, proplen) == 0)
+ break;
+
+ names += nameslen + 1;
+ if (names[0] == '\0')
+ return 0;
+ }
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+ return result;
+#else
+#define XSWAPU32(w) \
+ ((((w) & 0xff00ff00) >> 8) | (((w) & 0xff00ff) << 8))
+
+ return XSWAPU32 (result);
+#endif
+}