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

Miscellaneous code readability improvements.

Browse Source 
* src/reader.c (reader): Move %define front-end variable
defaults and checking into...
(prepare_percent_define_front_end_variables): ... this new
function.

* src/scan-gram.l (INITIAL): For consistency with string
literals, don't store open quote on character literal.  It's
discarded before returning anyway.
(SC_ESCAPED_CHARACTER): Similarly, don't store close quote.
Make length test more readable, and make the character stored
for an empty literal more obvious while consistent with the
previous behavior.

* src/symtab.c, src/symtab.h: Rename USER_NUMBER_ALIAS to
USER_NUMBER_HAS_STRING_ALIAS throughout.
* src/symtab.c (symbol_make_alias): Remove comment from symtab.c
that is repeated in symtab.h.  Improve argument names to make it
clear which side of the symbol-string alias pair is which.
(symbol_check_alias_consistency): Improve local variable names
for the same purpose.
* src/symtab.h (struct symbol): Make comments about aliases
clearer.
(symbol_make_alias): Improve comments and argument name.
* src/output.c (token_definitions_output): Update for rename to
USER_NUMBER_HAS_STRING_ALIAS and improve comments about aliases.
(cherry picked from commit dfaa48602d)

Conflicts:

	src/symtab.c
	src/symtab.h
This commit is contained in:
Joel E. Denny
2009-08-10 21:43:07 -04:00
parent 1a323c2f71
commit 07c0db18b4
6 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/symtab.c
View File

@@ -367,7 +367,7 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
{
int *user_token_numberp;
if (sym->user_token_number != USER_NUMBER_ALIAS)
if (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)
user_token_numberp = &sym->user_token_number;
else
user_token_numberp = &sym->alias->user_token_number;
@@ -416,29 +416,24 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
}
/*------------------------------------------------------------------.
| Declare the new symbol SYM. Make it an alias of SYMVAL, and type |
| SYMVAL with SYM's type. |
`------------------------------------------------------------------*/
void
symbol_make_alias (symbol *sym, symbol *symval, location loc)
symbol_make_alias (symbol *sym, symbol *str, location loc)
{
if (symval->alias)
if (str->alias)
warn_at (loc, _("symbol `%s' used more than once as a literal string"),
symval->tag);
str->tag);
else if (sym->alias)
warn_at (loc, _("symbol `%s' given more than one literal string"),
sym->tag);
else
{
symval->class = token_sym;
symval->user_token_number = sym->user_token_number;
sym->user_token_number = USER_NUMBER_ALIAS;
symval->alias = sym;
sym->alias = symval;
symval->number = sym->number;
symbol_type_set (symval, sym->type_name, loc);
str->class = token_sym;
str->user_token_number = sym->user_token_number;
sym->user_token_number = USER_NUMBER_HAS_STRING_ALIAS;
str->alias = sym;
sym->alias = str;
str->number = sym->number;
symbol_type_set (str, sym->type_name, loc);
}
}
@@ -451,46 +446,47 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
static inline void
symbol_check_alias_consistency (symbol *this)
{
symbol *alias = this;
symbol *orig = this->alias;
symbol *sym = this;
symbol *str = this->alias;
/* Check only those that _are_ the aliases. */
if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
/* Check only the symbol in the symbol-string pair. */
if (!(this->alias
&& this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS))
return;
if (orig->type_name != alias->type_name)
if (str->type_name != sym->type_name)
{
if (orig->type_name)
symbol_type_set (alias, orig->type_name, orig->type_location);
if (str->type_name)
symbol_type_set (sym, str->type_name, str->type_location);
else
symbol_type_set (orig, alias->type_name, alias->type_location);
symbol_type_set (str, sym->type_name, sym->type_location);
}
if (orig->destructor.code || alias->destructor.code)
if (str->destructor.code || sym->destructor.code)
{
if (orig->destructor.code)
symbol_destructor_set (alias, &orig->destructor);
if (str->destructor.code)
symbol_destructor_set (sym, &str->destructor);
else
symbol_destructor_set (orig, &alias->destructor);
symbol_destructor_set (str, &sym->destructor);
}
if (orig->printer.code || alias->printer.code)
if (str->printer.code || sym->printer.code)
{
if (orig->printer.code)
symbol_printer_set (alias, &orig->printer);
if (str->printer.code)
symbol_printer_set (sym, &str->printer);
else
symbol_printer_set (orig, &alias->printer);
symbol_printer_set (str, &sym->printer);
}
if (alias->prec || orig->prec)
if (sym->prec || str->prec)
{
if (orig->prec)
symbol_precedence_set (alias, orig->prec, orig->assoc,
orig->prec_location);
if (str->prec)
symbol_precedence_set (sym, str->prec, str->assoc,
str->prec_location);
else
symbol_precedence_set (orig, alias->prec, alias->assoc,
alias->prec_location);
symbol_precedence_set (str, sym->prec, sym->assoc,
sym->prec_location);
}
}
@@ -530,8 +526,8 @@ symbol_pack (symbol *this)
this->number = this->alias->number;
}
}
/* Do not do processing below for USER_NUMBER_ALIASes. */
if (this->user_token_number == USER_NUMBER_ALIAS)
/* Do not do processing below for USER_NUMBER_HAS_STRING_ALIASes. */
if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)
return true;
}
else /* this->class == token_sym */
@@ -578,7 +574,7 @@ symbol_translation (symbol *this)
{
/* Non-terminal? */
if (this->class == token_sym
&& this->user_token_number != USER_NUMBER_ALIAS)
&& this->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)
{
/* A token which translation has already been set? */
if (token_translations[this->user_token_number] != undeftoken->number)