mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-14 14:53:03 +00:00
maint: factor the handling of %printer and %destructor
There is too much code duplication between %printer and %destructor. We used to have two functions for each action: the first one for destructors, the second one for printers. Factor using a 'code_props_type', and an array of code_props instead of two members. * src/symlist.h, src/symlist.c (symbol_list_destructor_set) (symbol_list_printer_set): Fuse into... (symbol_list_code_props_set): this. * src/symtab.h, src/symtab.c (default_tagged_destructor) (default_tagged_printer): Fuse into... (default_tagged_code_props): this. (default_tagless_destructor, default_tagless_printer) (default_tagless_code_props): Likewise. (code_props_type_string): new. (symbol_destructor_set, symbol_destructor_get, semantic_type_destructor_set) (default_tagged_destructor_set, default_tagless_destructor_set) (symbol_printer_set, symbol_printer_get, semantic_type_printer_set) (default_tagged_printer_set, default_tagless_printer_set): Replace by... (symbol_code_props_set, symbol_code_props_get, semantic_type_code_props_set) (default_tagged_code_props_set, default_tagless_code_props_set): these. * src/parse-gram.y (grammar_declaration): Adjust. * src/output.c (CODE_PROP, grammar_declaration): Ditto. * src/reader.c (symbol_should_be_used): Ditto.
This commit is contained in:
Victor Santet
committed by
Akim Demaille
Akim Demaille
parent
dfe292c695
commit
71da68b366
240
src/symtab.c
240
src/symtab.c
@@ -49,10 +49,16 @@ location startsymbol_location;
|
||||
| Default %destructor's and %printer's. |
|
||||
`---------------------------------------*/
|
||||
|
||||
static code_props default_tagged_destructor = CODE_PROPS_NONE_INIT;
|
||||
static code_props default_tagless_destructor = CODE_PROPS_NONE_INIT;
|
||||
static code_props default_tagged_printer = CODE_PROPS_NONE_INIT;
|
||||
static code_props default_tagless_printer = CODE_PROPS_NONE_INIT;
|
||||
static code_props default_tagged_code_props[CODE_PROPS_SIZE] =
|
||||
{
|
||||
CODE_PROPS_NONE_INIT,
|
||||
CODE_PROPS_NONE_INIT,
|
||||
};
|
||||
static code_props default_tagless_code_props[CODE_PROPS_SIZE] =
|
||||
{
|
||||
CODE_PROPS_NONE_INIT,
|
||||
CODE_PROPS_NONE_INIT,
|
||||
};
|
||||
|
||||
/*---------------------------------.
|
||||
| Create a new symbol, named TAG. |
|
||||
@@ -75,8 +81,8 @@ symbol_new (uniqstr tag, location loc)
|
||||
res->location = loc;
|
||||
|
||||
res->type_name = NULL;
|
||||
code_props_none_init (&res->destructor);
|
||||
code_props_none_init (&res->printer);
|
||||
for (int i = 0; i < CODE_PROPS_SIZE; ++i)
|
||||
code_props_none_init (&res->props[i]);
|
||||
|
||||
res->number = NUMBER_UNDEFINED;
|
||||
res->prec = 0;
|
||||
@@ -94,6 +100,23 @@ symbol_new (uniqstr tag, location loc)
|
||||
return res;
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------.
|
||||
| Name of the code_props type: %destructor or %printer. |
|
||||
`-------------------------------------------------------*/
|
||||
|
||||
static char const *
|
||||
code_props_type_string (code_props_type kind)
|
||||
{
|
||||
switch (kind)
|
||||
{
|
||||
case destructor:
|
||||
return "%destructor";
|
||||
case printer:
|
||||
return "%printer";
|
||||
}
|
||||
assert (0);
|
||||
}
|
||||
|
||||
/*----------------------------------------.
|
||||
| Create a new semantic type, named TAG. |
|
||||
`----------------------------------------*/
|
||||
@@ -105,8 +128,8 @@ semantic_type_new (uniqstr tag)
|
||||
|
||||
uniqstr_assert (tag);
|
||||
res->tag = tag;
|
||||
code_props_none_init (&res->destructor);
|
||||
code_props_none_init (&res->printer);
|
||||
for (int i = 0; i < CODE_PROPS_SIZE; ++i)
|
||||
code_props_none_init (&res->props[i]);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -120,9 +143,9 @@ semantic_type_new (uniqstr tag)
|
||||
if (s->Attr) \
|
||||
fprintf (f, " %s { %s }", #Attr, s->Attr)
|
||||
|
||||
#define SYMBOL_CODE_PRINT(Attr) \
|
||||
if (s->Attr.code) \
|
||||
fprintf (f, " %s { %s }", #Attr, s->Attr.code)
|
||||
#define SYMBOL_CODE_PRINT(Attr) \
|
||||
if (s->props[Attr].code) \
|
||||
fprintf (f, " %s { %s }", #Attr, s->props[Attr].code)
|
||||
|
||||
void
|
||||
symbol_print (symbol *s, FILE *f)
|
||||
@@ -217,115 +240,65 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
|
||||
}
|
||||
}
|
||||
|
||||
/*-----------------------------------------.
|
||||
| Set the DESTRUCTOR associated with SYM. |
|
||||
`-----------------------------------------*/
|
||||
/*--------------------------------------------------------.
|
||||
| Set the DESTRUCTOR or PRINTER associated with the SYM. |
|
||||
`--------------------------------------------------------*/
|
||||
|
||||
void
|
||||
symbol_destructor_set (symbol *sym, code_props const *destructor)
|
||||
symbol_code_props_set (symbol *sym, code_props_type kind,
|
||||
code_props const *code)
|
||||
{
|
||||
if (sym->destructor.code)
|
||||
symbol_redeclaration (sym, "%destructor", sym->destructor.location,
|
||||
destructor->location);
|
||||
sym->destructor = *destructor;
|
||||
if (sym->props[kind].code)
|
||||
symbol_redeclaration (sym, code_props_type_string (kind),
|
||||
sym->props[kind].location,
|
||||
code->location);
|
||||
sym->props[kind] = *code;
|
||||
}
|
||||
|
||||
/*------------------------------------------.
|
||||
| Set the DESTRUCTOR associated with TYPE. |
|
||||
`------------------------------------------*/
|
||||
/*-----------------------------------------------------.
|
||||
| Set the DESTRUCTOR or PRINTER associated with TYPE. |
|
||||
`-----------------------------------------------------*/
|
||||
|
||||
void
|
||||
semantic_type_destructor_set (semantic_type *type,
|
||||
code_props const *destructor)
|
||||
semantic_type_code_props_set (semantic_type *type,
|
||||
code_props_type kind,
|
||||
code_props const *code)
|
||||
{
|
||||
if (type->destructor.code)
|
||||
semantic_type_redeclaration (type, "%destructor",
|
||||
type->destructor.location,
|
||||
destructor->location);
|
||||
type->destructor = *destructor;
|
||||
if (type->props[kind].code)
|
||||
semantic_type_redeclaration (type, code_props_type_string (kind),
|
||||
type->props[kind].location,
|
||||
code->location);
|
||||
type->props[kind] = *code;
|
||||
}
|
||||
|
||||
/*---------------------------------------.
|
||||
| Get the computed %destructor for SYM. |
|
||||
`---------------------------------------*/
|
||||
/*---------------------------------------------------.
|
||||
| Get the computed %destructor or %printer for SYM. |
|
||||
`---------------------------------------------------*/
|
||||
|
||||
code_props const *
|
||||
symbol_destructor_get (symbol const *sym)
|
||||
symbol_code_props_get (symbol const *sym,
|
||||
code_props_type kind)
|
||||
{
|
||||
/* Per-symbol %destructor. */
|
||||
if (sym->destructor.code)
|
||||
return &sym->destructor;
|
||||
/* Per-symbol code props. */
|
||||
if (sym->props[kind].code)
|
||||
return &sym->props[kind];
|
||||
|
||||
/* Per-type %destructor. */
|
||||
/* Per-type code props. */
|
||||
if (sym->type_name)
|
||||
{
|
||||
code_props const *destructor =
|
||||
&semantic_type_get (sym->type_name)->destructor;
|
||||
if (destructor->code)
|
||||
return destructor;
|
||||
code_props const *code =
|
||||
&semantic_type_get (sym->type_name)->props[kind];
|
||||
if (code->code)
|
||||
return code;
|
||||
}
|
||||
|
||||
/* Apply default %destructor's only to user-defined symbols. */
|
||||
/* Apply default code props's only to user-defined symbols. */
|
||||
if (sym->tag[0] == '$' || sym == errtoken)
|
||||
return &code_props_none;
|
||||
|
||||
if (sym->type_name)
|
||||
return &default_tagged_destructor;
|
||||
return &default_tagless_destructor;
|
||||
}
|
||||
|
||||
/*--------------------------------------.
|
||||
| Set the PRINTER associated with SYM. |
|
||||
`--------------------------------------*/
|
||||
|
||||
void
|
||||
symbol_printer_set (symbol *sym, code_props const *printer)
|
||||
{
|
||||
if (sym->printer.code)
|
||||
symbol_redeclaration (sym, "%printer",
|
||||
sym->printer.location, printer->location);
|
||||
sym->printer = *printer;
|
||||
}
|
||||
|
||||
/*---------------------------------------.
|
||||
| Set the PRINTER associated with TYPE. |
|
||||
`---------------------------------------*/
|
||||
|
||||
void
|
||||
semantic_type_printer_set (semantic_type *type, code_props const *printer)
|
||||
{
|
||||
if (type->printer.code)
|
||||
semantic_type_redeclaration (type, "%printer",
|
||||
type->printer.location, printer->location);
|
||||
type->printer = *printer;
|
||||
}
|
||||
|
||||
/*------------------------------------.
|
||||
| Get the computed %printer for SYM. |
|
||||
`------------------------------------*/
|
||||
|
||||
code_props const *
|
||||
symbol_printer_get (symbol const *sym)
|
||||
{
|
||||
/* Per-symbol %printer. */
|
||||
if (sym->printer.code)
|
||||
return &sym->printer;
|
||||
|
||||
/* Per-type %printer. */
|
||||
if (sym->type_name)
|
||||
{
|
||||
code_props const *printer = &semantic_type_get (sym->type_name)->printer;
|
||||
if (printer->code)
|
||||
return printer;
|
||||
}
|
||||
|
||||
/* Apply the default %printer only to user-defined symbols. */
|
||||
if (sym->tag[0] == '$' || sym == errtoken)
|
||||
return &code_props_none;
|
||||
|
||||
if (sym->type_name)
|
||||
return &default_tagged_printer;
|
||||
return &default_tagless_printer;
|
||||
return &default_tagged_code_props[kind];
|
||||
return &default_tagless_code_props[kind];
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------.
|
||||
@@ -504,21 +477,11 @@ symbol_check_alias_consistency (symbol *this)
|
||||
}
|
||||
|
||||
|
||||
if (str->destructor.code || sym->destructor.code)
|
||||
{
|
||||
if (str->destructor.code)
|
||||
symbol_destructor_set (sym, &str->destructor);
|
||||
else
|
||||
symbol_destructor_set (str, &sym->destructor);
|
||||
}
|
||||
|
||||
if (str->printer.code || sym->printer.code)
|
||||
{
|
||||
if (str->printer.code)
|
||||
symbol_printer_set (sym, &str->printer);
|
||||
else
|
||||
symbol_printer_set (str, &sym->printer);
|
||||
}
|
||||
for (int i = 0; i < CODE_PROPS_SIZE; ++i)
|
||||
if (str->props[i].code)
|
||||
symbol_code_props_set (sym, i, &str->props[i]);
|
||||
else if (sym->props[i].code)
|
||||
symbol_code_props_set (str, i, &sym->props[i]);
|
||||
|
||||
if (sym->prec || str->prec)
|
||||
{
|
||||
@@ -974,53 +937,30 @@ symbols_pack (void)
|
||||
`--------------------------------------------------*/
|
||||
|
||||
void
|
||||
default_tagged_destructor_set (code_props const *destructor)
|
||||
default_tagged_code_props_set (code_props_type kind, code_props const *code)
|
||||
{
|
||||
if (default_tagged_destructor.code)
|
||||
if (default_tagged_code_props[kind].code)
|
||||
{
|
||||
complain_at (destructor->location,
|
||||
_("redeclaration for default tagged %%destructor"));
|
||||
complain_at (default_tagged_destructor.location,
|
||||
complain_at (code->location,
|
||||
_("redeclaration for default tagged %s"),
|
||||
code_props_type_string (kind));
|
||||
complain_at (default_tagged_code_props[kind].location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagged_destructor = *destructor;
|
||||
default_tagged_code_props[kind] = *code;
|
||||
}
|
||||
|
||||
void
|
||||
default_tagless_destructor_set (code_props const *destructor)
|
||||
default_tagless_code_props_set (code_props_type kind, code_props const *code)
|
||||
{
|
||||
if (default_tagless_destructor.code)
|
||||
if (default_tagless_code_props[kind].code)
|
||||
{
|
||||
complain_at (destructor->location,
|
||||
_("redeclaration for default tagless %%destructor"));
|
||||
complain_at (default_tagless_destructor.location,
|
||||
complain_at (code->location,
|
||||
_("redeclaration for default tagless %s"),
|
||||
code_props_type_string (kind));
|
||||
complain_at (default_tagless_code_props[kind].location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagless_destructor = *destructor;
|
||||
default_tagless_code_props[kind] = *code;
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
}
|
||||
default_tagged_printer = *printer;
|
||||
}
|
||||
|
||||
void
|
||||
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"));
|
||||
}
|
||||
default_tagless_printer = *printer;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user