[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] minor refactoring in user code scanning
From: |
Akim Demaille |
Subject: |
[PATCH 01/10] minor refactoring in user code scanning |
Date: |
Mon, 3 Sep 2012 16:26:07 +0200 |
* src/scan-code.l (show_sub_message): New, extracted from...
(show_sub_messages): here.
---
TODO | 1 -
src/scan-code.l | 123 +++++++++++++++++++++++++++++---------------------------
2 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/TODO b/TODO
index ea878c9..c3befa2 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
* Short term
** scan-code.l
Avoid variables for format strings, as then GCC cannot check them.
-show_sub_messages should call show_sub_message.
** m4 names
b4_shared_declarations is no longer what it is. Make it
diff --git a/src/scan-code.l b/src/scan-code.l
index 8350147..0bf5dc7 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -400,79 +400,84 @@ get_at_spec(unsigned symbol_index)
}
static void
-show_sub_messages (const char* cp, bool explicit_bracketing,
- int midrule_rhs_index, char dollar_or_at,
- bool is_warning, unsigned indent)
+show_sub_message (const char* cp, bool explicit_bracketing,
+ int midrule_rhs_index, char dollar_or_at,
+ bool is_warning, unsigned indent,
+ const variant *var)
{
- unsigned i;
+ const char *at_spec = get_at_spec (var->symbol_index);
- for (i = 0; i < variant_count; ++i)
+ if (var->err == 0)
+ {
+ if (is_warning)
+ complain_at_indent (var->loc, Wother, &indent,
+ _("refers to: %c%s at %s"), dollar_or_at,
+ var->id, at_spec);
+ else
+ complain_at_indent (var->loc, complaint, &indent,
+ _("refers to: %c%s at %s"), dollar_or_at,
+ var->id, at_spec);
+ }
+ else
{
- const variant *var = &variant_table[i];
- const char *at_spec = get_at_spec (var->symbol_index);
+ static struct obstack msg_buf;
+ const char *tail = explicit_bracketing ? "" : 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;
- if (var->err == 0)
- {
- if (is_warning)
- complain_at_indent (var->loc, Wother, &indent,
- _("refers to: %c%s at %s"), dollar_or_at,
- var->id, at_spec);
- else
- complain_at_indent (var->loc, complaint, &indent,
- _("refers to: %c%s at %s"), dollar_or_at,
- var->id, at_spec);
- }
+ /* Create the explanation message. */
+ obstack_init (&msg_buf);
+
+ obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
+ if (contains_dot_or_dash (id))
+ obstack_printf (&msg_buf, "[%s]", id);
else
+ obstack_sgrow (&msg_buf, id);
+ obstack_sgrow (&msg_buf, tail);
+
+ if (var->err & VARIANT_HIDDEN)
{
- static struct obstack msg_buf;
- const char *tail = explicit_bracketing ? "" :
- 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);
-
- obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
- if (contains_dot_or_dash (id))
- obstack_printf (&msg_buf, "[%s]", id);
+ obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
+ if (contains_dot_or_dash (var->id))
+ obstack_printf (&msg_buf, "[%s]", var->id);
else
- obstack_sgrow (&msg_buf, id);
+ obstack_sgrow (&msg_buf, var->id);
obstack_sgrow (&msg_buf, tail);
+ }
- if (var->err & VARIANT_HIDDEN)
- {
- obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
- if (contains_dot_or_dash (var->id))
- obstack_printf (&msg_buf, "[%s]", var->id);
- else
- obstack_sgrow (&msg_buf, var->id);
- obstack_sgrow (&msg_buf, tail);
- }
-
- obstack_printf (&msg_buf, _(" at %s"), at_spec);
+ obstack_printf (&msg_buf, _(" at %s"), at_spec);
- if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
- {
- const char *format =
- _(", cannot be accessed from mid-rule action at $%d");
- obstack_printf (&msg_buf, format, midrule_rhs_index);
- }
-
- obstack_1grow (&msg_buf, '\0');
- if (is_warning)
- complain_at_indent (id_loc, Wother, &indent, "%s",
- (char *) obstack_finish (&msg_buf));
- else
- complain_at_indent (id_loc, complaint, &indent, "%s",
- (char *) obstack_finish (&msg_buf));
- obstack_free (&msg_buf, 0);
+ if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
+ {
+ const char *format =
+ _(", cannot be accessed from mid-rule action at $%d");
+ obstack_printf (&msg_buf, format, midrule_rhs_index);
}
+
+ obstack_1grow (&msg_buf, '\0');
+ if (is_warning)
+ complain_at_indent (id_loc, Wother, &indent, "%s",
+ (char *) obstack_finish (&msg_buf));
+ else
+ complain_at_indent (id_loc, complaint, &indent, "%s",
+ (char *) obstack_finish (&msg_buf));
+ obstack_free (&msg_buf, 0);
}
}
+static void
+show_sub_messages (const char* cp, bool explicit_bracketing,
+ int midrule_rhs_index, char dollar_or_at,
+ bool is_warning, unsigned indent)
+{
+ unsigned i;
+
+ for (i = 0; i < variant_count; ++i)
+ show_sub_message (cp, explicit_bracketing,
+ midrule_rhs_index, dollar_or_at,
+ is_warning, indent, &variant_table[i]);
+}
+
/* Returned from "parse_ref" when the reference
is inappropriate. */
#define INVALID_REF (INT_MIN)
--
1.7.11.5
- [PATCH 00/10] {master} clean up the code, Akim Demaille, 2012/09/03
- [PATCH 02/10] minor refactoring in user code scanning, Akim Demaille, 2012/09/03
- [PATCH 07/10] doc: address a fixme, Akim Demaille, 2012/09/03
- [PATCH 06/10] style changes, Akim Demaille, 2012/09/03
- [PATCH 09/10] style: remove useless C++ provisio, Akim Demaille, 2012/09/03
- [PATCH 03/10] obstacks: simplifications, Akim Demaille, 2012/09/03
- [PATCH 08/10] parser: style changes, Akim Demaille, 2012/09/03
- [PATCH 04/10] minor refactoring: shorten variable names, Akim Demaille, 2012/09/03
- [PATCH 10/10] todo: check push parsers, Akim Demaille, 2012/09/03
- [PATCH 05/10] refactoring: define variables with a value, Akim Demaille, 2012/09/03
- [PATCH 01/10] minor refactoring in user code scanning,
Akim Demaille <=