Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src rename _CTYPE_x to _RUNETYPE_x for avoiding compile error on...
details: https://anonhg.NetBSD.org/src/rev/101a773d9206
branches: trunk
changeset: 544080:101a773d9206
user: tshiozak <tshiozak%NetBSD.org@localhost>
date: Mon Mar 10 21:18:50 2003 +0000
description:
rename _CTYPE_x to _RUNETYPE_x for avoiding compile error on FreeBSD.
diffstat:
lib/libc/locale/runetype.h | 42 +++++++-------
usr.bin/mklocale/lex.l | 40 +++++++-------
usr.bin/mklocale/yacc.y | 120 ++++++++++++++++++++++----------------------
3 files changed, 101 insertions(+), 101 deletions(-)
diffs (290 lines):
diff -r e61077e638be -r 101a773d9206 lib/libc/locale/runetype.h
--- a/lib/libc/locale/runetype.h Mon Mar 10 21:18:49 2003 +0000
+++ b/lib/libc/locale/runetype.h Mon Mar 10 21:18:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: runetype.h,v 1.14 2003/03/10 20:41:29 tshiozak Exp $ */
+/* $NetBSD: runetype.h,v 1.15 2003/03/10 21:18:50 tshiozak Exp $ */
/*-
* Copyright (c) 1993
@@ -65,26 +65,26 @@
* The lower 8 bits of runetype[] contain the digit value of the rune.
*/
typedef uint32_t _RuneType;
-#define _CTYPE_A UINT32_C(0x00000100) /* Alpha */
-#define _CTYPE_C UINT32_C(0x00000200) /* Control */
-#define _CTYPE_D UINT32_C(0x00000400) /* Digit */
-#define _CTYPE_G UINT32_C(0x00000800) /* Graph */
-#define _CTYPE_L UINT32_C(0x00001000) /* Lower */
-#define _CTYPE_P UINT32_C(0x00002000) /* Punct */
-#define _CTYPE_S UINT32_C(0x00004000) /* Space */
-#define _CTYPE_U UINT32_C(0x00008000) /* Upper */
-#define _CTYPE_X UINT32_C(0x00010000) /* X digit */
-#define _CTYPE_B UINT32_C(0x00020000) /* Blank */
-#define _CTYPE_R UINT32_C(0x00040000) /* Print */
-#define _CTYPE_I UINT32_C(0x00080000) /* Ideogram */
-#define _CTYPE_T UINT32_C(0x00100000) /* Special */
-#define _CTYPE_Q UINT32_C(0x00200000) /* Phonogram */
-#define _CTYPE_SWM UINT32_C(0xc0000000)/* Mask to get screen width data */
-#define _CTYPE_SWS 30 /* Bits to shift to get width */
-#define _CTYPE_SW0 UINT32_C(0x00000000) /* 0 width character */
-#define _CTYPE_SW1 UINT32_C(0x40000000) /* 1 width character */
-#define _CTYPE_SW2 UINT32_C(0x80000000) /* 2 width character */
-#define _CTYPE_SW3 UINT32_C(0xc0000000) /* 3 width character */
+#define _RUNETYPE_A UINT32_C(0x00000100) /* Alpha */
+#define _RUNETYPE_C UINT32_C(0x00000200) /* Control */
+#define _RUNETYPE_D UINT32_C(0x00000400) /* Digit */
+#define _RUNETYPE_G UINT32_C(0x00000800) /* Graph */
+#define _RUNETYPE_L UINT32_C(0x00001000) /* Lower */
+#define _RUNETYPE_P UINT32_C(0x00002000) /* Punct */
+#define _RUNETYPE_S UINT32_C(0x00004000) /* Space */
+#define _RUNETYPE_U UINT32_C(0x00008000) /* Upper */
+#define _RUNETYPE_X UINT32_C(0x00010000) /* X digit */
+#define _RUNETYPE_B UINT32_C(0x00020000) /* Blank */
+#define _RUNETYPE_R UINT32_C(0x00040000) /* Print */
+#define _RUNETYPE_I UINT32_C(0x00080000) /* Ideogram */
+#define _RUNETYPE_T UINT32_C(0x00100000) /* Special */
+#define _RUNETYPE_Q UINT32_C(0x00200000) /* Phonogram */
+#define _RUNETYPE_SWM UINT32_C(0xc0000000)/* Mask to get screen width data */
+#define _RUNETYPE_SWS 30 /* Bits to shift to get width */
+#define _RUNETYPE_SW0 UINT32_C(0x00000000) /* 0 width character */
+#define _RUNETYPE_SW1 UINT32_C(0x40000000) /* 1 width character */
+#define _RUNETYPE_SW2 UINT32_C(0x80000000) /* 2 width character */
+#define _RUNETYPE_SW3 UINT32_C(0xc0000000) /* 3 width character */
/*
diff -r e61077e638be -r 101a773d9206 usr.bin/mklocale/lex.l
--- a/usr.bin/mklocale/lex.l Mon Mar 10 21:18:49 2003 +0000
+++ b/usr.bin/mklocale/lex.l Mon Mar 10 21:18:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.l,v 1.7 2003/03/10 20:41:30 tshiozak Exp $ */
+/* $NetBSD: lex.l,v 1.8 2003/03/10 21:18:50 tshiozak Exp $ */
%{
/*-
@@ -46,7 +46,7 @@
#if 0
static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lex.l,v 1.7 2003/03/10 20:41:30 tshiozak Exp $");
+__RCSID("$NetBSD: lex.l,v 1.8 2003/03/10 21:18:50 tshiozak Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -97,38 +97,38 @@
TODIGIT { return(DIGITMAP); }
INVALID { return(INVALID); }
-ALPHA { yylval.i = _CTYPE_A|_CTYPE_R|_CTYPE_G;
+ALPHA { yylval.i = _RUNETYPE_A|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-CONTROL { yylval.i = _CTYPE_C;
+CONTROL { yylval.i = _RUNETYPE_C;
return(LIST); }
-DIGIT { yylval.i = _CTYPE_D|_CTYPE_R|_CTYPE_G;
+DIGIT { yylval.i = _RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-GRAPH { yylval.i = _CTYPE_G|_CTYPE_R;
+GRAPH { yylval.i = _RUNETYPE_G|_RUNETYPE_R;
return(LIST); }
-LOWER { yylval.i = _CTYPE_L|_CTYPE_R|_CTYPE_G;
+LOWER { yylval.i = _RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-PUNCT { yylval.i = _CTYPE_P|_CTYPE_R|_CTYPE_G;
+PUNCT { yylval.i = _RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-SPACE { yylval.i = _CTYPE_S;
+SPACE { yylval.i = _RUNETYPE_S;
return(LIST); }
-UPPER { yylval.i = _CTYPE_U|_CTYPE_R|_CTYPE_G;
+UPPER { yylval.i = _RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-XDIGIT { yylval.i = _CTYPE_X|_CTYPE_R|_CTYPE_G;
+XDIGIT { yylval.i = _RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-BLANK { yylval.i = _CTYPE_B;
+BLANK { yylval.i = _RUNETYPE_B;
return(LIST); }
-PRINT { yylval.i = _CTYPE_R;
+PRINT { yylval.i = _RUNETYPE_R;
return(LIST); }
-IDEOGRAM { yylval.i = _CTYPE_I|_CTYPE_R|_CTYPE_G;
+IDEOGRAM { yylval.i = _RUNETYPE_I|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-SPECIAL { yylval.i = _CTYPE_T|_CTYPE_R|_CTYPE_G;
+SPECIAL { yylval.i = _RUNETYPE_T|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-PHONOGRAM { yylval.i = _CTYPE_Q|_CTYPE_R|_CTYPE_G;
+PHONOGRAM { yylval.i = _RUNETYPE_Q|_RUNETYPE_R|_RUNETYPE_G;
return(LIST); }
-SWIDTH0 { yylval.i = _CTYPE_SW0; return(LIST); }
-SWIDTH1 { yylval.i = _CTYPE_SW1; return(LIST); }
-SWIDTH2 { yylval.i = _CTYPE_SW2; return(LIST); }
-SWIDTH3 { yylval.i = _CTYPE_SW3; return(LIST); }
+SWIDTH0 { yylval.i = _RUNETYPE_SW0; return(LIST); }
+SWIDTH1 { yylval.i = _RUNETYPE_SW1; return(LIST); }
+SWIDTH2 { yylval.i = _RUNETYPE_SW2; return(LIST); }
+SWIDTH3 { yylval.i = _RUNETYPE_SW3; return(LIST); }
VARIABLE[\t ] { static char vbuf[1024];
char *v = vbuf;
diff -r e61077e638be -r 101a773d9206 usr.bin/mklocale/yacc.y
--- a/usr.bin/mklocale/yacc.y Mon Mar 10 21:18:49 2003 +0000
+++ b/usr.bin/mklocale/yacc.y Mon Mar 10 21:18:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.15 2003/03/10 20:41:30 tshiozak Exp $ */
+/* $NetBSD: yacc.y,v 1.16 2003/03/10 21:18:50 tshiozak Exp $ */
%{
/*-
@@ -47,7 +47,7 @@
static char sccsid[] = "@(#)yacc.y 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$FreeBSD$";
#else
-__RCSID("$NetBSD: yacc.y,v 1.15 2003/03/10 20:41:30 tshiozak Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.16 2003/03/10 21:18:50 tshiozak Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -801,20 +801,20 @@
else
fprintf(stderr, "%04x:%2d", x, (int)(r & 0xff));
- 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, " %4s", (r & _RUNETYPE_A) ? "alph" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_C) ? "ctrl" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_D) ? "dig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_G) ? "graf" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_L) ? "low" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_P) ? "punc" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_S) ? "spac" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_U) ? "upp" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_X) ? "xdig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_B) ? "blnk" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_R) ? "prnt" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_I) ? "ideo" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_T) ? "spec" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_Q) ? "phon" : "");
fprintf(stderr, "\n");
}
}
@@ -825,39 +825,39 @@
fprintf(stderr, "%04x:%2d", list->min, r & 0xff);
- 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, " %4s", (r & _RUNETYPE_A) ? "alph" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_C) ? "ctrl" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_D) ? "dig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_G) ? "graf" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_L) ? "low" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_P) ? "punc" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_S) ? "spac" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_U) ? "upp" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_X) ? "xdig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_B) ? "blnk" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_R) ? "prnt" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_I) ? "ideo" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_T) ? "spec" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_Q) ? "phon" : "");
fprintf(stderr, "\n...\n");
fprintf(stderr, "%04x:%2d", list->max, r & 0xff);
- 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, " %1u", (unsigned)((r & _CTYPE_SWM)>>_CTYPE_SWS));
+ fprintf(stderr, " %4s", (r & _RUNETYPE_A) ? "alph" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_C) ? "ctrl" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_D) ? "dig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_G) ? "graf" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_L) ? "low" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_P) ? "punc" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_S) ? "spac" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_U) ? "upp" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_X) ? "xdig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_B) ? "blnk" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_R) ? "prnt" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_I) ? "ideo" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_T) ? "spec" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_Q) ? "phon" : "");
+ fprintf(stderr, " %1u", (unsigned)((r & _RUNETYPE_SWM)>>_RUNETYPE_SWS));
fprintf(stderr, "\n");
} else
for (x = list->min; x <= list->max; ++x) {
@@ -866,21 +866,21 @@
if (r) {
fprintf(stderr, "%04x:%2d", x, (int)(r & 0xff));
- 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, " %1u", (unsigned)((r & _CTYPE_SWM)>>_CTYPE_SWS));
+ fprintf(stderr, " %4s", (r & _RUNETYPE_A) ? "alph" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_C) ? "ctrl" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_D) ? "dig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_G) ? "graf" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_L) ? "low" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_P) ? "punc" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_S) ? "spac" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_U) ? "upp" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_X) ? "xdig" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_B) ? "blnk" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_R) ? "prnt" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_I) ? "ideo" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_T) ? "spec" : "");
+ fprintf(stderr, " %4s", (r & _RUNETYPE_Q) ? "phon" : "");
+ fprintf(stderr, " %1u", (unsigned)((r & _RUNETYPE_SWM)>>_RUNETYPE_SWS));
fprintf(stderr, "\n");
}
}
Home |
Main Index |
Thread Index |
Old Index