There is a problem in that one cannot use ctype.h at the same time as parts

of the C++ stdlib.  Our ctype.h uses symbols of the form _<X> to denote the
various character classes.  Our ctype.h also extends the usual ctype.h
offering by adding the "_T" (special) class.  Problem is parts of the STL
also use the symbol "_T" as its parameterized type.  These two uses are
incompatible.

Thus change the form of the symbols used in ctype to something that fixes
the current problem and is less likely to cause conflicts in the future.

Requested by:	Tomoaki NISHIYAMA <tomoaki@biol.s.u-tokyo.ac.jp>
Ok'ed by:	JKH

1 files changed, 128 insertions, 32 deletions

diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 556a8de..2fe979c 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -54,38 +54,134 @@ _RuneLocale _DefaultRuneLocale = {
     _none_sputrune,
     0xFFFD,
 
-    {	/*00*/	_C,		_C,		_C,		_C,
-		_C,		_C,		_C,		_C,
-	/*08*/	_C,		_C|_S|_B,	_C|_S,		_C|_S,
-		_C|_S,		_C|_S,		_C,		_C,
-	/*10*/	_C,		_C,		_C,		_C,
-		_C,		_C,		_C,		_C,
-	/*18*/	_C,		_C,		_C,		_C,
-		_C,		_C,		_C,		_C,
-	/*20*/	_S|_B|_R,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-		_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-	/*28*/	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-		_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-	/*30*/	_D|_R|_G|_X|0,	_D|_R|_G|_X|1,	_D|_R|_G|_X|2,	_D|_R|_G|_X|3,
-		_D|_R|_G|_X|4,	_D|_R|_G|_X|5,	_D|_R|_G|_X|6,	_D|_R|_G|_X|7,
-	/*38*/	_D|_R|_G|_X|8,	_D|_R|_G|_X|9,	_P|_R|_G,	_P|_R|_G,
-		_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-	/*40*/	_P|_R|_G, _U|_X|_R|_G|_A|10, _U|_X|_R|_G|_A|11, _U|_X|_R|_G|_A|12,
-		_U|_X|_R|_G|_A|13, _U|_X|_R|_G|_A|14, _U|_X|_R|_G|_A|15, _U|_R|_G|_A,
-	/*48*/	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,
-		_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,
-	/*50*/	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,
-		_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,
-	/*58*/	_U|_R|_G|_A,	_U|_R|_G|_A,	_U|_R|_G|_A,	_P|_R|_G,
-		_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_P|_R|_G,
-	/*60*/	_P|_R|_G, _L|_X|_R|_G|_A|10, _L|_X|_R|_G|_A|11, _L|_X|_R|_G|_A|12,
-		_L|_X|_R|_G|_A|13, _L|_X|_R|_G|_A|14, _L|_X|_R|_G|_A|15, _L|_R|_G|_A,
-	/*68*/	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,
-		_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,
-	/*70*/	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,
-		_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,
-	/*78*/	_L|_R|_G|_A,	_L|_R|_G|_A,	_L|_R|_G|_A,	_P|_R|_G,
-		_P|_R|_G,	_P|_R|_G,	_P|_R|_G,	_C,
+    {	/*00*/	_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+	/*08*/	_CTYPE_C,
+		_CTYPE_C|_CTYPE_S|_CTYPE_B,
+		_CTYPE_C|_CTYPE_S,
+		_CTYPE_C|_CTYPE_S,
+		_CTYPE_C|_CTYPE_S,
+		_CTYPE_C|_CTYPE_S,
+		_CTYPE_C,
+		_CTYPE_C,
+	/*10*/	_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+	/*18*/	_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+		_CTYPE_C,
+	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
+	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
+		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
+		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
+		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_P|_CTYPE_R|_CTYPE_G,
+		_CTYPE_C,
     },
     {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
      	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,