Changeset 39246 in vbox

Timestamp:

Nov 9, 2011 10:25:42 AM (13 years ago)

Author:

vboxsync

Message:

iprt/ctype.h: Corrected bugs and adding a complete testcase.

Location:

trunk

Files:

• include/iprt/ctype.h (modified) (12 diffs)
• src/VBox/Runtime/testcase/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTCType.cpp (added)

trunk/include/iprt/ctype.h

@@ -65 +65 @@
 DECL_FORCE_INLINE(bool) RTLocCIsBlank(int ch)
 {
-    return ch == ' ' || ch == '\t';
+    return ch == 0x20  /* space */
+        || ch == 0x09; /* horizontal tab */
 }
 
@@ -76 +77 @@
 DECL_FORCE_INLINE(bool) RTLocCIsCntrl(int ch)
 {
-    return (ch) >= 0   && (ch) <  32;
+    return (unsigned)ch < 32U /* 0..2f */
+        || ch == 0x7f;
 }
 
@@ -87 +89 @@
 DECL_FORCE_INLINE(bool) RTLocCIsDigit(int ch)
 {
-    return (ch) >= '0' && (ch) <= '9';
+    return (unsigned)ch - 0x30 < 10U; /* 30..39 */
 }
 
@@ -98 +100 @@
 DECL_FORCE_INLINE(bool) RTLocCIsLower(int ch)
 {
-    return (ch) >= 'a' && (ch) <= 'z';
+    return (unsigned)ch - 0x61U < 26U; /* 61..7a */
 }
 
@@ -109 +111 @@
 DECL_FORCE_INLINE(bool) RTLocCIsODigit(int ch)
 {
-    return (ch) >= '0' && (ch) <= '7';
+    return (unsigned)ch - 0x30 < 8U; /* 30..37 */
 }
 
@@ -120 +122 @@
 DECL_FORCE_INLINE(bool) RTLocCIsPrint(int ch)
 {
-    /** @todo quite possibly incorrect */
-    return (ch) >= 32  && (ch) < 127;
+    return (unsigned)ch - 0x20U < 95U; /* 20..7e */
 }
 
@@ -132 +133 @@
 DECL_FORCE_INLINE(bool) RTLocCIsPunct(int ch)
 {
-    /** @todo possibly incorrect */
-    return (ch) == ',' || (ch) == '.'  || (ch) == ':'  || (ch) == ';'  || (ch) == '!'  || (ch) == '?';
+    return (unsigned)ch - 0x21U < 15U /* 21..2f */
+        || (unsigned)ch - 0x2aU <  6U /* 2a..2f */
+        || (unsigned)ch - 0x3aU <  7U /* 3a..40 */
+        || (unsigned)ch - 0x5bU <  6U /* 5a..60 */
+        || (unsigned)ch - 0x7bU <  4U /* 7b..7e */;
 }
 
@@ -144 +148 @@
 DECL_FORCE_INLINE(bool) RTLocCIsSpace(int ch)
 {
-    /* \t (9), \n (10), \v (11), \f (12), \r (13), ' ' (32). */
-    return (ch) == ' ' || ((ch) >= 9 && (ch) <= 13);
+    return ch == 0x20                 /* 20 (space) */
+        || (unsigned)ch - 0x09U < 5U; /* 09..0d */
 }
 
@@ -156 +160 @@
 DECL_FORCE_INLINE(bool) RTLocCIsUpper(int ch)
 {
-    return (ch) >= 'A' && (ch) <= 'Z';
+    return (unsigned)ch - 0x41 < 26U; /* 41..5a */
 }
 
@@ -167 +171 @@
 DECL_FORCE_INLINE(bool) RTLocCIsXDigit(int ch)
 {
-    return RTLocCIsDigit(ch) || ((ch) >= 'a' && (ch) <= 'f') || ((ch) >= 'A' && (ch) <= 'F');
+    return (unsigned)ch - 0x30 < 10U /* 30..39 (0-9) */
+        || (unsigned)ch - 0x41 < 6   /* 41..46 (A-F) */
+        || (unsigned)ch - 0x61 < 6;  /* 61..66 (a-f) */
 }
 
@@ -212 +218 @@
 DECL_FORCE_INLINE(int) RTLocCToLower(int ch)
 {
-    return RTLocCIsUpper(ch) ? (ch) + ('a' - 'A') : (ch);
+    return RTLocCIsUpper(ch) ? (ch) + 0x20 : (ch);
 }
 
@@ -223 +229 @@
 DECL_FORCE_INLINE(int) RTLocCToUpper(int ch)
 {
-    return RTLocCIsLower(ch) ? (ch) - ('a' - 'A') : (ch);
+    return RTLocCIsLower(ch) ? (ch) - 0x20 : (ch);
 }
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -51 +51 @@
         tstRTCidr \
         tstRTCritSect \
+        tstRTCType \
         tstRTDigest \
         tstDir \
@@ -209 +210 @@
 tstRTCritSectW32_DEFS = TRY_WIN32_CRIT
 
+tstRTCType_TEMPLATE = VBOXR3TSTEXE
+tstRTCType_SOURCES = tstRTCType.cpp
+
 tstRTDigest_SOURCES = tstRTDigest.cpp