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

2 files changed, 86 insertions, 70 deletions

diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index bd5923a..3b81ea5 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -37,6 +37,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 6/6/93";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -84,20 +85,34 @@ MAPUPPER			{ return(MAPUPPER); }
 TODIGIT				{ return(DIGITMAP); }
 INVALID				{ return(INVALID); }
 
-ALPHA				{ yylval.i = _A|_R|_G; return(LIST); }
-CONTROL				{ yylval.i = _C; return(LIST); }
-DIGIT				{ yylval.i = _D|_R|_G; return(LIST); }
-GRAPH				{ yylval.i = _G|_R; return(LIST); }
-LOWER				{ yylval.i = _L|_R|_G; return(LIST); }
-PUNCT				{ yylval.i = _P|_R|_G; return(LIST); }
-SPACE				{ yylval.i = _S; return(LIST); }
-UPPER				{ yylval.i = _U|_R|_G; return(LIST); }
-XDIGIT				{ yylval.i = _X|_R|_G; return(LIST); }
-BLANK				{ yylval.i = _B; return(LIST); }
-PRINT				{ yylval.i = _R; return(LIST); }
-IDEOGRAM			{ yylval.i = _I|_R|_G; return(LIST); }
-SPECIAL				{ yylval.i = _T|_R|_G; return(LIST); }
-PHONOGRAM			{ yylval.i = _Q|_R|_G; return(LIST); }
+ALPHA				{ yylval.i = _CTYPE_A|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+CONTROL				{ yylval.i = _CTYPE_C;
+				  return(LIST); }
+DIGIT				{ yylval.i = _CTYPE_D|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+GRAPH				{ yylval.i = _CTYPE_G|_CTYPE_R;
+				  return(LIST); }
+LOWER				{ yylval.i = _CTYPE_L|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+PUNCT				{ yylval.i = _CTYPE_P|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+SPACE				{ yylval.i = _CTYPE_S;
+				  return(LIST); }
+UPPER				{ yylval.i = _CTYPE_U|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+XDIGIT				{ yylval.i = _CTYPE_X|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+BLANK				{ yylval.i = _CTYPE_B;
+				  return(LIST); }
+PRINT				{ yylval.i = _CTYPE_R;
+				  return(LIST); }
+IDEOGRAM			{ yylval.i = _CTYPE_I|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+SPECIAL				{ yylval.i = _CTYPE_T|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
+PHONOGRAM			{ yylval.i = _CTYPE_Q|_CTYPE_R|_CTYPE_G;
+				  return(LIST); }
 
 VARIABLE[\t ]			{ static char vbuf[1024];
 				  char *v = vbuf;
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index a9c2b42..dcdef34 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -37,6 +37,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)yacc.y	8.1 (Berkeley) 6/6/93";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -739,20 +740,20 @@ dump_tables()
 	    else
 		fprintf(stderr, "%04x: %2d", x, (int)(r & 0xff));
 
-	    fprintf(stderr, " %4s", (r & _A) ? "alph" : "");
-	    fprintf(stderr, " %4s", (r & _C) ? "ctrl" : "");
-	    fprintf(stderr, " %4s", (r & _D) ? "dig" : "");
-	    fprintf(stderr, " %4s", (r & _G) ? "graf" : "");
-	    fprintf(stderr, " %4s", (r & _L) ? "low" : "");
-	    fprintf(stderr, " %4s", (r & _P) ? "punc" : "");
-	    fprintf(stderr, " %4s", (r & _S) ? "spac" : "");
-	    fprintf(stderr, " %4s", (r & _U) ? "upp" : "");
-	    fprintf(stderr, " %4s", (r & _X) ? "xdig" : "");
-	    fprintf(stderr, " %4s", (r & _B) ? "blnk" : "");
-	    fprintf(stderr, " %4s", (r & _R) ? "prnt" : "");
-	    fprintf(stderr, " %4s", (r & _I) ? "ideo" : "");
-	    fprintf(stderr, " %4s", (r & _T) ? "spec" : "");
-	    fprintf(stderr, " %4s", (r & _Q) ? "phon" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_A) ? "alph" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_C) ? "ctrl" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_D) ? "dig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_G) ? "graf" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_L) ? "low" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_P) ? "punc" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_S) ? "spac" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_U) ? "upp" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_X) ? "xdig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_B) ? "blnk" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_R) ? "prnt" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_I) ? "ideo" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_T) ? "spec" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_Q) ? "phon" : "");
 	    fprintf(stderr, "\n");
 	}
     }
@@ -764,39 +765,39 @@ dump_tables()
 	    fprintf(stderr, "%04lx: %2d",
 		(unsigned long)list->min, (int)(r & 0xff));
 
