mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 15:23:02 +00:00
(symbol_make_alias): Call symbol_type_set,
reverting the 2004-10-11 change to this function. (symbol_check_alias_consistency): Don't call symbol_type_set if the type name is already correct.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
/* Symbol table manager for Bison.
|
/* Symbol table manager for Bison.
|
||||||
|
|
||||||
Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004 Free Software
|
Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005 Free Software
|
||||||
Foundation, Inc.
|
Foundation, Inc.
|
||||||
|
|
||||||
This file is part of Bison, the GNU Compiler Compiler.
|
This file is part of Bison, the GNU Compiler Compiler.
|
||||||
@@ -264,6 +264,7 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
|
|||||||
abort ();
|
abort ();
|
||||||
sym->number = symval->number =
|
sym->number = symval->number =
|
||||||
(symval->number < sym->number) ? symval->number : sym->number;
|
(symval->number < sym->number) ? symval->number : sym->number;
|
||||||
|
symbol_type_set (symval, sym->type_name, loc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,7 +284,7 @@ symbol_check_alias_consistency (symbol *this)
|
|||||||
if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
|
if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (orig->type_name || alias->type_name)
|
if (orig->type_name != alias->type_name)
|
||||||
{
|
{
|
||||||
if (orig->type_name)
|
if (orig->type_name)
|
||||||
symbol_type_set (alias, orig->type_name, orig->type_location);
|
symbol_type_set (alias, orig->type_name, orig->type_location);
|
||||||
|
|||||||
Reference in New Issue
Block a user