Hello Joel, I fixed errors belonging to my part of the code. There is still one remaining error: "src/scan-code.c:1759: warning: 'input' defined but not used" It's causing error in -Werror mode and the build is failed. I removed -Werror and checked that in the master branch it's only remaining issue. In branch-2.5 there are couple of warnings, for example: ../../branch-2.5/lib/subpipe.c:134: warning: cast discards qualifiers from pointer target type ../../branch-2.5/lib/hash.c:931: warning: cast discards qualifiers from pointer target type
I pushed the attached commit to master and branch-2.5 Alex On Wed, Jul 29, 2009 at 9:08 PM, Joel E. Denny <[email protected]> wrote: > I pushed this to branch-2.5 and master. > > Alex, would you please build Bison with "./configure > --enable-gcc-warnings" and fix the remaining errors? You're missing void > on a couple of function prototypes, and you're disobeying -Wshadow in many > places. The latter, at least, is part of the GNU coding standards. > Thanks. > > >From a1ed2b71faac0de1db1c0e279ee3203115ec70d8 Mon Sep 17 00:00:00 2001 > From: Joel E. Denny <[email protected]> > Date: Wed, 29 Jul 2009 13:47:02 -0400 > Subject: [PATCH] Fix a --enable-gcc-warnings problem. > > * src/scan-gram.l (SC_ESCAPED_CHARACTER): Actually use length > variable. > > diff --git a/src/scan-gram.l b/src/scan-gram.l > index 0c12cba..422eae6 100644 > --- a/src/scan-gram.l > +++ b/src/scan-gram.l > @@ -472,9 +472,9 @@ splice (\\[ \f\t\v]*\n)* > { > /* FIXME: Eventually, make these errors. */ > size_t length = strlen (last_string); > - if (strlen (last_string) < 3) > + if (length < 3) > warn_at (*loc, _("empty character literal")); > - else if (strlen (last_string) > 3) > + else if (length > 3) > warn_at (*loc, _("extra characters in character literal")); > } > if (yytext[0] == '\n') > -- > 1.5.4.3 > > -- Best regards, Alex Rozenman ([email protected]).
commit ba4184ec9152422c14be743e876b5716daf0aa80 Author: Alex Rozenman <[email protected]> Date: Fri Jul 31 22:23:23 2009 +0300 Fix --enable-gcc-warnings problems. * src/reader.c: Adjust variable names. * src/scan-code.l: Fix prototypes and adjust names. * src/named-ref.c: Remove redundant "if". diff --git a/ChangeLog b/ChangeLog index 602f1fd..0becb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-31 Alex Rozenman <[email protected]> + + Fix --enable-gcc-warnings problems. + * src/reader.c: Adjust variable names. + * src/scan-code.l: Fix prototypes and adjust names. + * src/named-ref.c: Remove redundant "if". + 2009-07-29 Joel E. Denny <[email protected]> Fix a --enable-gcc-warnings problem. diff --git a/src/named-ref.c b/src/named-ref.c index 41d9dc1..4388acb 100644 --- a/src/named-ref.c +++ b/src/named-ref.c @@ -36,7 +36,6 @@ named_ref_new (uniqstr id, location loc) void named_ref_free (named_ref *r) { - if (r) - free (r); + free (r); } diff --git a/src/reader.c b/src/reader.c index 275d7c4..3f224bf 100644 --- a/src/reader.c +++ b/src/reader.c @@ -191,19 +191,19 @@ grammar_symbol_append (symbol *sym, location loc) } static void -assign_named_ref (symbol_list *p, named_ref *named_ref) +assign_named_ref (symbol_list *p, named_ref *name) { symbol *sym = p->content.sym; - if (named_ref->id == sym->tag) + if (name->id == sym->tag) { - warn_at (named_ref->loc, + warn_at (name->loc, _("duplicated symbol name for %s ignored"), quote (sym->tag)); - named_ref_free (named_ref); + named_ref_free (name); } else - p->named_ref = named_ref; + p->named_ref = name; } @@ -220,7 +220,7 @@ static symbol_list *previous_rule_end = NULL; void grammar_current_rule_begin (symbol *lhs, location loc, - named_ref *lhs_named_ref) + named_ref *lhs_name) { symbol_list* p; @@ -229,8 +229,8 @@ grammar_current_rule_begin (symbol *lhs, location loc, previous_rule_end = grammar_end; p = grammar_symbol_append (lhs, loc); - if (lhs_named_ref) - assign_named_ref(p, lhs_named_ref); + if (lhs_name) + assign_named_ref(p, lhs_name); current_rule = grammar_end; @@ -356,7 +356,7 @@ grammar_midrule_action (void) symbol_list *midrule = symbol_list_sym_new (dummy, dummy_location); /* Remember named_ref of previous action. */ - named_ref *named_ref = current_rule->action_props.named_ref; + named_ref *action_name = current_rule->action_props.named_ref; /* Make a new rule, whose body is empty, before the current one, so that the action just read can belong to it. */ @@ -383,7 +383,8 @@ grammar_midrule_action (void) /* Insert the dummy nonterminal replacing the midrule action into the current rule. Bind it to its dedicated rule. */ - grammar_current_rule_symbol_append (dummy, dummy_location, named_ref); + grammar_current_rule_symbol_append (dummy, dummy_location, + action_name); grammar_end->midrule = midrule; midrule->midrule_parent_rule = current_rule; midrule->midrule_parent_rhs_index = symbol_list_length (current_rule->next); @@ -433,28 +434,28 @@ grammar_current_rule_merge_set (uniqstr name, location loc) void grammar_current_rule_symbol_append (symbol *sym, location loc, - named_ref *named_ref) + named_ref *name) { symbol_list *p; if (current_rule->action_props.code) grammar_midrule_action (); p = grammar_symbol_append (sym, loc); - if (named_ref) - assign_named_ref(p, named_ref); + if (name) + assign_named_ref(p, name); } /* Attach an ACTION to the current rule. */ void grammar_current_rule_action_append (const char *action, location loc, - named_ref *named_ref) + named_ref *name) { if (current_rule->action_props.code) grammar_midrule_action (); /* After all symbol declarations have been parsed, packgram invokes code_props_translate_code. */ code_props_rule_action_init (¤t_rule->action_props, action, loc, - current_rule, named_ref); + current_rule, name); } diff --git a/src/scan-code.l b/src/scan-code.l index aaaaaed..bec30b6 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -338,7 +338,7 @@ static unsigned variant_table_size = 0; static unsigned variant_count = 0; static variant * -variant_table_grow () +variant_table_grow (void) { ++variant_count; if (variant_count > variant_table_size) @@ -352,10 +352,9 @@ variant_table_grow () } static void -variant_table_free () +variant_table_free (void) { - if (variant_table) - free (variant_table); + free (variant_table); variant_table = 0; variant_table_size = variant_count = 0; } @@ -376,7 +375,7 @@ find_prefix_end (const char *prefix, char *begin, char *end) } static variant * -variant_add (uniqstr id, location loc, unsigned index, +variant_add (uniqstr id, location id_loc, unsigned symbol_index, char *cp, char *cp_end, bool exact_mode) { char *prefix_end; @@ -387,9 +386,9 @@ variant_add (uniqstr id, location loc, unsigned index, (!exact_mode && is_dot_or_dash (*prefix_end)))) { variant *r = variant_table_grow (); - r->index = index; + r->index = symbol_index; r->id = id; - r->loc = loc; + r->loc = id_loc; r->hidden_by = NULL; r->err = 0; return r; @@ -399,13 +398,13 @@ variant_add (uniqstr id, location loc, unsigned index, } static const char * -get_at_spec(unsigned index) +get_at_spec(unsigned symbol_index) { static char at_buf[20]; - if (index == 0) + if (symbol_index == 0) strcpy (at_buf, "$$"); else - snprintf (at_buf, sizeof at_buf, "$%u", index); + snprintf (at_buf, sizeof at_buf, "$%u", symbol_index); return at_buf; } @@ -422,7 +421,7 @@ get_at_spec(unsigned index) accesses. */ static long int parse_ref (char *cp, symbol_list *rule, int rule_length, - int midrule_rhs_index, char *text, location loc, + int midrule_rhs_index, char *text, location text_loc, char dollar_or_at) { symbol_list *l; @@ -442,7 +441,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, return num; else { - complain_at (loc, _("integer out of range: %s"), quote (text)); + complain_at (text_loc, _("integer out of range: %s"), + quote (text)); return INVALID_REF; } } @@ -476,23 +476,23 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, /* Add all relevant variants. */ { - unsigned index; + unsigned symbol_index; variant_count = 0; - for (index = 0, l = rule; !symbol_list_null (l); ++index, l = l->next) + for (symbol_index = 0, l = rule; !symbol_list_null (l); + ++symbol_index, l = l->next) { - variant *variant; + variant *var; if (l->content_type != SYMLIST_SYMBOL) continue; - variant = variant_add (l->content.sym->tag, l->sym_loc, index, - cp, cp_end, exact_mode); - - if (variant && l->named_ref) - variant->hidden_by = l->named_ref; + var = variant_add (l->content.sym->tag, l->sym_loc, + symbol_index, cp, cp_end, exact_mode); + if (var && l->named_ref) + var->hidden_by = l->named_ref; if (l->named_ref) - variant_add (l->named_ref->id, l->named_ref->loc, index, - cp, cp_end, exact_mode); + variant_add (l->named_ref->id, l->named_ref->loc, + symbol_index, cp, cp_end, exact_mode); } } @@ -501,77 +501,77 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, has_valid = false; for (i = 0; i < variant_count; ++i) { - variant *variant = &variant_table[i]; - unsigned index = variant->index; + variant *var = &variant_table[i]; + unsigned symbol_index = var->index; /* Check visibility from mid-rule actions. */ if (midrule_rhs_index != 0 - && (index == 0 || midrule_rhs_index < index)) + && (symbol_index == 0 || midrule_rhs_index < symbol_index)) { - variant->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE; + var->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE; has_error = true; } /* Check correct bracketing. */ - if (!exact_mode && contains_dot_or_dash (variant->id)) + if (!exact_mode && contains_dot_or_dash (var->id)) { - variant->err |= VARIANT_BAD_BRACKETING; + var->err |= VARIANT_BAD_BRACKETING; has_error = true; } /* Check using of hidden symbols. */ - if (variant->hidden_by) + if (var->hidden_by) { - variant->err |= VARIANT_HIDDEN; + var->err |= VARIANT_HIDDEN; has_error = true; } - if (!variant->err) + if (!var->err) has_valid = true; } if (variant_count == 1 && has_valid) { /* The only "good" case is here. */ - unsigned index = variant_table[0].index; - if (index == midrule_rhs_index) + unsigned symbol_index = variant_table[0].index; + if (symbol_index == midrule_rhs_index) return LHS_REF; else - return index; + return symbol_index; } /* Start complaining. */ if (variant_count == 0) - complain_at (loc, _("invalid reference: %s, symbol not found"), + complain_at (text_loc, _("invalid reference: %s, symbol not found"), quote (text)); else if (variant_count > 1 && !has_error) - complain_at (loc, _("ambiguous reference: %s"), + complain_at (text_loc, _("ambiguous reference: %s"), quote (text)); else if (variant_count > 1 && has_valid && has_error) - complain_at (loc, _("misleading reference: %s"), + complain_at (text_loc, _("misleading reference: %s"), quote (text)); else - complain_at (loc, _("invalid reference: %s"), + complain_at (text_loc, _("invalid reference: %s"), quote (text)); for (i = 0; i < variant_count; ++i) { - const variant *variant = &variant_table[i]; - const char *at_spec = get_at_spec (variant->index); + const variant *var = &variant_table[i]; + const char *at_spec = get_at_spec (var->index); - if (variant->err == 0) - complain_at (variant->loc, _(" refers to: %c%s at %s"), - dollar_or_at, variant->id, at_spec); + if (var->err == 0) + complain_at (var->loc, _(" refers to: %c%s at %s"), + dollar_or_at, var->id, at_spec); else { static struct obstack msg_buf; const char *tail = exact_mode ? "" : - cp + strlen (variant->id); - const char *id = variant->hidden_by ? variant->hidden_by->id : - variant->id; - location loc = variant->hidden_by ? variant->hidden_by->loc : - variant->loc; + cp + strlen (var->id); + const char *id = var->hidden_by ? var->hidden_by->id : + var->id; + location id_loc = var->hidden_by ? var->hidden_by->loc : + var->loc; /* Create the explanation message. */ obstack_init (&msg_buf); @@ -583,24 +583,24 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, obstack_sgrow (&msg_buf, id); obstack_sgrow (&msg_buf, tail); - if (variant->err & VARIANT_HIDDEN) + if (var->err & VARIANT_HIDDEN) { obstack_fgrow1 (&msg_buf, ", hiding %c", dollar_or_at); - if (contains_dot_or_dash (variant->id)) - obstack_fgrow1 (&msg_buf, "[%s]", variant->id); + if (contains_dot_or_dash (var->id)) + obstack_fgrow1 (&msg_buf, "[%s]", var->id); else - obstack_sgrow (&msg_buf, variant->id); + obstack_sgrow (&msg_buf, var->id); obstack_sgrow (&msg_buf, tail); } obstack_fgrow1 (&msg_buf, " at %s", at_spec); - if (variant->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) + if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) obstack_fgrow1 (&msg_buf, ", cannot be accessed from " "mid-rule action at $%d", midrule_rhs_index); obstack_1grow (&msg_buf, '\0'); - complain_at (loc, _("%s"), (char *) obstack_finish (&msg_buf)); + complain_at (id_loc, _("%s"), (char *) obstack_finish (&msg_buf)); obstack_free (&msg_buf, 0); } } @@ -836,14 +836,14 @@ code_props_symbol_action_init (code_props *self, char const *code, void code_props_rule_action_init (code_props *self, char const *code, location code_loc, symbol_list *rule, - named_ref *named_ref) + named_ref *name) { self->kind = CODE_PROPS_RULE_ACTION; self->code = code; self->location = code_loc; self->is_value_used = false; self->rule = rule; - self->named_ref = named_ref; + self->named_ref = name; } void
