mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-13 06:13:02 +00:00
Remove last commit at the request of Paul Eggert.
This commit is contained in:
Joel E. Denny
241
src/symtab.c
241
src/symtab.c
@@ -45,10 +45,15 @@ 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 const char *default_tagged_destructor = NULL;
|
||||
static location default_tagged_destructor_location;
|
||||
static const char *default_tagless_destructor = NULL;
|
||||
static location default_tagless_destructor_location;
|
||||
|
||||
static const char *default_tagged_printer = NULL;
|
||||
static location default_tagged_printer_location;
|
||||
static const char *default_tagless_printer = NULL;
|
||||
static location default_tagless_printer_location;
|
||||
|
||||
/*---------------------------------.
|
||||
| Create a new symbol, named TAG. |
|
||||
@@ -64,8 +69,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);
|
||||
res->destructor = NULL;
|
||||
res->printer = NULL;
|
||||
|
||||
res->number = NUMBER_UNDEFINED;
|
||||
res->prec = 0;
|
||||
@@ -94,8 +99,8 @@ semantic_type_new (uniqstr tag)
|
||||
|
||||
uniqstr_assert (tag);
|
||||
res->tag = tag;
|
||||
code_props_none_init (&res->destructor);
|
||||
code_props_none_init (&res->printer);
|
||||
res->destructor = NULL;
|
||||
res->printer = NULL;
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -109,10 +114,6 @@ semantic_type_new (uniqstr tag)
|
||||
if (s->Attr) \
|
||||
fprintf (f, " %s { %s }", #Attr, s->Attr)
|
||||
|
||||
#define SYMBOL_CODE_PRINT(Attr) \
|
||||
if (code_props_code_get (s->Attr)) \
|
||||
fprintf (f, " %s { %s }", #Attr, code_props_code_get(s->Attr))
|
||||
|
||||
void
|
||||
symbol_print (symbol *s, FILE *f)
|
||||
{
|
||||
@@ -120,15 +121,14 @@ symbol_print (symbol *s, FILE *f)
|
||||
{
|
||||
fprintf (f, "\"%s\"", s->tag);
|
||||
SYMBOL_ATTR_PRINT (type_name);
|
||||
SYMBOL_CODE_PRINT (destructor);
|
||||
SYMBOL_CODE_PRINT (printer);
|
||||
SYMBOL_ATTR_PRINT (destructor);
|
||||
SYMBOL_ATTR_PRINT (printer);
|
||||
}
|
||||
else
|
||||
fprintf (f, "<NULL>");
|
||||
}
|
||||
|
||||
#undef SYMBOL_ATTR_PRINT
|
||||
#undef SYMBOL_CODE_PRINT
|
||||
|
||||
/*------------------------------------------------------------------.
|
||||
| Complain that S's WHAT is redeclared at SECOND, and was first set |
|
||||
@@ -171,118 +171,170 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
|
||||
}
|
||||
|
||||
|
||||
/*-----------------------------------------.
|
||||
| Set the DESTRUCTOR associated with SYM. |
|
||||
`-----------------------------------------*/
|
||||
/*------------------------------------------------------------------.
|
||||
| Set the DESTRUCTOR associated with SYM. Do nothing if passed 0. |
|
||||
`------------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
symbol_destructor_set (symbol *sym, code_props destructor)
|
||||
symbol_destructor_set (symbol *sym, const char *destructor, location loc)
|
||||
{
|
||||
if (code_props_code_get (sym->destructor))
|
||||
symbol_redeclaration (sym, "%destructor",
|
||||
code_props_location_get (sym->destructor),
|
||||
code_props_location_get (destructor));
|
||||
sym->destructor = destructor;
|
||||
if (destructor)
|
||||
{
|
||||
if (sym->destructor)
|
||||
symbol_redeclaration (sym, "%destructor", sym->destructor_location,
|
||||
loc);
|
||||
sym->destructor = destructor;
|
||||
sym->destructor_location = loc;
|
||||
}
|
||||
}
|
||||
|
||||
/*------------------------------------------.
|
||||
| Set the DESTRUCTOR associated with TYPE. |
|
||||
`------------------------------------------*/
|
||||
/*-------------------------------------------------------------------.
|
||||
| Set the DESTRUCTOR associated with TYPE. Do nothing if passed 0. |
|
||||
`-------------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
semantic_type_destructor_set (semantic_type *type, code_props destructor)
|
||||
semantic_type_destructor_set (semantic_type *type, const char *destructor,
|
||||
location loc)
|
||||
{
|
||||
if (code_props_code_get (type->destructor))
|
||||
semantic_type_redeclaration (type, "%destructor",
|
||||
code_props_location_get (type->destructor),
|
||||
code_props_location_get (destructor));
|
||||
type->destructor = destructor;
|
||||
if (destructor)
|
||||
{
|
||||
if (type->destructor)
|
||||
semantic_type_redeclaration (type, "%destructor",
|
||||
type->destructor_location, loc);
|
||||
type->destructor = destructor;
|
||||
type->destructor_location = loc;
|
||||
}
|
||||
}
|
||||
|
||||
/*---------------------------------------.
|
||||
| Get the computed %destructor for SYM. |
|
||||
`---------------------------------------*/
|
||||
|
||||
code_props
|
||||
const char *
|
||||
symbol_destructor_get (symbol *sym)
|
||||
{
|
||||
/* Per-symbol %destructor. */
|
||||
if (code_props_code_get (sym->destructor))
|
||||
if (sym->destructor != NULL)
|
||||
return sym->destructor;
|
||||
|
||||
/* Per-type %destructor. */
|
||||
if (sym->type_name)
|
||||
{
|
||||
code_props destructor = semantic_type_get (sym->type_name)->destructor;
|
||||
if (code_props_code_get (destructor))
|
||||
return destructor;
|
||||
semantic_type *type = semantic_type_get (sym->type_name);
|
||||
if (type->destructor)
|
||||
return type->destructor;
|
||||
}
|
||||
|
||||
/* Apply default %destructor's only to user-defined symbols. */
|
||||
if (sym->tag[0] == '$' || sym == errtoken)
|
||||
return code_props_none;
|
||||
return NULL;
|
||||
|
||||
if (sym->type_name)
|
||||
return default_tagged_destructor;
|
||||
return default_tagless_destructor;
|
||||
}
|
||||
|
||||
/*--------------------------------------.
|
||||
| Set the PRINTER associated with SYM. |
|
||||
`--------------------------------------*/
|
||||
/*---------------------------------------------------------------.
|
||||
| Get the grammar location of the %destructor computed for SYM. |
|
||||
`---------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
symbol_printer_set (symbol *sym, code_props printer)
|
||||
location
|
||||
symbol_destructor_location_get (symbol *sym)
|
||||
{
|
||||
if (code_props_code_get (sym->printer))
|
||||
symbol_redeclaration (sym, "%printer",
|
||||
code_props_location_get (sym->printer),
|
||||
code_props_location_get (printer));
|
||||
sym->printer = printer;
|
||||
if (sym->destructor != NULL)
|
||||
return sym->destructor_location;
|
||||
if (sym->type_name)
|
||||
{
|
||||
semantic_type *type = semantic_type_get (sym->type_name);
|
||||
if (type->destructor)
|
||||
return type->destructor_location;
|
||||
return default_tagged_destructor_location;
|
||||
}
|
||||
return default_tagless_destructor_location;
|
||||
}
|
||||
|
||||
/*---------------------------------------.
|
||||
| Set the PRINTER associated with TYPE. |
|
||||
`---------------------------------------*/
|
||||
/*---------------------------------------------------------------.
|
||||
| Set the PRINTER associated with SYM. Do nothing if passed 0. |
|
||||
`---------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
semantic_type_printer_set (semantic_type *type, code_props printer)
|
||||
symbol_printer_set (symbol *sym, const char *printer, location loc)
|
||||
{
|
||||
if (code_props_code_get (type->printer))
|
||||
semantic_type_redeclaration (type, "%printer",
|
||||
code_props_location_get (type->printer),
|
||||
code_props_location_get (printer));
|
||||
type->printer = printer;
|
||||
if (printer)
|
||||
{
|
||||
if (sym->printer)
|
||||
symbol_redeclaration (sym, "%printer", sym->printer_location, loc);
|
||||
sym->printer = printer;
|
||||
sym->printer_location = loc;
|
||||
}
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------.
|
||||
| Set the PRINTER associated with TYPE. Do nothing if passed 0. |
|
||||
`----------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
semantic_type_printer_set (semantic_type *type, const char *printer,
|
||||
location loc)
|
||||
{
|
||||
if (printer)
|
||||
{
|
||||
if (type->printer)
|
||||
semantic_type_redeclaration (type, "%printer", type->printer_location,
|
||||
loc);
|
||||
type->printer = printer;
|
||||
type->printer_location = loc;
|
||||
}
|
||||
}
|
||||
|
||||
/*------------------------------------.
|
||||
| Get the computed %printer for SYM. |
|
||||
`------------------------------------*/
|
||||
|
||||
code_props
|
||||
const char *
|
||||
symbol_printer_get (symbol *sym)
|
||||
{
|
||||
/* Per-symbol %printer. */
|
||||
if (code_props_code_get (sym->printer))
|
||||
if (sym->printer != NULL)
|
||||
return sym->printer;
|
||||
|
||||
/* Per-type %printer. */
|
||||
if (sym->type_name)
|
||||
{
|
||||
code_props printer = semantic_type_get (sym->type_name)->printer;
|
||||
if (code_props_code_get (printer))
|
||||
return printer;
|
||||
semantic_type *type = semantic_type_get (sym->type_name);
|
||||
if (type->printer)
|
||||
return type->printer;
|
||||
}
|
||||
|
||||
/* Apply the default %printer only to user-defined symbols. */
|
||||
if (sym->tag[0] == '$' || sym == errtoken)
|
||||
return code_props_none;
|
||||
return NULL;
|
||||
|
||||
if (sym->type_name)
|
||||
return default_tagged_printer;
|
||||
return default_tagless_printer;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------.
|
||||
| Get the grammar location of the %printer computed for SYM. |
|
||||
`------------------------------------------------------------*/
|
||||
|
||||
location
|
||||
symbol_printer_location_get (symbol *sym)
|
||||
{
|
||||
if (sym->printer != NULL)
|
||||
return sym->printer_location;
|
||||
if (sym->type_name)
|
||||
{
|
||||
semantic_type *type = semantic_type_get (sym->type_name);
|
||||
if (type->printer)
|
||||
return type->printer_location;
|
||||
return default_tagged_printer_location;
|
||||
}
|
||||
return default_tagless_printer_location;
|
||||
}
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------.
|
||||
| Set the PRECEDENCE associated with SYM. Does nothing if invoked |
|
||||
| with UNDEF_ASSOC as ASSOC. |
|
||||
@@ -446,22 +498,22 @@ symbol_check_alias_consistency (symbol *this)
|
||||
}
|
||||
|
||||
|
||||
if (code_props_code_get (orig->destructor)
|
||||
|| code_props_code_get (alias->destructor))
|
||||
if (orig->destructor || alias->destructor)
|
||||
{
|
||||
if (code_props_code_get (orig->destructor))
|
||||
symbol_destructor_set (alias, orig->destructor);
|
||||
if (orig->destructor)
|
||||
symbol_destructor_set (alias, orig->destructor,
|
||||
orig->destructor_location);
|
||||
else
|
||||
symbol_destructor_set (orig, alias->destructor);
|
||||
symbol_destructor_set (orig, alias->destructor,
|
||||
alias->destructor_location);
|
||||
}
|
||||
|
||||
if (code_props_code_get (orig->printer)
|
||||
|| code_props_code_get (alias->printer))
|
||||
if (orig->printer || alias->printer)
|
||||
{
|
||||
if (code_props_code_get (orig->printer))
|
||||
symbol_printer_set (alias, orig->printer);
|
||||
if (orig->printer)
|
||||
symbol_printer_set (alias, orig->printer, orig->printer_location);
|
||||
else
|
||||
symbol_printer_set (orig, alias->printer);
|
||||
symbol_printer_set (orig, alias->printer, alias->printer_location);
|
||||
}
|
||||
|
||||
if (alias->prec || orig->prec)
|
||||
@@ -890,54 +942,53 @@ symbols_pack (void)
|
||||
`--------------------------------------------------*/
|
||||
|
||||
void
|
||||
default_tagged_destructor_set (code_props destructor)
|
||||
default_tagged_destructor_set (const char *destructor, location loc)
|
||||
{
|
||||
if (code_props_code_get (default_tagged_destructor))
|
||||
if (default_tagged_destructor != NULL)
|
||||
{
|
||||
complain_at (code_props_location_get (destructor),
|
||||
_("redeclaration for default tagged %%destructor"));
|
||||
complain_at (code_props_location_get (default_tagged_destructor),
|
||||
complain_at (loc, _("redeclaration for default tagged %%destructor"));
|
||||
complain_at (default_tagged_destructor_location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagged_destructor = destructor;
|
||||
default_tagged_destructor_location = loc;
|
||||
}
|
||||
|
||||
void
|
||||
default_tagless_destructor_set (code_props destructor)
|
||||
default_tagless_destructor_set (const char *destructor, location loc)
|
||||
{
|
||||
if (code_props_code_get (default_tagless_destructor))
|
||||
if (default_tagless_destructor != NULL)
|
||||
{
|
||||
complain_at (code_props_location_get (destructor),
|
||||
_("redeclaration for default tagless %%destructor"));
|
||||
complain_at (code_props_location_get (default_tagless_destructor),
|
||||
complain_at (loc, _("redeclaration for default tagless %%destructor"));
|
||||
complain_at (default_tagless_destructor_location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagless_destructor = destructor;
|
||||
default_tagless_destructor_location = loc;
|
||||
}
|
||||
|
||||
void
|
||||
default_tagged_printer_set (code_props printer)
|
||||
default_tagged_printer_set (const char *printer, location loc)
|
||||
{
|
||||
if (code_props_code_get (default_tagged_printer))
|
||||
if (default_tagged_printer != NULL)
|
||||
{
|
||||
complain_at (code_props_location_get (printer),
|
||||
_("redeclaration for default tagged %%printer"));
|
||||
complain_at (code_props_location_get (default_tagged_printer),
|
||||
complain_at (loc, _("redeclaration for default tagged %%printer"));
|
||||
complain_at (default_tagged_printer_location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagged_printer = printer;
|
||||
default_tagged_printer_location = loc;
|
||||
}
|
||||
|
||||
void
|
||||
default_tagless_printer_set (code_props printer)
|
||||
default_tagless_printer_set (const char *printer, location loc)
|
||||
{
|
||||
if (code_props_code_get (default_tagless_printer))
|
||||
if (default_tagless_printer != NULL)
|
||||
{
|
||||
complain_at (code_props_location_get (printer),
|
||||
_("redeclaration for default tagless %%printer"));
|
||||
complain_at (code_props_location_get (default_tagless_printer),
|
||||
complain_at (loc, _("redeclaration for default tagless %%printer"));
|
||||
complain_at (default_tagless_printer_location,
|
||||
_("previous declaration"));
|
||||
}
|
||||
default_tagless_printer = printer;
|
||||
default_tagless_printer_location = loc;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user