Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-10 04:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style changes

Browse Source 
* src/complain.c, src/reader.c, src/reduce.c, src/main.c:
Fix indentation.
Simplify a bit.
This commit is contained in:
Victor Santet
2012-06-29 15:22:12 +02:00
committed by Akim Demaille
parent 415b88231a
commit 5ff5cf6700
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/complain.c
View File

@@ -115,10 +115,8 @@ complains (const location *loc, warnings flags, const char *message,
error_message (loc, flags, _("warning"), message, args);
}
}
else
else if (warnings_flag & flags)
{
if (! (warnings_flag & flags))
return;
set_warning_issued ();
error_message (loc, flags, _("warning"), message, args);
}

13
src/gram.c
View File

@@ -304,13 +304,14 @@ grammar_dump (FILE *out, const char *title)
void
grammar_rules_useless_report (const char *message)
{
rule_number r;
for (r = 0; r < nrules ; ++r)
if (!rules[r].useful)
{
complain_at (rules[r].location, Wother, "%s: ", message);
if (warnings_flag & Wother)
warnings w = Wother;
if (warnings_flag & w)
{
rule_number r;
for (r = 0; r < nrules ; ++r)
if (!rules[r].useful)
{
complain_at (rules[r].location, w, "%s: ", message);
rule_print (&rules[r], stderr);
fflush (stderr);
}

3
src/main.c
View File

@@ -142,8 +142,7 @@ main (int argc, char *argv[])
tables_generate ();
timevar_pop (TV_ACTIONS);
grammar_rules_useless_report
(_("rule useless in parser due to conflicts"));
grammar_rules_useless_report (_("rule useless in parser due to conflicts"));
/* Output file names. */
compute_output_file_names ();

9
src/reader.c
View File

@@ -129,10 +129,10 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
complain_at (declaration_loc, complaint,
_("result type clash on merge function %s: <%s> != <%s>"),
quote (merge_function->name), type, merge_function->type);
_("result type clash on merge function %s: <%s> != <%s>"),
quote (merge_function->name), type, merge_function->type);
complain_at (merge_function->type_declaration_location, complaint,
_("previous declaration"));
_("previous declaration"));
}
merge_function->type = uniqstr_new (type);
merge_function->type_declaration_location = declaration_loc;
@@ -319,8 +319,7 @@ grammar_rule_check (const symbol_list *r)
/* The default action, $$ = $1, `uses' both. */
&& (r->action_props.code || (n != 0 && n != 1)))
{
int warn_flag =
midrule_warning ? Wmidrule_values : Wother;
warnings warn_flag = midrule_warning ? Wmidrule_values : Wother;
if (n)
complain_at (r->location, warn_flag, _("unused value: $%d"), n);
else

12
src/reduce.c
View File

@@ -384,13 +384,13 @@ reduce_print (void)
{
if (nuseless_nonterminals > 0)
complain (Wother, ngettext ("%d nonterminal useless in grammar",
"%d nonterminals useless in grammar",
nuseless_nonterminals),
"%d nonterminals useless in grammar",
nuseless_nonterminals),
nuseless_nonterminals);
if (nuseless_productions > 0)
complain (Wother, ngettext ("%d rule useless in grammar",
"%d rules useless in grammar",
nuseless_productions),
"%d rules useless in grammar",
nuseless_productions),
nuseless_productions);
}
@@ -432,8 +432,8 @@ reduce_grammar (void)
{
grammar_dump (stderr, "Reduced Grammar");
fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals\
, and %d productions.\n",
fprintf (stderr, "reduced %s defines %d terminals, %d nonterminals"
", and %d productions.\n",
grammar_file, ntokens, nvars, nrules);
}
}