diff options
author | obrien <obrien@FreeBSD.org> | 2000-02-08 07:43:26 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-02-08 07:43:26 +0000 |
commit | 049c6bbad03e47e3215ece2def41d171d4d7dd13 (patch) | |
tree | fc7eb2a086e24adead0c5f81e13925e143715141 /usr.bin/mklocale/yacc.y | |
parent | bcb32823be5f02644ad81cf37952accd5b07a80f (diff) | |
download | FreeBSD-src-049c6bbad03e47e3215ece2def41d171d4d7dd13.zip FreeBSD-src-049c6bbad03e47e3215ece2def41d171d4d7dd13.tar.gz |
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
Diffstat (limited to 'usr.bin/mklocale/yacc.y')
-rw-r--r-- | usr.bin/mklocale/yacc.y | 113 |
1 files changed, 57 insertions, 56 deletions
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"); } } |