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

symbol: provide an easy means to compare them in source order

Browse Source 
* src/symtab.c (symbols_sort): New.
(user_token_number_redeclaration): Taken from here.
This commit is contained in:
Akim Demaille
2013-12-09 15:40:07 +01:00
parent 0bd5ee5f89
commit 26eb4f0bdc
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/symtab.c
View File

@@ -100,6 +100,28 @@ symbol_new (uniqstr tag, location loc)
return res;
}
/* If needed, swap first and second so that first has the earliest
location (according to location_cmp).
Many symbol features (e.g., user token numbers) are not assigned
during the parsing, but in a second step, via a traversal of the
symbol table sorted on tag.
However, error messages make more sense if we keep the first
declaration first.
*/
static
void symbols_sort (symbol **first, symbol **second)
{
if (0 < location_cmp ((*first)->location, (*second)->location))
{
symbol* tmp = *first;
*first = *second;
*second = tmp;
}
}
char const *
code_props_type_string (code_props_type kind)
{
@@ -587,17 +609,7 @@ static void
user_token_number_redeclaration (int num, symbol *first, symbol *second)
{
unsigned i = 0;
/* User token numbers are not assigned during the parsing, but in a
second step, via a traversal of the symbol table sorted on tag.
However, error messages make more sense if we keep the first
declaration first. */
if (location_cmp (first->location, second->location) > 0)
{
symbol* tmp = first;
first = second;
second = tmp;
}
symbols_sort (&first, &second);
complain_indent (&second->location, complaint, &i,
_("user token number %d redeclaration for %s"),
num, second->tag);