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

style: rename endtoken as eoftoken

Browse Source 
* src/symtab.h, src/symtab.c (endtoken): Rename as...
(eoftoken): this.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2020-06-27 17:30:27 +02:00
parent d796e11f8f
commit feb0bb0a59
6 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/symtab.c
View File

@@ -58,7 +58,7 @@ static semantic_type **semantic_types_sorted = NULL;
symbol *errtoken = NULL;
symbol *undeftoken = NULL;
symbol *endtoken = NULL;
symbol *eoftoken = NULL;
symbol *accept = NULL;
symbol *startsymbol = NULL;
location startsymbol_loc;
@@ -78,9 +78,9 @@ static bool
symbol_is_user_defined (symbol *sym)
{
const bool eof_is_user_defined
= !endtoken->alias || STRNEQ (endtoken->alias->tag, "$end");
= !eoftoken->alias || STRNEQ (eoftoken->alias->tag, "$end");
return sym->tag[0] != '$'
&& (eof_is_user_defined || (sym != endtoken && sym->alias != errtoken))
&& (eof_is_user_defined || (sym != eoftoken && sym->alias != errtoken))
&& sym != errtoken && sym->alias != errtoken
&& sym != undeftoken && sym->alias != undeftoken;
}
@@ -595,14 +595,14 @@ symbol_code_set (symbol *sym, int code, location loc)
{
*codep = code;
/* User defined $end token? */
if (code == 0 && !endtoken)
if (code == 0 && !eoftoken)
{
endtoken = sym->content->symbol;
eoftoken = sym->content->symbol;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
if (endtoken->content->number != NUMBER_UNDEFINED)
if (eoftoken->content->number != NUMBER_UNDEFINED)
--ntokens;
endtoken->content->number = 0;
eoftoken->content->number = 0;
}
}
}
@@ -1163,9 +1163,9 @@ symbols_pack (void)
if (has_translations ())
{
const bool eof_is_user_defined
= !endtoken->alias || STRNEQ (endtoken->alias->tag, "$end");
= !eoftoken->alias || STRNEQ (eoftoken->alias->tag, "$end");
if (!eof_is_user_defined)
endtoken->alias->translatable = true;
eoftoken->alias->translatable = true;
undeftoken->alias->translatable = true;
errtoken->alias->translatable = true;
}