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

errors: indent "symbol redeclaration" context

Browse Source 
This is the continuation of the work on the readability of errors
context.

For example, what used to be:
  input.y:5.10-24: %printer redeclaration for <field2>
  input.y:3.11-25: previous declaration

is now:
  input.y:5.10-24: %printer redeclaration for <field2>
  input.y:3.11-25:     previous declaration

* NEWS: Document this change.
* src/symtab.c (symbol_redeclaration, semantic_type_redeclaration,
user_token_number_redeclaration, default_tagged_destructor_set,
default_tagless_destructor_set, default_tagged_printer_set,
default_tagless_printer_set): Use complain_at_indent to
output with increased indentation level.
* tests/input.at: Apply this change.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-09-26 11:49:19 +02:00
committed by Akim Demaille
parent 24d96dd3eb
commit cbaea0106d
3 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/symtab.c
View File

@@ -150,16 +150,20 @@ static void
symbol_redeclaration (symbol *s, const char *what, location first,
location second)
{
complain_at (second, _("%s redeclaration for %s"), what, s->tag);
complain_at (first, _("previous declaration"));
unsigned i = 0;
complain_at_indent (second, &i, _("%s redeclaration for %s"), what, s->tag);
i += SUB_INDENT;
complain_at_indent (first, &i, _("previous declaration"));
}
static void
semantic_type_redeclaration (semantic_type *s, const char *what, location first,
location second)
{
complain_at (second, _("%s redeclaration for <%s>"), what, s->tag);
complain_at (first, _("previous declaration"));
unsigned i = 0;
complain_at_indent (second, &i, _("%s redeclaration for <%s>"), what, s->tag);
i += SUB_INDENT;
complain_at_indent (first, &i, _("previous declaration"));
}
@@ -515,6 +519,7 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
static void
user_token_number_redeclaration (int num, symbol *first, symbol *second)
{
unsigned i = 0;
/* User token numbers are not assigned during the parsing, but in a
second step, via a traversal of the symbol table sorted on tag.
@@ -526,11 +531,12 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
first = second;
second = tmp;
}
complain_at (second->location,
_("user token number %d redeclaration for %s"),
num, second->tag);
complain_at (first->location, _("previous declaration for %s"),
first->tag);
complain_at_indent (second->location, &i,
_("user token number %d redeclaration for %s"),
num, second->tag);
complain_at_indent (first->location, &i,
_("previous declaration for %s"),
first->tag);
}
/*--------------------------------------------------.
@@ -923,10 +929,12 @@ default_tagged_destructor_set (code_props const *destructor)
{
if (default_tagged_destructor.code)
{
complain_at (destructor->location,
_("redeclaration for default tagged %%destructor"));
complain_at (default_tagged_destructor.location,
_("previous declaration"));
unsigned i = 0;
complain_at_indent (destructor->location, &i,
_("redeclaration for default tagged %%destructor"));
i += SUB_INDENT;
complain_at_indent (default_tagged_destructor.location, &i,
_("previous declaration"));
}
default_tagged_destructor = *destructor;
}
@@ -936,10 +944,12 @@ default_tagless_destructor_set (code_props const *destructor)
{
if (default_tagless_destructor.code)
{
complain_at (destructor->location,
_("redeclaration for default tagless %%destructor"));
complain_at (default_tagless_destructor.location,
_("previous declaration"));
unsigned i = 0;
complain_at_indent (destructor->location, &i,
_("redeclaration for default tagless %%destructor"));
i += SUB_INDENT;
complain_at_indent (default_tagless_destructor.location, &i,
_("previous declaration"));
}
default_tagless_destructor = *destructor;
}
@@ -949,10 +959,12 @@ default_tagged_printer_set (code_props const *printer)
{
if (default_tagged_printer.code)
{
complain_at (printer->location,
_("redeclaration for default tagged %%printer"));
complain_at (default_tagged_printer.location,
_("previous declaration"));
unsigned i = 0;
complain_at_indent (printer->location, &i,
_("redeclaration for default tagged %%printer"));
i += SUB_INDENT;
complain_at_indent (default_tagged_printer.location, &i,
_("previous declaration"));
}
default_tagged_printer = *printer;
}
@@ -962,10 +974,12 @@ default_tagless_printer_set (code_props const *printer)
{
if (default_tagless_printer.code)
{
complain_at (printer->location,
_("redeclaration for default tagless %%printer"));
complain_at (default_tagless_printer.location,
_("previous declaration"));
unsigned i = 0;
complain_at_indent (printer->location, &i,
_("redeclaration for default tagless %%printer"));
i += SUB_INDENT;
complain_at_indent (default_tagless_printer.location, &i,
_("previous declaration"));
}
default_tagless_printer = *printer;
}