===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/yacc/error.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- src/usr.bin/yacc/error.c	2014/01/08 22:55:59	1.13
+++ src/usr.bin/yacc/error.c	2014/03/08 01:05:39	1.14
@@ -1,5 +1,5 @@
-/*	$OpenBSD: error.c,v 1.13 2014/01/08 22:55:59 millert Exp $	*/
-/*	$NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $	*/
+/*		$OpenBSD: error.c,v 1.14 2014/03/08 01:05:39 tedu Exp $		*/
+/*		$NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $		*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -41,284 +41,283 @@
 void
 fatal(char *msg)
 {
-    fprintf(stderr, "%s: %s\n", input_file_name, msg);
-    done(2);
+	fprintf(stderr, "%s: %s\n", input_file_name, msg);
+	done(2);
 }
 
 
 void
 no_space(void)
 {
-    fprintf(stderr, "%s: yacc is out of space\n", input_file_name);
-    done(2);
+	fprintf(stderr, "%s: yacc is out of space\n", input_file_name);
+	done(2);
 }
 
 
 void
 open_error(char *filename)
 {
-    fprintf(stderr, "%s: cannot open source file %s\n",
-	input_file_name, filename);
-    done(2);
+	fprintf(stderr, "%s: cannot open source file %s\n",
+	    input_file_name, filename);
+	done(2);
 }
 
 void
 open_write_error(char *filename)
 {
-    fprintf(stderr, "%s: cannot open target file %s for writing\n",
-	input_file_name, filename);
-    done(2);
+	fprintf(stderr, "%s: cannot open target file %s for writing\n",
+	    input_file_name, filename);
+	done(2);
 }
 
 void
 unexpected_EOF(void)
 {
-    fprintf(stderr, "%s:%d: unexpected end-of-file\n",
+	fprintf(stderr, "%s:%d: unexpected end-of-file\n",
 	    input_file_name, lineno);
-    done(1);
+	done(1);
 }
 
 
 void
 print_pos(char *st_line, char *st_cptr)
 {
-    char *s;
+	char *s;
 
-    if (st_line == 0) return;
-    for (s = st_line; *s != '\n'; ++s)
-    {
-	if (isprint((unsigned char)*s) || *s == '\t')
-	    putc(*s, stderr);
-	else
-	    putc('?', stderr);
-    }
-    putc('\n', stderr);
-    for (s = st_line; s < st_cptr; ++s)
-    {
-	if (*s == '\t')
-	    putc('\t', stderr);
-	else
-	    putc(' ', stderr);
-    }
-    putc('^', stderr);
-    putc('\n', stderr);
+	if (st_line == 0)
+		return;
+	for (s = st_line; *s != '\n'; ++s) {
+		if (isprint((unsigned char)*s) || *s == '\t')
+			putc(*s, stderr);
+		else
+			putc('?', stderr);
+	}
+	putc('\n', stderr);
+	for (s = st_line; s < st_cptr; ++s) {
+		if (*s == '\t')
+			putc('\t', stderr);
+		else
+			putc(' ', stderr);
+	}
+	putc('^', stderr);
+	putc('\n', stderr);
 }
 
 void
 syntax_error(int st_lineno, char *st_line, char *st_cptr)
 {
-    fprintf(stderr, "%s:%d: syntax error\n",
+	fprintf(stderr, "%s:%d: syntax error\n",
 	    input_file_name, st_lineno);
-    print_pos(st_line, st_cptr);
-    done(1);
+	print_pos(st_line, st_cptr);
+	done(1);
 }
 
 void
 unterminated_comment(int c_lineno, char *c_line, char *c_cptr)
 {
-    fprintf(stderr, "%s:%d: unmatched /*\n",
+	fprintf(stderr, "%s:%d: unmatched /*\n",
 	    input_file_name, c_lineno);
-    print_pos(c_line, c_cptr);
-    done(1);
+	print_pos(c_line, c_cptr);
+	done(1);
 }
 
 void
 unterminated_string(int s_lineno, char *s_line, char *s_cptr)
 {
-    fprintf(stderr, "%s:%d:, unterminated string\n",
+	fprintf(stderr, "%s:%d:, unterminated string\n",
 	    input_file_name, s_lineno);
-    print_pos(s_line, s_cptr);
-    done(1);
+	print_pos(s_line, s_cptr);
+	done(1);
 }
 
 void
 unterminated_text(int t_lineno, char *t_line, char *t_cptr)
 {
-    fprintf(stderr, "%s:%d: unmatched %%{\n",
+	fprintf(stderr, "%s:%d: unmatched %%{\n",
 	    input_file_name, t_lineno);
-    print_pos(t_line, t_cptr);
-    done(1);
+	print_pos(t_line, t_cptr);
+	done(1);
 }
 
 void
 unterminated_union(int u_lineno, char *u_line, char *u_cptr)
 {
-    fprintf(stderr, "%s:%d: unterminated %%union declaration\n",
+	fprintf(stderr, "%s:%d: unterminated %%union declaration\n",
 	    input_file_name, u_lineno);
-    print_pos(u_line, u_cptr);
-    done(1);
+	print_pos(u_line, u_cptr);
+	done(1);
 }
 
 void
 over_unionized(char *u_cptr)
 {
-    fprintf(stderr, "%s:%d: too many %%union declarations\n",
+	fprintf(stderr, "%s:%d: too many %%union declarations\n",
 	    input_file_name, lineno);
-    print_pos(line, u_cptr);
-    done(1);
+	print_pos(line, u_cptr);
+	done(1);
 }
 
 void
 illegal_tag(int t_lineno, char *t_line, char *t_cptr)
 {
-    fprintf(stderr, "%s:%d: illegal tag\n",
+	fprintf(stderr, "%s:%d: illegal tag\n",
 	    input_file_name, t_lineno);
-    print_pos(t_line, t_cptr);
-    done(1);
+	print_pos(t_line, t_cptr);
+	done(1);
 }
 
 
 void
 illegal_character(char *c_cptr)
 {
-    fprintf(stderr, "%s:%d: illegal character\n",
+	fprintf(stderr, "%s:%d: illegal character\n",
 	    input_file_name, lineno);
-    print_pos(line, c_cptr);
-    done(1);
+	print_pos(line, c_cptr);
+	done(1);
 }
 
 
 void
 used_reserved(char *s)
 {
-    fprintf(stderr, "%s:%d: illegal use of reserved symbol %s\n",
+	fprintf(stderr, "%s:%d: illegal use of reserved symbol %s\n",
 	    input_file_name, lineno, s);
-    done(1);
+	done(1);
 }
 
 void
 tokenized_start(char *s)
 {
-     fprintf(stderr, "%s:%d: the start symbol %s cannot be declared to be a token\n",
+	fprintf(stderr, "%s:%d: the start symbol %s cannot be declared to be a token\n",
 	    input_file_name, lineno, s);
-     done(1);
+	done(1);
 }
 
 void
 retyped_warning(char *s)
 {
-    fprintf(stderr, "%s:%d: the type of %s has been redeclared\n",
+	fprintf(stderr, "%s:%d: the type of %s has been redeclared\n",
 	    input_file_name, lineno, s);
 }
 
 void
 reprec_warning(char *s)
 {
-    fprintf(stderr, "%s:%d: the precedence of %s has been redeclared\n",
+	fprintf(stderr, "%s:%d: the precedence of %s has been redeclared\n",
 	    input_file_name, lineno, s);
 }
 
 void
 revalued_warning(char *s)
 {
-    fprintf(stderr, "%s:%d: the value of %s has been redeclared\n",
+	fprintf(stderr, "%s:%d: the value of %s has been redeclared\n",
 	    input_file_name, lineno, s);
 }
 
 void
 terminal_start(char *s)
 {
-    fprintf(stderr, "%s:%d: the start symbol %s is a token\n",
+	fprintf(stderr, "%s:%d: the start symbol %s is a token\n",
 	    input_file_name, lineno, s);
-    done(1);
+	done(1);
 }
 
 void
 restarted_warning(void)
 {
-    fprintf(stderr, "%s:%d: the start symbol has been redeclared\n",
+	fprintf(stderr, "%s:%d: the start symbol has been redeclared\n",
 	     input_file_name, lineno);
 }
 
 void
 no_grammar(void)
 {
-    fprintf(stderr, "%s:%d: no grammar has been specified\n",
+	fprintf(stderr, "%s:%d: no grammar has been specified\n",
 	    input_file_name, lineno);
-    done(1);
+	done(1);
 }
 
 void
 terminal_lhs(int s_lineno)
 {
-    fprintf(stderr, "%s:%d: a token appears on the lhs of a production\n",
+	fprintf(stderr, "%s:%d: a token appears on the lhs of a production\n",
 	    input_file_name, s_lineno);
-    done(1);
+	done(1);
 }
 
 void
 prec_redeclared(void)
 {
-    fprintf(stderr, "%s:%d: conflicting %%prec specifiers\n",
+	fprintf(stderr, "%s:%d: conflicting %%prec specifiers\n",
 	    input_file_name, lineno);
 }
 
 void
 unterminated_action(int a_lineno, char *a_line, char *a_cptr)
 {
-    fprintf(stderr, "%s:%d: unterminated action\n",
+	fprintf(stderr, "%s:%d: unterminated action\n",
 	    input_file_name, a_lineno);
-    print_pos(a_line, a_cptr);
-    done(1);
+	print_pos(a_line, a_cptr);
+	done(1);
 }
 
 void
 dollar_warning(int a_lineno, int i)
 {
-    fprintf(stderr, "%s:%d: $%d references beyond the end of the current rule\n",
+	fprintf(stderr, "%s:%d: $%d references beyond the end of the current rule\n",
 	    input_file_name, a_lineno, i);
 }
 
 void
 dollar_error(int a_lineno, char *a_line, char *a_cptr)
 {
-    fprintf(stderr, "%s:%d: illegal $-name\n",
+	fprintf(stderr, "%s:%d: illegal $-name\n",
 	    input_file_name, a_lineno);
-    print_pos(a_line, a_cptr);
-    done(1);
+	print_pos(a_line, a_cptr);
+	done(1);
 }
 
 
 void
 untyped_lhs(void)
 {
-    fprintf(stderr, "%s:%d: $$ is untyped\n",
+	fprintf(stderr, "%s:%d: $$ is untyped\n",
 	    input_file_name, lineno);
-    done(1);
+	done(1);
 }
 
 void
 untyped_rhs(int i, char *s)
 {
-    fprintf(stderr, "%s:%d: $%d (%s) is untyped\n",
+	fprintf(stderr, "%s:%d: $%d (%s) is untyped\n",
 	    input_file_name, lineno, i, s);
-    done(1);
+	done(1);
 }
 
 void
 unknown_rhs(int i)
 {
-    fprintf(stderr, "%s:%d: $%d is untyped\n",
+	fprintf(stderr, "%s:%d: $%d is untyped\n",
 	    input_file_name, lineno, i);
-    done(1);
+	done(1);
 }
 
 void
 default_action_warning(void)
 {
-    fprintf(stderr, "%s:%d: the default action assigns an undefined value to $$\n",
+	fprintf(stderr, "%s:%d: the default action assigns an undefined value to $$\n",
 	    input_file_name, lineno);
 }
 
 void
 undefined_goal(char *s)
 {
-    fprintf(stderr, "%s: the start symbol %s is undefined\n", input_file_name, s);
-    done(1);
+	fprintf(stderr, "%s: the start symbol %s is undefined\n", input_file_name, s);
+	done(1);
 }
 
 void
 undefined_symbol_warning(char *s)
 {
-    fprintf(stderr, "%s: the symbol %s is undefined\n", input_file_name, s);
+	fprintf(stderr, "%s: the symbol %s is undefined\n", input_file_name, s);
 }