Changeset 1403

Timestamp:

Apr 29, 2004, 6:30:57 AM (21 years ago)

Author:

bird

Message:

Redid some constants and copied some minor stuff from mingw32.

Location:

trunk/src/gcc/libstdc++-v3/config/os/os2emx

Files:

• ctype_base.h (modified) (1 diff, 1 prop)
• ctype_inline.h (modified) (4 diffs, 1 prop)
• ctype_noninline.h (modified) (3 diffs, 1 prop)

trunk/src/gcc/libstdc++-v3/config/os/os2emx/ctype_base.h

@@ -32 +32 @@
 //
   
-// Information as gleaned from /emx/include/ctype.h
-
-#define __ctype_ALNUM   0x0001
-#define __ctype_ALPHA   0x0002
-#define __ctype_CNTRL   0x0004
-#define __ctype_DIGIT   0x0008
-#define __ctype_XDIGIT  0x0010
-#define __ctype_PUNCT   0x0020
-#define __ctype_UPPER   0x0040
-#define __ctype_LOWER   0x0080
-#define __ctype_GRAPH   0x0100
-#define __ctype_PRINT   0x0200
-#define __ctype_SPACE   0x0400
+// Information as gleaned from ctype.h
   
+#define __ctype_UPPER   0x0001      /* Upper case alphabetic character. */
+#define __ctype_LOWER   0x0002      /* Lower case alphabetic character. */
+#define __ctype_DIGIT   0x0004      /* Digits 0-9. */
+#define __ctype_SPACE   0x0008      /* White space and line ends. */
+#define __ctype_PUNCT   0x0010      /* Punctuation marks. */
+#define __ctype_CNTRL   0x0020      /* Control and format characters. */
+#define __ctype_XDIGIT  0x0080      /* Hex digits. */
+#define __ctype_ALPHA   0x0100      /* Letters and linguistic marks. */
+#define __ctype_ALNUM   0x0200      /* Alphanumeric. */
+#define __ctype_GRAPH   0x0400      /* All except controls and space. */
+#define __ctype_PRINT   0x0800      /* Everything except controls. */
+                  
   struct ctype_base
   {

trunk/src/gcc/libstdc++-v3/config/os/os2emx/ctype_inline.h

@@ -35 +35 @@
 // functions go in ctype.cc
   
+
   bool
   ctype<char>::
   is(mask __m, char __c) const
-  { return _M_table[__c] & __m; }
+  { 
+        return (_M_table[static_cast<unsigned char>(__c) ] & __m); 
+  }
 
+ 
   const char*
   ctype<char>::
@@ -45 +49 @@
   {
     while (__low < __high)
-      *__vec++ = _M_table[*__low++];
+      *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
     return __high;
   }
@@ -53 +57 @@
   scan_is(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high && !(_M_table[*__low] & __m))
+    while (__low < __high && !this->is(__m, *__low))
       ++__low;
     return __low;
@@ -62 +66 @@
   scan_not(mask __m, const char* __low, const char* __high) const
   {
-    while (__low < __high 
-           && (_M_table[*__low] & __m) != 0)
+    while (__low < __high && this->is(__m, *__low) != 0)
       ++__low;
     return __low;

trunk/src/gcc/libstdc++-v3/config/os/os2emx/ctype_noninline.h

@@ -161 +161 @@
   { return __ctype_data_inst.ctable; }
 
-  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, size_t __refs) 
-    : __ctype_abstract_base<char>(__refs),
-      _M_del(__table != 0 && __del),
+  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
+                     size_t __refs) 
+    : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del),
       _M_toupper (__ctype_data_inst.toupper),
       _M_tolower (__ctype_data_inst.tolower),
@@ -172 +172 @@
 
   ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
-    : __ctype_abstract_base<char>(__refs),
-      _M_del(__table != 0 && __del),
+    : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del),
       _M_toupper (__ctype_data_inst.toupper),
       _M_tolower (__ctype_data_inst.tolower),
@@ -210 +209 @@
     return __high;
   }
+
+
+
+