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

Require default %destructor/%printer to be declared using

Browse Source 
%symbol-default instead of an empty symbol list, and start working on
new per-type %destructor/%printer.  Discussed at
<http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00007.html>.
* NEWS (2.3+): Add %symbol-default to example.
* bison.texinfo (Freeing Discarded Symbols): Likewise.
(Bison Symbols): Add entry for %symbol-default.
* src/parse-gram.y (PERCENT_SYMBOL_DEFAULT): New token.
(generic_symlist, generic_symlist_item): New nonterminals for creating
a list in which each item is a symbol, semantic type, or
%symbol-default.
(grammar_declaration): Use generic_symlist in %destructor and %printer
declarations instead of symbols.1 or an empty list.
(symbol_declaration, precedence_declaration, symbols.1): Update actions
for changes to symbol_list.
* src/reader.c: Update for changes to symbol_list.
* src/scan-code.l: Likewise.
* src/scan-gram.l: Scan new PERCENT_SYMBOL_DEFAULT token.
* src/symlist.c, src/symlist.h: Extend such that a list node may
represent a semantic type or a %symbol-default in addition to just an
ordinary symbol.  Add switched functions for setting %destructor's and
%printer's.
* tests/actions.at, tests/input.at: Add %symbol-default to all default
%destructor/%printer declarations.
This commit is contained in:
Joel E. Denny
2006-09-04 19:29:29 +00:00
parent 3508ce361b
commit 3be03b13e5
13 changed files with 821 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/parse-gram.y
View File

@@ -116,6 +116,8 @@ static int current_prec = 0;
%token PERCENT_TYPE "%type"
%token PERCENT_DESTRUCTOR "%destructor"
%token PERCENT_PRINTER "%printer"
%token PERCENT_SYMBOL_DEFAULT
"%symbol-default"
%token PERCENT_LEFT "%left"
%token PERCENT_RIGHT "%right"
@@ -199,7 +201,7 @@ static int current_prec = 0;
%printer { fprintf (stderr, "%s:", $$->tag); } id_colon
%type <assoc> precedence_declarator
%type <list> symbols.1
%type <list> symbols.1 generic_symlist generic_symlist_item
%%
input:
@@ -262,30 +264,22 @@ grammar_declaration:
{
grammar_start_symbol_set ($2, @2);
}
| "%destructor" "{...}"
{
default_destructor_set (translate_symbol_action ($2, @2), @2);
}
| "%destructor" "{...}" symbols.1
| "%destructor" "{...}" generic_symlist
{
symbol_list *list;
const char *action = translate_symbol_action ($2, @2);
for (list = $3; list; list = list->next)
symbol_destructor_set (list->sym, action, @2);
symbol_list_destructor_set (list, action, @2);
symbol_list_free ($3);
}
| "%printer" "{...}" symbols.1
| "%printer" "{...}" generic_symlist
{
symbol_list *list;
const char *action = translate_symbol_action ($2, @2);
for (list = $3; list; list = list->next)
symbol_printer_set (list->sym, action, @2);
symbol_list_printer_set (list, action, @2);
symbol_list_free ($3);
}
| "%printer" "{...}"
{
default_printer_set (translate_symbol_action ($2, @2), @2);
}
| "%default-prec"
{
default_prec = true;
@@ -352,7 +346,7 @@ symbol_declaration:
tag_seen = true;
symbol_list *list;
for (list = $3; list; list = list->next)
symbol_type_set (list->sym, $2, @2);
symbol_type_set (list->content.sym, $2, @2);
symbol_list_free ($3);
}
;
@@ -364,8 +358,8 @@ precedence_declaration:
++current_prec;
for (list = $3; list; list = list->next)
{
symbol_type_set (list->sym, current_type, @2);
symbol_precedence_set (list->sym, current_prec, $1, @1);
symbol_type_set (list->content.sym, current_type, @2);
symbol_precedence_set (list->content.sym, current_prec, $1, @1);
}
symbol_list_free ($3);
current_type = NULL;
@@ -383,10 +377,23 @@ type.opt:
| TYPE { current_type = $1; tag_seen = true; }
;
/* One or more nonterminals to be %typed. */
/* One or more symbols to be %typed. */
symbols.1:
symbol { $$ = symbol_list_new ($1, @1); }
| symbols.1 symbol { $$ = symbol_list_prepend ($1, $2, @2); }
symbol
{ $$ = symbol_list_sym_new ($1, @1); }
| symbols.1 symbol
{ $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); }
;
generic_symlist:
generic_symlist_item { $$ = $1; }
| generic_symlist generic_symlist_item { $$ = symbol_list_prepend ($1, $2); }
;
generic_symlist_item:
symbol { $$ = symbol_list_sym_new ($1, @1); }
| TYPE { $$ = symbol_list_type_new ($1, @1); }
| "%symbol-default" { $$ = symbol_list_default_new (@1); }
;
/* One token definition. */