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

variant: produce stable results

Browse Source 
Improve the output by ensuring a well defined order for type switches.

* src/uniqstr.h: Style changes for macro arguments.
(UNIQSTR_CMP): Replace by...
(uniqstr_cmp): this.
* src/uniqstr.c (uniqstr_cmp): New.
Produce well defined results.
* src/output.c: Use it.
This commit is contained in:
Akim Demaille
2012-12-22 10:16:49 +01:00
parent e38106582f
commit 55439a1cea
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output.c
View File

@@ -284,10 +284,10 @@ prepare_states (void)
static int static int
symbol_type_name_cmp (const symbol **lhs, const symbol **rhs) symbol_type_name_cmp (const symbol **lhs, const symbol **rhs)
{ {
int res = UNIQSTR_CMP((*lhs)->type_name, (*rhs)->type_name); int res = uniqstr_cmp ((*lhs)->type_name, (*rhs)->type_name);
if (res) if (!res)
return res; res = (*lhs)->number - (*rhs)->number;
return (*lhs)->number - (*rhs)->number; return res;
} }

13
src/uniqstr.c
View File

@@ -103,7 +103,17 @@ uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
return uniqstr_print (ustr); return uniqstr_print (ustr);
} }
int
uniqstr_cmp(uniqstr l, uniqstr r)
{
return (l == r ? 0
: !l ? -1
: !r ? +1
: strcmp (l, r));
}
/*-----------------------. /*-----------------------.
| A uniqstr hash table. | | A uniqstr hash table. |
`-----------------------*/ `-----------------------*/
@@ -120,6 +130,7 @@ hash_uniqstr (void const *m, size_t tablesize)
return hash_string (m, tablesize); return hash_string (m, tablesize);
} }
/*----------------------------. /*----------------------------.
| Create the uniqstrs table. | | Create the uniqstrs table. |
`----------------------------*/ `----------------------------*/

2
src/uniqstr.h
View File

@@ -40,7 +40,7 @@ uniqstr uniqstr_vsprintf (char const *format, ...)
/* Compare two uniqstr a la strcmp: negative for <, nul for =, and /* Compare two uniqstr a la strcmp: negative for <, nul for =, and
positive for >. Undefined order, relies on addresses. */ positive for >. Undefined order, relies on addresses. */
# define UNIQSTR_CMP(USTR1, USTR2) ((USTR1) - (USTR2)) int uniqstr_cmp(uniqstr u1, uniqstr u2);
/* Die if STR is not a uniqstr. */ /* Die if STR is not a uniqstr. */
void uniqstr_assert (char const *str); void uniqstr_assert (char const *str);