Changeset 1003

Timestamp:

Jan 18, 2004, 10:10:14 AM (22 years ago)

Author:

bird

Message:

A little optimization and extension of the types we support.

File:

• trunk/src/emx/src/lib/locale/setlocale.c (modified) (3 diffs, 1 prop)

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

@@ -462 +462 @@
         {
           UniChar ucs;
-          unsigned char ct = 0, uc, lc;
+          unsigned short ct = 0;
+          unsigned char uc, lc;
 
           if (!__to_ucs (uconv_obj, (unsigned char *)&i, 1, &ucs))
@@ -469 +470 @@
           /* isxxx() do not support DBCS characters at all */
           if (!IS_MBCS_PREFIX (__locale_ctype,i))
-          {
+          {  /* isn't there apis for getting all this at once? */
+#if 0
             if (UniQueryUpper (locale_obj, ucs))
               ct |= __UPPER;
@@ -488 +490 @@
             if (UniQueryBlank (locale_obj, ucs))
               ct |= __BLANK;
+#else
+            UNICTYPE * pctype = UniQueryCharType (ucs);
+            if (pctype)
+              /* ASSUMES CT_* == __* */
+              ct = (pctype->itype) & (__UPPER  | __LOWER  | __DIGIT | __SPACE |
+                                      __PUNCT  | __CNTRL  | __BLANK | __XDIGIT |
+                                      __ALPHA  | __ALNUM  | __GRAPH | __PRINT |
+                                      __NUMBER | __SYMBOL | __ASCII);
+
+#endif
 
             uc = Transform (locale_obj, uconv_obj, UniTransUpper, ucs, i);