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

parser: move checks inside the called functions

Browse Source 
Revamping the handling of the symbols is the grammar is much more
delicate than I anticipated.  Let's first move things around for
clarity.

* src/symtab.c (symbol_make_alias): Don't accept to alias
non-terminals.
(symbol_user_token_number_set): Don't accept user token numbers
for non-terminals.
Don't do anything in case of redefinition, instead of trying to
update.  The flow is eaier to follow this way.
This commit is contained in:
Akim Demaille
2018-11-30 06:11:00 +01:00
parent e1a843cc69
commit 157f12c483
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/symtab.c
View File

@@ -463,21 +463,26 @@ void
symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
{
int *user_token_numberp = &sym->content->user_token_number;
if (*user_token_numberp != USER_NUMBER_UNDEFINED
&& *user_token_numberp != user_token_number)
if (sym->content->class != token_sym)
complain (&loc, complaint,
_("non-terminals cannot be given an explicit number"));
else if (*user_token_numberp != USER_NUMBER_UNDEFINED
&& *user_token_numberp != user_token_number)
complain (&loc, complaint, _("redefining user token number of %s"),
sym->tag);
*user_token_numberp = user_token_number;
/* User defined $end token? */
if (user_token_number == 0)
else
{
endtoken = sym->content->symbol;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
if (endtoken->content->number != NUMBER_UNDEFINED)
--ntokens;
endtoken->content->number = 0;
*user_token_numberp = user_token_number;
/* User defined $end token? */
if (user_token_number == 0)
{
endtoken = sym->content->symbol;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
if (endtoken->content->number != NUMBER_UNDEFINED)
--ntokens;
endtoken->content->number = 0;
}
}
}
@@ -594,7 +599,10 @@ symbol_merge_properties (symbol *sym, symbol *str)
void
symbol_make_alias (symbol *sym, symbol *str, location loc)
{
if (str->alias)
if (sym->content->class != token_sym)
complain (&loc, complaint,
_("non-terminals cannot be given a string alias"));
else if (str->alias)
complain (&loc, Wother,
_("symbol %s used more than once as a literal string"), str->tag);
else if (sym->alias)