mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-13 14:23:04 +00:00
Require default %destructor/%printer to be declared using
%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:
@@ -606,10 +606,10 @@ AT_DATA_GRAMMAR([[input.y]],
|
||||
|
||||
%printer {
|
||||
fprintf (yyoutput, "Default printer for '%c' @ %d", $$, @$.first_column);
|
||||
}
|
||||
} %symbol-default
|
||||
%destructor {
|
||||
fprintf (stdout, "Default destructor for '%c' @ %d.\n", $$, @$.first_column);
|
||||
}
|
||||
} %symbol-default
|
||||
|
||||
%printer {
|
||||
fprintf (yyoutput, "'b'/'c' printer for '%c' @ %d", $$, @$.first_column);
|
||||
@@ -715,10 +715,10 @@ AT_DATA_GRAMMAR([[input.y]],
|
||||
%token END 0
|
||||
%printer {
|
||||
fprintf (yyoutput, "Default printer for '%c' @ %d", $$, @$.first_column);
|
||||
}
|
||||
} %symbol-default
|
||||
%destructor {
|
||||
fprintf (stdout, "Default destructor for '%c' @ %d.\n", $$, @$.first_column);
|
||||
}
|
||||
} %symbol-default
|
||||
|
||||
%%
|
||||
|
||||
@@ -800,10 +800,10 @@ AT_DATA_GRAMMAR([[input.y]],
|
||||
|
||||
%printer {
|
||||
fprintf (yyoutput, "'%c'", $$);
|
||||
}
|
||||
} %symbol-default
|
||||
%destructor {
|
||||
fprintf (stderr, "DESTROY '%c'\n", $$);
|
||||
}
|
||||
} %symbol-default
|
||||
|
||||
%%
|
||||
|
||||
@@ -911,11 +911,11 @@ AT_DATA_GRAMMAR([[input.y]],
|
||||
%printer {
|
||||
char chr = $$;
|
||||
fprintf (yyoutput, "'%c'", chr);
|
||||
}
|
||||
} %symbol-default
|
||||
%destructor {
|
||||
char chr = $$;
|
||||
fprintf (stderr, "DESTROY '%c'\n", chr);
|
||||
}
|
||||
} %symbol-default
|
||||
|
||||
%union { char chr; }
|
||||
%type <chr> start
|
||||
|
||||
@@ -175,18 +175,18 @@ AT_CLEANUP
|
||||
AT_SETUP([Default %printer and %destructor redeclared])
|
||||
|
||||
AT_DATA([[input.y]],
|
||||
[[%destructor { destroy ($$); }
|
||||
%printer { destroy ($$); }
|
||||
[[%destructor { destroy ($$); } %symbol-default
|
||||
%printer { destroy ($$); } %symbol-default
|
||||
|
||||
%destructor { destroy ($$); }
|
||||
%printer { destroy ($$); }
|
||||
%destructor { destroy ($$); } %symbol-default
|
||||
%printer { destroy ($$); } %symbol-default
|
||||
|
||||
%%
|
||||
|
||||
start: ;
|
||||
|
||||
%destructor { destroy ($$); };
|
||||
%printer { destroy ($$); };
|
||||
%destructor { destroy ($$); } %symbol-default;
|
||||
%printer { destroy ($$); } %symbol-default;
|
||||
]])
|
||||
|
||||
AT_CHECK([bison input.y], [1], [],
|
||||
@@ -210,7 +210,7 @@ AT_CLEANUP
|
||||
AT_SETUP([Unused values with default %destructor])
|
||||
|
||||
AT_DATA([[input.y]],
|
||||
[[%destructor { destroy ($$); }
|
||||
[[%destructor { destroy ($$); } %symbol-default
|
||||
|
||||
%%
|
||||
|
||||
@@ -533,7 +533,7 @@ input.y:4.10-5.0: missing `'' at end of line
|
||||
input.y:14.11-15.0: missing `'' at end of line
|
||||
input.y:16.11-17.0: missing `"' at end of line
|
||||
input.y:19.13-20.0: missing `}' at end of file
|
||||
input.y:20.1: syntax error, unexpected end of file, expecting ;
|
||||
input.y:20.1: syntax error, unexpected end of file
|
||||
]])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
Reference in New Issue
Block a user