1 files changed, 42 insertions, 42 deletions

diff --git a/yacc/reader.c b/yacc/reader.c
index f821589fb..085ecb7c3 100644
--- a/yacc/reader.c
+++ b/yacc/reader.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "defs.h"
 
 /*  The line size must be a positive integer.  One hundred was chosen	*/
@@ -34,8 +35,11 @@ char *name_pool;
 char line_format[] = "(* Line %d, file %s *)\n";
 
 
-cachec(c)
-int c;
+
+void start_rule ();
+
+void cachec(c)
+        int c;
 {
     assert(cinc >= 0);
     if (cinc >= cache_size)
@@ -49,7 +53,7 @@ int c;
 }
 
 
-get_line()
+void get_line()
 {
     register FILE *f = input_file;
     register int c;
@@ -113,7 +117,7 @@ dup_line()
 }
 
 
-skip_comment()
+void skip_comment()
 {
     register char *s;
 
@@ -265,10 +269,11 @@ keyword()
     }
     syntax_error(lineno, line, t_cptr);
     /*NOTREACHED*/
+    return 0;
 }
 
 
-copy_ident()
+void copy_ident()
 {
     register int c;
     register FILE *f = output_file;
@@ -297,7 +302,7 @@ copy_ident()
 }
 
 
-copy_text()
+void copy_text()
 {
     register int c;
     int quote;
@@ -319,7 +324,6 @@ loop:
     switch (c)
     {
     case '\n':
-    next_line:
 	putc('\n', f);
 	need_newline = 0;
 	get_line();
@@ -414,7 +418,7 @@ loop:
 }
 
 
-copy_union()
+void copy_union()
 {
     register int c;
     int quote;
@@ -442,7 +446,6 @@ loop:
     switch (c)
     {
     case '\n':
-    next_line:
 	get_line();
 	if (line == 0) unterminated_union(u_lineno, u_line, u_cptr);
 	goto loop;
@@ -537,7 +540,7 @@ loop:
 
 int
 hexval(c)
-int c;
+        int c;
 {
     if (c >= '0' && c <= '9')
 	return (c - '0');
@@ -690,7 +693,7 @@ get_literal()
 
 int
 is_reserved(name)
-char *name;
+        char *name;
 {
     char *s;
 
@@ -746,9 +749,7 @@ get_tag()
     register int c;
     register int i;
     register char *s;
-    int t_lineno = lineno;
     char *t_line = dup_line();
-    char *t_cptr = t_line + (cptr - line);
 
     cinc = 0;
     while (1) {
@@ -785,8 +786,8 @@ get_tag()
 }
 
 
-declare_tokens(assoc)
-int assoc;
+void declare_tokens(assoc)
+        int assoc;
 {
     register int c;
     register bucket *bp;
@@ -852,7 +853,7 @@ int assoc;
 }
 
 
-declare_types()
+void declare_types()
 {
     register int c;
     register bucket *bp;
@@ -880,7 +881,7 @@ declare_types()
 }
 
 
-declare_start()
+void declare_start()
 {
     register int c;
     register bucket *bp;
@@ -900,7 +901,7 @@ declare_start()
 }
 
 
-read_declarations()
+void read_declarations()
 {
     register int c, k;
 
@@ -948,7 +949,7 @@ read_declarations()
     }
 }
 
-output_token_type()
+void output_token_type()
 {
   bucket * bp;
   int n;
@@ -975,7 +976,7 @@ output_token_type()
   fprintf(output_file, "\n");
 }
 
-initialize_grammar()
+void initialize_grammar()
 {
     nitems = 4;
     maxitems = 300;
@@ -1006,7 +1007,7 @@ initialize_grammar()
 }
 
 
-expand_items()
+void expand_items()
 {
     maxitems += 300;
     pitem = (bucket **) REALLOC(pitem, maxitems*sizeof(bucket *));
@@ -1014,7 +1015,7 @@ expand_items()
 }
 
 
-expand_rules()
+void expand_rules()
 {
     maxrules += 100;
     plhs = (bucket **) REALLOC(plhs, maxrules*sizeof(bucket *));
@@ -1026,7 +1027,7 @@ expand_rules()
 }
 
 
-advance_to_start()
+void advance_to_start()
 {
     register int c;
     register bucket *bp;
@@ -1076,9 +1077,9 @@ advance_to_start()
 }
 
 
-start_rule(bp, s_lineno)
-register bucket *bp;
-int s_lineno;
+void start_rule(bp, s_lineno)
+        register bucket *bp;
+        int s_lineno;
 {
     if (bp->class == TERM)
 	terminal_lhs(s_lineno);
@@ -1091,7 +1092,7 @@ int s_lineno;
 }
 
 
-end_rule()
+void end_rule()
 {
     if (!last_was_action) default_action_error();
 
@@ -1103,7 +1104,7 @@ end_rule()
 }
 
 
-insert_empty_rule()
+void insert_empty_rule()
 {
     register bucket *bp, **bpp;
 
@@ -1119,7 +1120,7 @@ insert_empty_rule()
 	expand_items();
     bpp = pitem + nitems - 1;
     *bpp-- = bp;
-    while (bpp[0] = bpp[-1]) --bpp;
+    while ((bpp[0] = bpp[-1])) --bpp;
 
     if (++nrules >= maxrules)
 	expand_rules();
@@ -1132,7 +1133,7 @@ insert_empty_rule()
 }
 
 
-add_symbol()
+void add_symbol()
 {
     register int c;
     register bucket *bp;
@@ -1163,7 +1164,7 @@ add_symbol()
 }
 
 
-copy_action()
+void copy_action()
 {
     register int c;
     register int i, n;
@@ -1246,7 +1247,6 @@ loop:
     switch (c)
     {
     case '\n':
-    next_line:
 	get_line();
 	if (line) goto loop;
 	unterminated_action(a_lineno, a_line, a_cptr);
@@ -1373,7 +1373,7 @@ mark_symbol()
 }
 
 
-read_grammar()
+void read_grammar()
 {
     register int c;
 
@@ -1406,7 +1406,7 @@ read_grammar()
 }
 
 
-free_tags()
+void free_tags()
 {
     register int i;
 
@@ -1421,7 +1421,7 @@ free_tags()
 }
 
 
-pack_names()
+void pack_names()
 {
     register bucket *bp;
     register char *p, *s, *t;
@@ -1439,14 +1439,14 @@ pack_names()
     {
 	p = t;
 	s = bp->name;
-	while (*t++ = *s++) continue;
+	while ((*t++ = *s++)) continue;
 	FREE(bp->name);
 	bp->name = p;
     }
 }
 
 
-check_symbols()
+void check_symbols()
 {
     register bucket *bp;
 
@@ -1464,7 +1464,7 @@ check_symbols()
 }
 
 
-pack_symbols()
+void pack_symbols()
 {
     register bucket *bp;
     register bucket **v;
@@ -1600,7 +1600,7 @@ pack_symbols()
 }
 
 
-make_goal()
+void make_goal()
 {
   static char name[7] = "'\\xxx'";
   bucket * bp;
@@ -1646,7 +1646,7 @@ make_goal()
   }
 }
 
-pack_grammar()
+void pack_grammar()
 {
     register int i, j;
     int assoc, prec;
@@ -1705,7 +1705,7 @@ pack_grammar()
 }
 
 
-print_grammar()
+void print_grammar()
 {
     register int i, j, k;
     int spacing;
@@ -1741,7 +1741,7 @@ print_grammar()
 }
 
 
-reader()
+void reader()
 {
     create_symbol_table();
     read_declarations();