Changeset 1093

Timestamp:

03/20/11 08:18:14 (2 years ago)

Author:

reyalP

Message:

merge r1092 from trunk to ptp branch

Location:

branches/reyalp-ptp

Files:

• . (modified) (1 prop)
• include/ctype.h (modified) (1 diff)
• include/stdlib.h (modified) (1 diff)
• platform/generic/wrappers.c (modified) (9 diffs)

branches/reyalp-ptp/include/ctype.h

@@ -1 +1 @@
 #ifndef CTYPE_H
 #define CTYPE_H
-
+// dummy for lua code
 #include <stdlib.h>
-
-static inline int iscntrl( int c ) {
-    return 0;
-}
-
-static inline int isalnum( int c ) {
-    return isalpha(c) || isdigit(c);
-}
-
 #endif

branches/reyalp-ptp/include/stdlib.h

@@ -100 +100 @@
 extern int ispunct(int c);
 extern int isxdigit(int c);
+extern int iscntrl(int c);
+extern int isalnum(int c);
 
 extern long sprintf(char *s, const char *st, ...);

branches/reyalp-ptp/platform/generic/wrappers.c

@@ -15 +15 @@
 #define _X      0x40    /* hex digit */
 #define _SP     0x80    /* hard space (0x20) */
-unsigned char _ctype[] = {
+static int _ctype(int c,int t) {
+static unsigned char ctypes[] = {
 _C,_C,_C,_C,_C,_C,_C,_C,                        /* 0-7 */
 _C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C,         /* 8-15 */
@@ -40 +41 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 224-239 */
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};               /* 240-255 */
+    // have to handle EOF (-1)
+    if( (unsigned)c >= sizeof(ctypes)) {
+        return 0;
+    }
+    return ctypes[c] & t;
+}
 #endif
 
@@ -286 +293 @@
     return _isdigit(c);
 #else
-    return _ctype[c]&_D;
+    return _ctype(c,_D);
 #endif
 }
@@ -294 +301 @@
     return _isspace(c);
 #else
-    return _ctype[c]&_S;
+    return _ctype(c,_S);
 #endif
 
@@ -303 +310 @@
     return _isalpha(c);
 #else
-    return _ctype[c]&(_U|_L);
+    return _ctype(c,(_U|_L));
 #endif
 }
@@ -311 +318 @@
     return _isupper(c);
 #else
-    return _ctype[c]&_U;
+    return _ctype(c,_U);
 #endif
 
@@ -320 +327 @@
     return _islower(c);
 #else
-    return _ctype[c]&_L;
+    return _ctype(c,_L);
 #endif
 
@@ -329 +336 @@
     return _ispunct(c);
 #else
-    return _ctype[c]&_P;
+    return _ctype(c,_P);
 #endif
 }
@@ -337 +344 @@
     return _isxdigit(c);
 #else
-    return _ctype[c]&(_X|_D);
+    return _ctype(c,(_X|_D));
+#endif
+}
+
+int isalnum(int c) {
+    return (isdigit(c) || isalpha(c));
+}
+
+int iscntrl(int c) {
+#if !CAM_DRYOS
+    return ((c >=0 && c <32) || c == 127); // don't want to require the whole ctype table on vxworks just for this one
+#else
+    return _ctype(c,_C);
 #endif
 }