aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/colldef
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1996-10-25 00:13:14 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1996-10-25 00:13:14 +0000
commit136d3cf2696015a4e7d57e80257f59bfd55bd7e9 (patch)
treebecbbd6a61eca7e9cee6660483a80c2fb3b53513 /usr.bin/colldef
parentd672246bcc6fbf7e06b7254319dc24792eca8e69 (diff)
Notes
Diffstat (limited to 'usr.bin/colldef')
-rw-r--r--usr.bin/colldef/parse.y16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index db57d21782f0..a3cb60f4a4d2 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: parse.y,v 1.3 1996/10/16 03:12:21 ache Exp $
+ * $Id: parse.y,v 1.4 1996/10/23 14:59:56 ache Exp $
*/
#include <err.h>
@@ -89,7 +89,7 @@ order : ORDER order_list {
for (ch = 0; ch < UCHAR_MAX + 1; ch++)
if (!__collate_char_pri_table[ch].prim)
- yyerror("Char 0x%02x not defined", ch);
+ yyerror("Char 0x%02x not present", ch);
fp = fopen(out_file, "w");
if(!fp)
@@ -117,7 +117,7 @@ order_list : item
;
item : CHAR {
if (__collate_char_pri_table[$1].prim)
- yyerror("Char 0x%02x redefined", $1);
+ yyerror("Char 0x%02x duplicated", $1);
__collate_char_pri_table[$1].prim = prim_pri++;
}
| CHAIN {
@@ -134,7 +134,7 @@ item : CHAR {
for (i = $1; i <= $3; i++) {
if (__collate_char_pri_table[(u_char)i].prim)
- yyerror("Char 0x%02x redefined", (u_char)i);
+ yyerror("Char 0x%02x duplicated", (u_char)i);
__collate_char_pri_table[(u_char)i].prim = prim_pri++;
}
}
@@ -154,7 +154,7 @@ sec_order_list : sec_sub_item
;
prim_sub_item : CHAR {
if (__collate_char_pri_table[$1].prim)
- yyerror("Char 0x%02x redefined", $1);
+ yyerror("Char 0x%02x duplicated", $1);
__collate_char_pri_table[$1].prim = prim_pri;
}
| CHAR RANGE CHAR {
@@ -166,7 +166,7 @@ prim_sub_item : CHAR {
for (i = $1; i <= $3; i++) {
if (__collate_char_pri_table[(u_char)i].prim)
- yyerror("Char 0x%02x redefined", (u_char)i);
+ yyerror("Char 0x%02x duplicated", (u_char)i);
__collate_char_pri_table[(u_char)i].prim = prim_pri;
}
}
@@ -179,7 +179,7 @@ prim_sub_item : CHAR {
;
sec_sub_item : CHAR {
if (__collate_char_pri_table[$1].prim)
- yyerror("Char 0x%02x redefined", $1);
+ yyerror("Char 0x%02x duplicated", $1);
__collate_char_pri_table[$1].prim = prim_pri;
__collate_char_pri_table[$1].sec = sec_pri++;
}
@@ -192,7 +192,7 @@ sec_sub_item : CHAR {
for (i = $1; i <= $3; i++) {
if (__collate_char_pri_table[(u_char)i].prim)
- yyerror("Char 0x%02x redefined", (u_char)i);
+ yyerror("Char 0x%02x duplicated", (u_char)i);
__collate_char_pri_table[(u_char)i].prim = prim_pri;
__collate_char_pri_table[(u_char)i].sec = sec_pri++;
}