From 0c8e079fa62ba9bbae1b6766e1082b482d7dab07 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Wed, 7 Jun 2006 20:06:27 +0000 Subject: [PATCH] Get Bison to build again when configured with --enable-gcc-warnings. * src/location.c, src/location.h, src/main.c, src/scan-code.l: Add some missing #include's. * src/scan-code.l (handle_action_dollar, handle_action_at): Rename loc argument as it shadows a global. * src/scan-gram.l: Remove stray comma that prevents boundary_set invocation. * src/.cvsignore: Add scan-code.c. --- ChangeLog | 12 ++++++++++++ src/.cvsignore | 1 + src/location.c | 2 ++ src/location.h | 1 + src/main.c | 1 + src/scan-code.l | 22 ++++++++++++---------- src/scan-gram.l | 2 +- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59345570..a90a8a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-06-07 Joel E. Denny + + Get Bison to build again when configured with --enable-gcc-warnings. + * src/location.c, src/location.h, src/main.c, src/scan-code.l: Add some + missing #include's. + * src/scan-code.l (handle_action_dollar, handle_action_at): Rename + loc argument as it shadows a global. + * src/scan-gram.l: Remove stray comma that prevents boundary_set + invocation. + + * src/.cvsignore: Add scan-code.c. + 2006-06-07 Akim Demaille * src/scan-gram.l: Move the "add a trailing ; to actions" code diff --git a/src/.cvsignore b/src/.cvsignore index 2fa6d0ea..3592ff01 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -6,6 +6,7 @@ Makefile Makefile.in bison revision.c +scan-code.c scan-gram.c scan-skel.c yacc diff --git a/src/location.c b/src/location.c index 2213f810..4773163f 100644 --- a/src/location.c +++ b/src/location.c @@ -21,8 +21,10 @@ #include #include "system.h" +#include #include +#include "complain.h" #include "location.h" location const empty_location; diff --git a/src/location.h b/src/location.h index 542c6320..150b842f 100644 --- a/src/location.h +++ b/src/location.h @@ -21,6 +21,7 @@ #ifndef LOCATION_H_ # define LOCATION_H_ +# include # include "uniqstr.h" /* A boundary between two characters. */ diff --git a/src/main.c b/src/main.c index 4d7fd331..acf139d2 100644 --- a/src/main.c +++ b/src/main.c @@ -43,6 +43,7 @@ #include "print_graph.h" #include "reader.h" #include "reduce.h" +#include "scan-gram.h" #include "symtab.h" #include "tables.h" #include "uniqstr.h" diff --git a/src/scan-code.l b/src/scan-code.l index a24eecec..2d128bfc 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -30,6 +30,7 @@ #define code_wrap() 1 #define FLEX_PREFIX(Id) code_ ## Id +#include "complain.h" #include "flex-scanner.h" #include "reader.h" #include "getargs.h" @@ -46,8 +47,8 @@ YY_DECL; #define YY_USER_ACTION location_compute (loc, &loc->end, yytext, yyleng); -static void handle_action_dollar (char *cp, location loc); -static void handle_action_at (char *cp, location loc); +static void handle_action_dollar (char *cp, location dollar_loc); +static void handle_action_at (char *cp, location at_loc); static location the_location; static location *loc = &the_location; @@ -234,7 +235,7 @@ int max_left_semantic_context = 0; `------------------------------------------------------------------*/ static void -handle_action_dollar (char *text, location loc) +handle_action_dollar (char *text, location dollar_loc) { const char *type_name = NULL; char *cp = text + 1; @@ -253,9 +254,9 @@ handle_action_dollar (char *text, location loc) if (*cp == '$') { if (!type_name) - type_name = symbol_list_n_type_name_get (current_rule, loc, 0); + type_name = symbol_list_n_type_name_get (current_rule, dollar_loc, 0); if (!type_name && typed) - complain_at (loc, _("$$ of `%s' has no declared type"), + complain_at (dollar_loc, _("$$ of `%s' has no declared type"), current_rule->sym->tag); if (!type_name) type_name = ""; @@ -274,9 +275,10 @@ handle_action_dollar (char *text, location loc) if (1-n > max_left_semantic_context) max_left_semantic_context = 1-n; if (!type_name && n > 0) - type_name = symbol_list_n_type_name_get (current_rule, loc, n); + type_name = + symbol_list_n_type_name_get (current_rule, dollar_loc, n); if (!type_name && typed) - complain_at (loc, _("$%d of `%s' has no declared type"), + complain_at (dollar_loc, _("$%d of `%s' has no declared type"), n, current_rule->sym->tag); if (!type_name) type_name = ""; @@ -286,7 +288,7 @@ handle_action_dollar (char *text, location loc) symbol_list_n_used_set (current_rule, n, true); } else - complain_at (loc, _("integer out of range: %s"), quote (text)); + complain_at (dollar_loc, _("integer out of range: %s"), quote (text)); } } @@ -297,7 +299,7 @@ handle_action_dollar (char *text, location loc) `------------------------------------------------------*/ static void -handle_action_at (char *text, location loc) +handle_action_at (char *text, location at_loc) { char *cp = text + 1; int rule_length = symbol_list_length (current_rule->next); @@ -318,7 +320,7 @@ handle_action_at (char *text, location loc) rule_length, n); } else - complain_at (loc, _("integer out of range: %s"), quote (text)); + complain_at (at_loc, _("integer out of range: %s"), quote (text)); } } diff --git a/src/scan-gram.l b/src/scan-gram.l index dbe40b9c..36673c46 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -751,7 +751,7 @@ handle_syncline (char *args, location loc) lineno = INT_MAX; } current_file = uniqstr_new (file); - boundary_set, (&scanner_cursor, current_file, lineno, 1); + boundary_set (&scanner_cursor, current_file, lineno, 1); } -- 2.47.2