-	    fprintf(stderr, " %4s", (r & _A) ? "alph" : "");
-	    fprintf(stderr, " %4s", (r & _C) ? "ctrl" : "");
-	    fprintf(stderr, " %4s", (r & _D) ? "dig" : "");
-	    fprintf(stderr, " %4s", (r & _G) ? "graf" : "");
-	    fprintf(stderr, " %4s", (r & _L) ? "low" : "");
-	    fprintf(stderr, " %4s", (r & _P) ? "punc" : "");
-	    fprintf(stderr, " %4s", (r & _S) ? "spac" : "");
-	    fprintf(stderr, " %4s", (r & _U) ? "upp" : "");
-	    fprintf(stderr, " %4s", (r & _X) ? "xdig" : "");
-	    fprintf(stderr, " %4s", (r & _B) ? "blnk" : "");
-	    fprintf(stderr, " %4s", (r & _R) ? "prnt" : "");
-	    fprintf(stderr, " %4s", (r & _I) ? "ideo" : "");
-	    fprintf(stderr, " %4s", (r & _T) ? "spec" : "");
-	    fprintf(stderr, " %4s", (r & _Q) ? "phon" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_A) ? "alph" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_C) ? "ctrl" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_D) ? "dig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_G) ? "graf" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_L) ? "low" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_P) ? "punc" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_S) ? "spac" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_U) ? "upp" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_X) ? "xdig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_B) ? "blnk" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_R) ? "prnt" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_I) ? "ideo" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_T) ? "spec" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_Q) ? "phon" : "");
 	    fprintf(stderr, "\n...\n");
 
 	    fprintf(stderr, "%04lx: %2d",
 		(unsigned long)list->max, (int)(r & 0xff));
 
-	    fprintf(stderr, " %4s", (r & _A) ? "alph" : "");
-	    fprintf(stderr, " %4s", (r & _C) ? "ctrl" : "");
-	    fprintf(stderr, " %4s", (r & _D) ? "dig" : "");
-	    fprintf(stderr, " %4s", (r & _G) ? "graf" : "");
-	    fprintf(stderr, " %4s", (r & _L) ? "low" : "");
-	    fprintf(stderr, " %4s", (r & _P) ? "punc" : "");
-	    fprintf(stderr, " %4s", (r & _S) ? "spac" : "");
-	    fprintf(stderr, " %4s", (r & _U) ? "upp" : "");
-	    fprintf(stderr, " %4s", (r & _X) ? "xdig" : "");
-	    fprintf(stderr, " %4s", (r & _B) ? "blnk" : "");
-	    fprintf(stderr, " %4s", (r & _R) ? "prnt" : "");
-	    fprintf(stderr, " %4s", (r & _I) ? "ideo" : "");
-	    fprintf(stderr, " %4s", (r & _T) ? "spec" : "");
-	    fprintf(stderr, " %4s", (r & _Q) ? "phon" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_A) ? "alph" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_C) ? "ctrl" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_D) ? "dig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_G) ? "graf" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_L) ? "low" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_P) ? "punc" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_S) ? "spac" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_U) ? "upp" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_X) ? "xdig" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_B) ? "blnk" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_R) ? "prnt" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_I) ? "ideo" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_T) ? "spec" : "");
+	    fprintf(stderr, " %4s", (r & _CTYPE_Q) ? "phon" : "");
 	    fprintf(stderr, "\n");
 	} else 
 	for (x = list->min; x <= list->max; ++x) {
@@ -805,20 +806,20 @@ dump_tables()
 	    if (r) {
 		fprintf(stderr, "%04x: %2d", x, (int)(r & 0xff));
 
-		fprintf(stderr, " %4s", (r & _A) ? "alph" : "");
-		fprintf(stderr, " %4s", (r & _C) ? "ctrl" : "");
-		fprintf(stderr, " %4s", (r & _D) ? "dig" : "");
-		fprintf(stderr, " %4s", (r & _G) ? "graf" : "");
-		fprintf(stderr, " %4s", (r & _L) ? "low" : "");
-		fprintf(stderr, " %4s", (r & _P) ? "punc" : "");
-		fprintf(stderr, " %4s", (r & _S) ? "spac" : "");
-		fprintf(stderr, " %4s", (r & _U) ? "upp" : "");
-		fprintf(stderr, " %4s", (r & _X) ? "xdig" : "");
-		fprintf(stderr, " %4s", (r & _B) ? "blnk" : "");
-		fprintf(stderr, " %4s", (r & _R) ? "prnt" : "");
-		fprintf(stderr, " %4s", (r & _I) ? "ideo" : "");
-		fprintf(stderr, " %4s", (r & _T) ? "spec" : "");
-		fprintf(stderr, " %4s", (r & _Q) ? "phon" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_A) ? "alph" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_C) ? "ctrl" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_D) ? "dig" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_G) ? "graf" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_L) ? "low" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_P) ? "punc" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_S) ? "spac" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_U) ? "upp" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_X) ? "xdig" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_B) ? "blnk" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_R) ? "prnt" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_I) ? "ideo" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_T) ? "spec" : "");
+		fprintf(stderr, " %4s", (r & _CTYPE_Q) ? "phon" : "");
 		fprintf(stderr, "\n");
 	    }
 	}