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

%nterm: do not accept numbers nor string alias

Browse Source 
Reported by Rici Lake.
http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html

* src/parse-gram.y (symbol_def): Refuse string aliases and numbers
for non-terminals.
(prologue_declaration): Recover from errors ended with ';'.
* tests/input.at (Invalid %nterm uses): New.
This commit is contained in:
Akim Demaille
2018-11-25 14:01:10 +01:00
parent 4ad877fdab
commit 4bddd33439
2 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/parse-gram.y
View File

@@ -317,6 +317,7 @@ prologue_declaration:
| "%token-table" { token_table_flag = true; } | "%token-table" { token_table_flag = true; }
| "%verbose" { report_flag |= report_states; } | "%verbose" { report_flag |= report_states; }
| "%yacc" { yacc_flag = true; } | "%yacc" { yacc_flag = true; }
| error ";" { current_class = unknown_sym; yyerrok; }
| /*FIXME: Err? What is this horror doing here? */ ";" | /*FIXME: Err? What is this horror doing here? */ ";"
; ;
@@ -495,7 +496,7 @@ tag:
| "<>" { $$ = uniqstr_new (""); } | "<>" { $$ = uniqstr_new (""); }
; ;
/* One token definition. */ /* One symbol (token or nterm depending on current_class) definition. */
symbol_def: symbol_def:
TAG TAG
{ {
@@ -509,18 +510,38 @@ symbol_def:
} }
| id INT | id INT
{ {
if (current_class != token_sym)
{
gram_error (&@2,
_("non-terminals cannot be given an explicit number"));
YYERROR;
}
symbol_class_set ($1, current_class, @1, true); symbol_class_set ($1, current_class, @1, true);
symbol_type_set ($1, current_type, @1); symbol_type_set ($1, current_type, @1);
symbol_user_token_number_set ($1, $2, @2); symbol_user_token_number_set ($1, $2, @2);
} }
| id string_as_id | id string_as_id
{ {
if (current_class != token_sym)
{
gram_error (&@2,
_("non-terminals cannot be given a string alias"));
YYERROR;
}
symbol_class_set ($1, current_class, @1, true); symbol_class_set ($1, current_class, @1, true);
symbol_type_set ($1, current_type, @1); symbol_type_set ($1, current_type, @1);
symbol_make_alias ($1, $2, @$); symbol_make_alias ($1, $2, @$);
} }
| id INT string_as_id | id INT string_as_id
{ {
if (current_class != token_sym)
{
gram_error (&@2,
_("non-terminals cannot be given an explicit number"));
gram_error (&@3,
_("non-terminals cannot be given a string alias"));
YYERROR;
}
symbol_class_set ($1, current_class, @1, true); symbol_class_set ($1, current_class, @1, true);
symbol_type_set ($1, current_type, @1); symbol_type_set ($1, current_type, @1);
symbol_user_token_number_set ($1, $2, @2); symbol_user_token_number_set ($1, $2, @2);

42
tests/input.at
View File

@@ -130,6 +130,48 @@ AT_BISON_CHECK([input.y], [1], [],
AT_CLEANUP AT_CLEANUP
## --------------------- ##
## Invalid %nterm uses. ##
## --------------------- ##
AT_SETUP([Invalid %nterm uses])
AT_DATA([input.y],
[[%nterm expr "expression";
%nterm term 123;
%nterm fact 124 "factor";
%%
expr: expr '+' term | term;
term: term '*' fact | fact;
fact: '0';
]])
AT_BISON_CHECK([-fcaret input.y], [1], [],
[[input.y:1.1-6: warning: deprecated directive, use '%type' [-Wdeprecated]
%nterm expr "expression";
^^^^^^
input.y:1.13-24: error: non-terminals cannot be given a string alias
%nterm expr "expression";
^^^^^^^^^^^^
input.y:2.1-6: warning: deprecated directive, use '%type' [-Wdeprecated]
%nterm term 123;
^^^^^^
input.y:2.13-15: error: non-terminals cannot be given an explicit number
%nterm term 123;
^^^
input.y:3.1-6: warning: deprecated directive, use '%type' [-Wdeprecated]
%nterm fact 124 "factor";
^^^^^^
input.y:3.13-15: error: non-terminals cannot be given an explicit number
%nterm fact 124 "factor";
^^^
input.y:3.17-24: error: non-terminals cannot be given a string alias
%nterm fact 124 "factor";
^^^^^^^^
]])
AT_CLEANUP
## ------------ ## ## ------------ ##
## Invalid $n. ## ## Invalid $n. ##