Changeset 994

Timestamp:

Jan 18, 2004, 6:23:12 AM (22 years ago)

Author:

bird

Message:

Added BLANK attribute.

Location:

trunk/src/emx

Files:

• include/ctype.h (modified) (2 diffs, 1 prop)
• include/sys/locale.h (modified) (2 diffs, 1 prop)
• src/lib/locale/setlocale.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/ctype.h

@@ -11 +11 @@
 #define _CTYPE_H
 
-#if defined (__cplusplus)
-extern "C" {
-#endif
+#include <sys/cdefs.h>
+#include <sys/locale.h>
 
-#include <sys/locale.h>
+__BEGIN_DECLS
 
 static inline int isalnum (int _c)
@@ -56 +55 @@
 { return __locale_ctype.locase [_c & 0xff]; }
 
-#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
 
-#define isascii(c) (!((c) & 0x80))
-#define toascii(c) ((c) & 0x7f)
-
+#if __XSI_VISIBLE
+static inline int _toupper (int _c)
+{ return __locale_ctype.upcase [_c & 0xff]; }
+static inline int _tolower (int _c)
+{ return __locale_ctype.locase [_c & 0xff]; }
+static inline int isascii (int _c)
+{ return !(_c & 0x80); }
+static inline int toascii (int _c)
+{ return (_c & 0x7f); }
 #endif
 
-#if defined (__cplusplus)
-}
+#if __BSD_VISIBLE
+/* @todo int    digittoint(int); */
+static inline int isblank (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__BLANK); }
+/* @todo int    ishexnumber(int); */
+/* @todo int    isideogram(int); */
+/* @todo int    isnumber(int); */
+/* @todo int    isphonogram(int); */
+/* @todo int    isrune(int); */
+/* @todo int    isspecial(int); */
 #endif
 
+__END_DECLS
+
 #endif /* not _CTYPE_H */

trunk/src/emx/include/sys/locale.h

@@ -22 +22 @@
 
 /* Bit masks for __locale_global.ctype */
-#define __UPPER  0x01
-#define __LOWER  0x02
-#define __DIGIT  0x04
-#define __XDIGIT 0x08
-#define __CNTRL  0x10
-#define __SPACE  0x20
-#define __PUNCT  0x40
-#define __PRINT  0x80
+#define __UPPER  0x0001
+#define __LOWER  0x0002
+#define __DIGIT  0x0004
+#define __XDIGIT 0x0008
+#define __CNTRL  0x0010
+#define __SPACE  0x0020
+#define __PUNCT  0x0040
+#define __PRINT  0x0080
+#define __BLANK  0x0100
 
 #ifdef __INTERNAL_DEFS
@@ -88 +89 @@
 {
   /* Bit flags for every character (for isXXX() function series) */
-  unsigned char cflags [256];
+  unsigned short cflags [256];
   /* All uppercased characters */
   unsigned char upcase [256];

trunk/src/emx/src/lib/locale/setlocale.c

@@ -486 +486 @@
             if (UniQueryPrint (locale_obj, ucs))
               ct |= __PRINT;
+            if (UniQueryBlank (locale_obj, ucs))
+              ct |= __BLANK;
 
             uc = Transform (locale_obj, uconv_obj, UniTransUpper, ucs, i);