mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 23:33:03 +00:00
Enable declaration of default %printer/%destructor. Make the parser
use these for all user-declared grammar symbols for which the user does not declare a specific %printer/%destructor. Thus, the parser uses it for token 0 if the user declares it but not if Bison generates it as $end. Discussed starting at <http://lists.gnu.org/archive/html/bison-patches/2006-02/msg00064.html>, <http://lists.gnu.org/archive/html/bison-patches/2006-06/msg00091.html>, and <http://lists.gnu.org/archive/html/bison-patches/2006-07/msg00019.html>. * NEWS (2.3+): Mention. * doc/bison.texinfo (Actions in Mid-Rule): It's no longer impossible to declare a %destructor for a mid-rule's semantic value. It's just impossible to declare one specific to it. (Freeing Discarded Symbols): Mention that @$ can be used in %destructor code. Describe default %destructor form. * src/parse-gram.y (grammar_declaration): Parse default %printer/%destructor declarations. * src/output.c (symbol_destructors_output): Use symbol_destructor_get and symbol_destructor_location_get rather than accessing the destructor and destructor_location members of struct symbol. (symbol_printers_output): Likewise but for %printer's. * src/reader.c (symbol_should_be_used): Likewise but for %destructor's again. * src/symtab.c (default_destructor, default_destructor_location, default_printer, default_printer_location): New static global variables to record the default %destructor and %printer. (symbol_destructor_get, symbol_destructor_location_get, symbol_printer_get, symbol_printer_location_get): New functions to compute the appropriate %destructor and %printer for a symbol. (default_destructor_set, default_printer_set): New functions to set the default %destructor and %printer. * src/symtab.h: Prototype all those new functions. * tests/actions.at (Default %printer and %destructor): New test to check that the right %printer and %destructor are called, that they're not called for $end, and that $$ and @$ work correctly. (Default %printer and %destructor for user-declared end token): New test to check that the default %printer and %destructor are called for a user-declared end token. * tests/input.at (Default %printer and %destructor redeclared, Unused values with default %destructor): New tests to check related grammar warnings and errors.
This commit is contained in:
93
src/symtab.c
93
src/symtab.c
@@ -41,6 +41,15 @@ symbol *accept = NULL;
|
||||
symbol *startsymbol = NULL;
|
||||
location startsymbol_location;
|
||||
|
||||
/*-----------------------------------.
|
||||
| Default %destructor and %printer. |
|
||||
`-----------------------------------*/
|
||||
|
||||
static const char *default_destructor = NULL;
|
||||
static location default_destructor_location;
|
||||
static const char *default_printer = NULL;
|
||||
static location default_printer_location;
|
||||
|
||||
/*---------------------------------.
|
||||
| Create a new symbol, named TAG. |
|
||||
`---------------------------------*/
|
||||
@@ -147,6 +156,33 @@ symbol_destructor_set (symbol *sym, const char *destructor, location loc)
|
||||
}
|
||||
}
|
||||
|
||||
/*---------------------------------------.
|
||||
| Get the computed %destructor for SYM. |
|
||||
`---------------------------------------*/
|
||||
|
||||
const char *
|
||||
symbol_destructor_get (symbol *sym)
|
||||
{
|
||||
/* Token 0 cannot have a %destructor unless the user renames it. */
|
||||
if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
|
||||
return NULL;
|
||||
|
||||
if (sym->destructor != NULL)
|
||||
return sym->destructor;
|
||||
return default_destructor;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------.
|
||||
| Get the grammar location of the %destructor computed for SYM. |
|
||||
`---------------------------------------------------------------*/
|
||||
|
||||
location
|
||||
symbol_destructor_location_get (symbol *sym)
|
||||
{
|
||||
if (sym->destructor != NULL)
|
||||
return sym->destructor_location;
|
||||
return default_destructor_location;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------.
|
||||
| Set the PRINTER associated with SYM. Do nothing if passed 0. |
|
||||
@@ -164,6 +200,34 @@ symbol_printer_set (symbol *sym, const char *printer, location loc)
|
||||
}
|
||||
}
|
||||
|
||||
/*------------------------------------.
|
||||
| Get the computed %printer for SYM. |
|
||||
`------------------------------------*/
|
||||
|
||||
const char *
|
||||
symbol_printer_get (symbol *sym)
|
||||
{
|
||||
/* Token 0 cannot have a %printer unless the user renames it. */
|
||||
if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
|
||||
return NULL;
|
||||
|
||||
if (sym->printer != NULL)
|
||||
return sym->printer;
|
||||
return default_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;
|
||||
return default_printer_location;
|
||||
}
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------.
|
||||
| Set the PRECEDENCE associated with SYM. Does nothing if invoked |
|
||||
@@ -666,3 +730,32 @@ symbols_pack (void)
|
||||
_("the start symbol %s is a token"),
|
||||
startsymbol->tag);
|
||||
}
|
||||
|
||||
|
||||
/*-----------------------------------.
|
||||
| Set default %destructor/%printer. |
|
||||
`-----------------------------------*/
|
||||
|
||||
void
|
||||
default_destructor_set (const char *destructor, location loc)
|
||||
{
|
||||
if (default_destructor != NULL)
|
||||
{
|
||||
complain_at (loc, _("redeclaration for default %%destructor"));
|
||||
complain_at (default_destructor_location, _("previous declaration"));
|
||||
}
|
||||
default_destructor = destructor;
|
||||
default_destructor_location = loc;
|
||||
}
|
||||
|
||||
void
|
||||
default_printer_set (const char *printer, location loc)
|
||||
{
|
||||
if (default_printer != NULL)
|
||||
{
|
||||
complain_at (loc, _("redeclaration for default %%printer"));
|
||||
complain_at (default_printer_location, _("previous declaration"));
|
||||
}
|
||||
default_printer = printer;
|
||||
default_printer_location = loc;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user