[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] style changes
From: |
Akim Demaille |
Subject: |
[PATCH 1/4] style changes |
Date: |
Fri, 29 Jun 2012 16:41:24 +0200 |
From: Victor Santet <address@hidden>
* src/complain.c, src/reader.c, src/reduce.c, src/main.c:
Fix indentation.
Simplify a bit.
---
src/complain.c | 4 +---
src/gram.c | 13 +++++++------
src/main.c | 3 +--
src/reader.c | 9 ++++-----
src/reduce.c | 12 ++++++------
5 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/complain.c b/src/complain.c
index 933b402..a84718b 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -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);
}
diff --git a/src/gram.c b/src/gram.c
index 810311f..59e579c 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -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);
}
diff --git a/src/main.c b/src/main.c
index 1108135..093e9cb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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 ();
diff --git a/src/reader.c b/src/reader.c
index 53b21ef..52c0b13 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -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
diff --git a/src/reduce.c b/src/reduce.c
index 5a60e0a..be7f421 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -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);
}
}
--
1.7.11.1
Re: [PATCH 0/5] Warnings categories, Akim Demaille, 2012/06/29