Date: Sun, 7 Nov 2010 22:51:54 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r214959 - head/usr.bin/yacc Message-ID: <201011072251.oA7MpsBq090305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Sun Nov 7 22:51:54 2010 New Revision: 214959 URL: http://svn.freebsd.org/changeset/base/214959 Log: Change to ANSI-C function definitions. Modified: head/usr.bin/yacc/Makefile head/usr.bin/yacc/closure.c head/usr.bin/yacc/error.c head/usr.bin/yacc/lalr.c head/usr.bin/yacc/lr0.c head/usr.bin/yacc/main.c head/usr.bin/yacc/mkpar.c head/usr.bin/yacc/output.c head/usr.bin/yacc/reader.c head/usr.bin/yacc/skeleton.c head/usr.bin/yacc/symtab.c head/usr.bin/yacc/verbose.c head/usr.bin/yacc/warshall.c Modified: head/usr.bin/yacc/Makefile ============================================================================== --- head/usr.bin/yacc/Makefile Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/Makefile Sun Nov 7 22:51:54 2010 (r214959) @@ -9,6 +9,6 @@ MAN= yacc.1 yyfix.1 LINKS= ${BINDIR}/yacc ${BINDIR}/byacc MLINKS= yacc.1 byacc.1 -WARNS?= 2 +WARNS?= 6 .include <bsd.prog.mk> Modified: head/usr.bin/yacc/closure.c ============================================================================== --- head/usr.bin/yacc/closure.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/closure.c Sun Nov 7 22:51:54 2010 (r214959) @@ -62,7 +62,7 @@ static unsigned *EFF; static void -set_EFF() +set_EFF(void) { unsigned *row; int symbol; @@ -99,7 +99,7 @@ set_EFF() void -set_first_derives() +set_first_derives(void) { unsigned *rrow; unsigned *vrow; @@ -154,9 +154,7 @@ set_first_derives() void -closure(nucleus, n) -short *nucleus; -int n; +closure(short *nucleus, int n) { int ruleno; unsigned word; @@ -224,7 +222,7 @@ int n; void -finalize_closure() +finalize_closure(void) { FREE(itemset); FREE(ruleset); @@ -235,8 +233,7 @@ finalize_closure() #ifdef DEBUG static void -print_closure(n) -int n; +print_closure(int n) { short *isp; @@ -247,7 +244,7 @@ int n; static void -print_EFF() +print_EFF(void) { int i, j; unsigned *rowp; @@ -279,7 +276,7 @@ print_EFF() static void -print_first_derives() +print_first_derives(void) { int i; int j; Modified: head/usr.bin/yacc/error.c ============================================================================== --- head/usr.bin/yacc/error.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/error.c Sun Nov 7 22:51:54 2010 (r214959) @@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$"); static void print_pos(char *, char *); void -fatal(msg) -const char *msg; +fatal(const char *msg) { warnx("f - %s", msg); done(2); @@ -58,7 +57,7 @@ const char *msg; void -no_space() +no_space(void) { warnx("f - out of space"); done(2); @@ -66,8 +65,7 @@ no_space() void -open_error(filename) -const char *filename; +open_error(const char *filename) { warnx("f - cannot open \"%s\"", filename); done(2); @@ -75,7 +73,7 @@ const char *filename; void -unexpected_EOF() +unexpected_EOF(void) { warnx("e - line %d of \"%s\", unexpected end-of-file", lineno, input_file_name); @@ -84,9 +82,7 @@ unexpected_EOF() static void -print_pos(st_line, st_cptr) -char *st_line; -char *st_cptr; +print_pos(char *st_line, char *st_cptr) { char *s; @@ -112,10 +108,7 @@ char *st_cptr; void -syntax_error(st_lineno, st_line, st_cptr) -int st_lineno; -char *st_line; -char *st_cptr; +syntax_error(int st_lineno, char *st_line, char *st_cptr) { warnx("e - line %d of \"%s\", syntax error", st_lineno, input_file_name); @@ -125,10 +118,7 @@ char *st_cptr; void -unterminated_comment(c_lineno, c_line, c_cptr) -int c_lineno; -char *c_line; -char *c_cptr; +unterminated_comment(int c_lineno, char *c_line, char *c_cptr) { warnx("e - line %d of \"%s\", unmatched /*", c_lineno, input_file_name); @@ -138,10 +128,7 @@ char *c_cptr; void -unterminated_string(s_lineno, s_line, s_cptr) -int s_lineno; -char *s_line; -char *s_cptr; +unterminated_string(int s_lineno, char *s_line, char *s_cptr) { warnx("e - line %d of \"%s\", unterminated string", s_lineno, input_file_name); @@ -151,10 +138,7 @@ char *s_cptr; void -unterminated_text(t_lineno, t_line, t_cptr) -int t_lineno; -char *t_line; -char *t_cptr; +unterminated_text(int t_lineno, char *t_line, char *t_cptr) { warnx("e - line %d of \"%s\", unmatched %%{", t_lineno, input_file_name); @@ -164,10 +148,7 @@ char *t_cptr; void -unterminated_union(u_lineno, u_line, u_cptr) -int u_lineno; -char *u_line; -char *u_cptr; +unterminated_union(int u_lineno, char *u_line, char *u_cptr) { warnx("e - line %d of \"%s\", unterminated %%union declaration", u_lineno, input_file_name); @@ -177,8 +158,7 @@ char *u_cptr; void -over_unionized(u_cptr) -char *u_cptr; +over_unionized(char *u_cptr) { warnx("e - line %d of \"%s\", too many %%union declarations", lineno, input_file_name); @@ -188,10 +168,7 @@ char *u_cptr; void -illegal_tag(t_lineno, t_line, t_cptr) -int t_lineno; -char *t_line; -char *t_cptr; +illegal_tag(int t_lineno, char *t_line, char *t_cptr) { warnx("e - line %d of \"%s\", illegal tag", t_lineno, input_file_name); print_pos(t_line, t_cptr); @@ -200,8 +177,7 @@ char *t_cptr; void -illegal_character(c_cptr) -char *c_cptr; +illegal_character(char *c_cptr) { warnx("e - line %d of \"%s\", illegal character", lineno, input_file_name); print_pos(line, c_cptr); @@ -210,8 +186,7 @@ char *c_cptr; void -used_reserved(s) -char *s; +used_reserved(char *s) { warnx("e - line %d of \"%s\", illegal use of reserved symbol %s", lineno, input_file_name, s); @@ -220,8 +195,7 @@ char *s; void -tokenized_start(s) -char *s; +tokenized_start(char *s) { warnx("e - line %d of \"%s\", the start symbol %s cannot be \ declared to be a token", lineno, input_file_name, s); @@ -230,8 +204,7 @@ declared to be a token", lineno, input_f void -retyped_warning(s) -char *s; +retyped_warning(char *s) { warnx("w - line %d of \"%s\", the type of %s has been redeclared", lineno, input_file_name, s); @@ -239,8 +212,7 @@ char *s; void -reprec_warning(s) -char *s; +reprec_warning(char *s) { warnx("w - line %d of \"%s\", the precedence of %s has been redeclared", lineno, input_file_name, s); @@ -248,8 +220,7 @@ char *s; void -revalued_warning(s) -char *s; +revalued_warning(char *s) { warnx("w - line %d of \"%s\", the value of %s has been redeclared", lineno, input_file_name, s); @@ -257,8 +228,7 @@ char *s; void -terminal_start(s) -char *s; +terminal_start(char *s) { warnx("e - line %d of \"%s\", the start symbol %s is a token", lineno, input_file_name, s); @@ -267,7 +237,7 @@ char *s; void -restarted_warning() +restarted_warning(void) { warnx("w - line %d of \"%s\", the start symbol has been redeclared", lineno, input_file_name); @@ -275,7 +245,7 @@ restarted_warning() void -no_grammar() +no_grammar(void) { warnx("e - line %d of \"%s\", no grammar has been specified", lineno, input_file_name); @@ -284,8 +254,7 @@ no_grammar() void -terminal_lhs(s_lineno) -int s_lineno; +terminal_lhs(int s_lineno) { warnx("e - line %d of \"%s\", a token appears on the lhs of a production", s_lineno, input_file_name); @@ -294,7 +263,7 @@ int s_lineno; void -prec_redeclared() +prec_redeclared(void) { warnx("w - line %d of \"%s\", conflicting %%prec specifiers", lineno, input_file_name); @@ -302,10 +271,7 @@ prec_redeclared() void -unterminated_action(a_lineno, a_line, a_cptr) -int a_lineno; -char *a_line; -char *a_cptr; +unterminated_action(int a_lineno, char *a_line, char *a_cptr) { warnx("e - line %d of \"%s\", unterminated action", a_lineno, input_file_name); @@ -315,9 +281,7 @@ char *a_cptr; void -dollar_warning(a_lineno, i) -int a_lineno; -int i; +dollar_warning(int a_lineno, int i) { warnx("w - line %d of \"%s\", $%d references beyond the \ end of the current rule", a_lineno, input_file_name, i); @@ -325,10 +289,7 @@ end of the current rule", a_lineno, inpu void -dollar_error(a_lineno, a_line, a_cptr) -int a_lineno; -char *a_line; -char *a_cptr; +dollar_error(int a_lineno, char *a_line, char *a_cptr) { warnx("e - line %d of \"%s\", illegal $-name", a_lineno, input_file_name); print_pos(a_line, a_cptr); @@ -337,7 +298,7 @@ char *a_cptr; void -untyped_lhs() +untyped_lhs(void) { warnx("e - line %d of \"%s\", $$ is untyped", lineno, input_file_name); done(1); @@ -345,9 +306,7 @@ untyped_lhs() void -untyped_rhs(i, s) -int i; -char *s; +untyped_rhs(int i, char *s) { warnx("e - line %d of \"%s\", $%d (%s) is untyped", lineno, input_file_name, i, s); @@ -356,8 +315,7 @@ char *s; void -unknown_rhs(i) -int i; +unknown_rhs(int i) { warnx("e - line %d of \"%s\", $%d is untyped", lineno, input_file_name, i); done(1); @@ -365,7 +323,7 @@ int i; void -default_action_warning() +default_action_warning(void) { warnx("w - line %d of \"%s\", the default action assigns an \ undefined value to $$", lineno, input_file_name); @@ -373,8 +331,7 @@ undefined value to $$", lineno, input_fi void -undefined_goal(s) -char *s; +undefined_goal(char *s) { warnx("e - the start symbol %s is undefined", s); done(1); @@ -382,8 +339,7 @@ char *s; void -undefined_symbol_warning(s) -char *s; +undefined_symbol_warning(char *s) { warnx("w - the symbol %s is undefined", s); } Modified: head/usr.bin/yacc/lalr.c ============================================================================== --- head/usr.bin/yacc/lalr.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/lalr.c Sun Nov 7 22:51:54 2010 (r214959) @@ -96,7 +96,7 @@ static int top; void -lalr() +lalr(void) { tokensetsize = WORDSIZE(ntokens); @@ -116,7 +116,7 @@ lalr() static void -set_state_table() +set_state_table(void) { core *sp; @@ -128,7 +128,7 @@ set_state_table() static void -set_accessing_symbol() +set_accessing_symbol(void) { core *sp; @@ -140,7 +140,7 @@ set_accessing_symbol() static void -set_shift_table() +set_shift_table(void) { shifts *sp; @@ -152,7 +152,7 @@ set_shift_table() static void -set_reduction_table() +set_reduction_table(void) { reductions *rp; @@ -164,7 +164,7 @@ set_reduction_table() static void -set_maxrhs() +set_maxrhs(void) { short *itemp; short *item_end; @@ -193,7 +193,7 @@ set_maxrhs() static void -initialize_LA() +initialize_LA(void) { int i, j, k; reductions *rp; @@ -231,7 +231,7 @@ initialize_LA() static void -set_goto_map() +set_goto_map(void) { shifts *sp; int i; @@ -301,9 +301,7 @@ set_goto_map() /* Map_goto maps a state/symbol pair into its numeric representation. */ static int -map_goto(state, symbol) -int state; -int symbol; +map_goto(int state, int symbol) { int high; int low; @@ -330,7 +328,7 @@ int symbol; static void -initialize_F() +initialize_F(void) { int i; int j; @@ -408,7 +406,7 @@ initialize_F() static void -build_relations() +build_relations(void) { int i; int j; @@ -501,8 +499,7 @@ build_relations() static void -add_lookback_edge(stateno, ruleno, gotono) -int stateno, ruleno, gotono; +add_lookback_edge(int stateno, int ruleno, int gotono) { int i, k; int found; @@ -529,9 +526,7 @@ int stateno, ruleno, gotono; static short ** -transpose(R, n) -short **R; -int n; +transpose(short **R, int n) { short **new_R; short **temp_R; @@ -587,14 +582,14 @@ int n; static void -compute_FOLLOWS() +compute_FOLLOWS(void) { digraph(includes); } static void -compute_lookaheads() +compute_lookaheads(void) { int i, n; unsigned *fp1, *fp2, *fp3; @@ -629,8 +624,7 @@ compute_lookaheads() static void -digraph(relation) -short **relation; +digraph(short **relation) { int i; @@ -655,9 +649,7 @@ short **relation; static void -traverse(i, R) -int i; -short **R; +traverse(int i, short **R) { unsigned *fp1; unsigned *fp2; Modified: head/usr.bin/yacc/lr0.c ============================================================================== --- head/usr.bin/yacc/lr0.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/lr0.c Sun Nov 7 22:51:54 2010 (r214959) @@ -91,7 +91,7 @@ static short *kernel_items; static void -allocate_itemsets() +allocate_itemsets(void) { short *itemp; short *item_end; @@ -134,7 +134,7 @@ allocate_itemsets() static void -allocate_storage() +allocate_storage(void) { allocate_itemsets(); shiftset = NEW2(nsyms, short); @@ -144,7 +144,7 @@ allocate_storage() static void -append_states() +append_states(void) { int i; int j; @@ -174,7 +174,7 @@ append_states() static void -free_storage() +free_storage(void) { FREE(shift_symbol); FREE(redset); @@ -188,7 +188,7 @@ free_storage() static void -generate_states() +generate_states(void) { allocate_storage(); itemset = NEW2(nitems, short); @@ -216,8 +216,7 @@ generate_states() static int -get_state(symbol) -int symbol; +get_state(int symbol) { int key; short *isp1; @@ -281,7 +280,7 @@ int symbol; static void -initialize_states() +initialize_states(void) { int i; short *start_derives; @@ -309,7 +308,7 @@ initialize_states() static void -new_itemsets() +new_itemsets(void) { int i; int shiftcount; @@ -346,8 +345,7 @@ new_itemsets() static core * -new_state(symbol) -int symbol; +new_state(int symbol) { int n; core *p; @@ -387,7 +385,7 @@ int symbol; #if 0 /* show_cores is used for debugging */ -show_cores() +show_cores(void) { core *p; int i, j, k, n; @@ -422,7 +420,7 @@ show_cores() /* show_ritems is used for debugging */ -show_ritems() +show_ritems(void) { int i; @@ -432,7 +430,7 @@ show_ritems() /* show_rrhs is used for debugging */ -show_rrhs() +show_rrhs(void) { int i; @@ -443,7 +441,7 @@ show_rrhs() /* show_shifts is used for debugging */ -show_shifts() +show_shifts(void) { shifts *p; int i, j, k; @@ -463,7 +461,7 @@ show_shifts() static void -save_shifts() +save_shifts(void) { shifts *p; short *sp1; @@ -498,7 +496,7 @@ save_shifts() static void -save_reductions() +save_reductions(void) { short *isp; short *rp1; @@ -548,7 +546,7 @@ save_reductions() static void -set_derives() +set_derives(void) { int i, k; int lhs; @@ -588,7 +586,7 @@ free_derives() #ifdef DEBUG static void -print_derives() +print_derives(void) { int i; short *sp; @@ -611,7 +609,7 @@ print_derives() static void -set_nullable() +set_nullable(void) { int i, j; int empty; @@ -661,7 +659,7 @@ set_nullable() #if 0 -free_nullable() +free_nullable(void) { FREE(nullable); } @@ -669,7 +667,7 @@ free_nullable() void -lr0() +lr0(void) { set_derives(); set_nullable(); Modified: head/usr.bin/yacc/main.c ============================================================================== --- head/usr.bin/yacc/main.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/main.c Sun Nov 7 22:51:54 2010 (r214959) @@ -115,8 +115,7 @@ static void usage(void); volatile sig_atomic_t sigdie; __dead2 void -done(k) -int k; +done(int k) { if (action_file) { fclose(action_file); unlink(action_file_name); } if (text_file) { fclose(text_file); unlink(text_file_name); } @@ -127,8 +126,7 @@ int k; static void -onintr(signo) - int signo __unused; +onintr(int signo __unused) { sigdie = 1; done(1); @@ -136,7 +134,7 @@ onintr(signo) static void -set_signals() +set_signals(void) { #ifdef SIGINT if (signal(SIGINT, SIG_IGN) != SIG_IGN) @@ -154,7 +152,7 @@ set_signals() static void -usage() +usage(void) { fprintf(stderr, "%s\n%s\n", "usage: yacc [-dlrtv] [-b file_prefix] [-o output_filename]", @@ -164,9 +162,7 @@ usage() static void -getargs(argc, argv) -int argc; -char *argv[]; +getargs(int argc, char *argv[]) { int ch; @@ -221,8 +217,7 @@ char *argv[]; char * -allocate(n) -unsigned n; +allocate(unsigned n) { char *p; @@ -237,7 +232,7 @@ unsigned n; static void -create_file_names() +create_file_names(void) { int i, len; const char *tmpdir; @@ -357,7 +352,7 @@ create_file_names() static void -open_files() +open_files(void) { int fd; Modified: head/usr.bin/yacc/mkpar.c ============================================================================== --- head/usr.bin/yacc/mkpar.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/mkpar.c Sun Nov 7 22:51:54 2010 (r214959) @@ -73,7 +73,7 @@ static void unused_rules(void); void -make_parser() +make_parser(void) { int i; @@ -90,8 +90,7 @@ make_parser() static action * -parse_actions(stateno) -int stateno; +parse_actions(int stateno) { action *actions; @@ -102,8 +101,7 @@ int stateno; static action * -get_shifts(stateno) -int stateno; +get_shifts(int stateno) { action *actions, *temp; shifts *sp; @@ -137,9 +135,7 @@ int stateno; } static action * -add_reductions(stateno, actions) -int stateno; -action *actions; +add_reductions(int stateno, action *actions) { int i, j, m, n; int ruleno, tokensetsize; @@ -163,9 +159,7 @@ action *actions; static action * -add_reduce(actions, ruleno, symbol) -action *actions; -int ruleno, symbol; +add_reduce(action *actions, int ruleno, int symbol) { action *temp, *prev, *next; @@ -204,7 +198,7 @@ int ruleno, symbol; static void -find_final_state() +find_final_state(void) { int goal, i; short *tostate; @@ -222,7 +216,7 @@ find_final_state() static void -unused_rules() +unused_rules(void) { int i; action *p; @@ -256,7 +250,7 @@ unused_rules() static void -remove_conflicts() +remove_conflicts(void) { int i; int symbol; @@ -333,7 +327,7 @@ remove_conflicts() static void -total_conflicts() +total_conflicts(void) { /* Warn if s/r != expect or if any r/r */ if ((SRtotal != SRexpect) || RRtotal) @@ -352,8 +346,7 @@ total_conflicts() static int -sole_reduction(stateno) -int stateno; +sole_reduction(int stateno) { int count, ruleno; action *p; @@ -381,7 +374,7 @@ int stateno; static void -defreds() +defreds(void) { int i; @@ -391,8 +384,7 @@ defreds() } static void -free_action_row(p) -action *p; +free_action_row(action *p) { action *q; @@ -405,7 +397,7 @@ action *p; } void -free_parser() +free_parser(void) { int i; Modified: head/usr.bin/yacc/output.c ============================================================================== --- head/usr.bin/yacc/output.c Sun Nov 7 22:33:55 2010 (r214958) +++ head/usr.bin/yacc/output.c Sun Nov 7 22:51:54 2010 (r214959) @@ -95,7 +95,7 @@ static const char line_format[] = "#line void -output() +output(void) { free_itemsets(); free_shifts(); @@ -119,7 +119,7 @@ output() static void -output_prefix() +output_prefix(void) { if (symbol_prefix == NULL) symbol_prefix = "yy"; @@ -184,7 +184,7 @@ output_prefix() static void -output_rule_data() +output_rule_data(void) { int i; int j; @@ -232,7 +232,7 @@ output_rule_data() static void -output_yydefred() +output_yydefred(void) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011072251.oA7MpsBq090305>