Changeset 571

Timestamp:

Aug 10, 2003, 11:50:17 PM (22 years ago)

Author:

bird

Message:

Put back the new version.

File:

• trunk/src/emx/include/ctype.h (modified) (2 diffs, 1 prop)

trunk/src/emx/include/ctype.h

@@ -1 @@
-/* ctype.h (emx+gcc) */
+/*
+    Locale support implementation through OS/2 Unicode API.
+    Copyright (c) 2003 InnoTek Systemberatung GmbH
+
+    For conditions of distribution and use, see the file COPYING.
+
+    Character type querying.
+*/
 
 #ifndef _CTYPE_H
@@ -8 +15 @@
 #endif
 
-extern unsigned char _ctype[];
+#include <sys/locale.h>
 
-#define _UPPER  0x01
-#define _LOWER  0x02
-#define _DIGIT  0x04
-#define _XDIGIT 0x08
-#define _CNTRL  0x10
-#define _SPACE  0x20
-#define _PUNCT  0x40
-#define _PRINT  0x80
+static inline int isalnum (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER|__DIGIT); }
 
-extern inline int isalnum (int _c)
-  { return (_ctype+1)[_c] & (_UPPER|_LOWER|_DIGIT); }
-extern inline int isalpha (int _c)
-  { return (_ctype+1)[_c] & (_UPPER|_LOWER); }
-extern inline int iscntrl (int _c)
-  { return (_ctype+1)[_c] & (_CNTRL); }
-extern inline int isdigit (int _c)
-  { return (_ctype+1)[_c] & (_DIGIT); }
-extern inline int isgraph (int _c)
-  { return (_ctype+1)[_c] & (_PUNCT|_UPPER|_LOWER|_DIGIT); }
-extern inline int islower (int _c)
-  { return (_ctype+1)[_c] & (_LOWER); }
-extern inline int isprint (int _c)
-  { return (_ctype+1)[_c] & (_PRINT); }
-extern inline int ispunct (int _c)
-  { return (_ctype+1)[_c] & (_PUNCT); }
-extern inline int isspace (int _c)
-  { return (_ctype+1)[_c] & (_SPACE); }
-extern inline int isupper (int _c)
-  { return (_ctype+1)[_c] & (_UPPER); }
-extern inline int isxdigit (int _c)
-  { return (_ctype+1)[_c] & (_XDIGIT); }
+static inline int isalpha (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER); }
 
-#if !defined (_CTYPE_FUN)
-extern __inline__ int _toupper (int _c) { return (_c-'a'+'A'); }
-extern __inline__ int _tolower (int _c) { return (_c-'A'+'a'); }
-extern __inline__ int toupper(int _c)
-  {return (islower(_c) ? _toupper(_c) : _c);}
-extern __inline__ int tolower(int _c)
-  {return (isupper(_c) ? _tolower(_c) : _c);}
+static inline int iscntrl (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__CNTRL); }
+
+static inline int isdigit (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__DIGIT); }
+
+static inline int isgraph (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__PUNCT|__UPPER|__LOWER|__DIGIT); }
+
+static inline int islower (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__LOWER); }
+
+static inline int isprint (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__PRINT); }
+
+static inline int ispunct (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__PUNCT); }
+
+static inline int isspace (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__SPACE); }
+
+static inline int isupper (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER); }
+
+static inline int isxdigit (int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__XDIGIT); }
+
+static inline int toupper (int _c)
+{ return __locale_ctype.upcase [_c & 0xff]; }
+
+static inline int tolower (int _c)
+{ return __locale_ctype.locase [_c & 0xff]; }
+
+#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
+
+#define isascii(c) (!((c) & 0x80))
+#define toascii(c) ((c) & 0x7f)
+
 #endif