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

tables: use size_t where appropriate

Browse Source 
These changes aim at making the code easier to understand.

* src/tables.c (tally): This is a size, always >= 0, so make it
a size_t.
This commit is contained in:
Akim Demaille
2012-12-26 17:55:02 +01:00
parent db598939b8
commit e697f05b35
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tables.c
View File

@@ -84,7 +84,7 @@ int nvectors;
static base_number **froms; static base_number **froms;
static base_number **tos; static base_number **tos;
static unsigned int **conflict_tos; static unsigned int **conflict_tos;
static int *tally; static size_t *tally;
static base_number *width; static base_number *width;
@@ -382,7 +382,7 @@ static void
save_row (state_number s) save_row (state_number s)
{ {
symbol_number i; symbol_number i;
int count; size_t count;
base_number *sp; base_number *sp;
base_number *sp1; base_number *sp1;
base_number *sp2; base_number *sp2;
@@ -489,14 +489,13 @@ save_column (symbol_number sym, state_number default_state)
base_number *sp; base_number *sp;
base_number *sp1; base_number *sp1;
base_number *sp2; base_number *sp2;
int count;
vector_number symno = symbol_number_to_vector_number (sym); vector_number symno = symbol_number_to_vector_number (sym);
goto_number begin = goto_map[sym - ntokens]; goto_number begin = goto_map[sym - ntokens];
goto_number end = goto_map[sym - ntokens + 1]; goto_number end = goto_map[sym - ntokens + 1];
/* Number of non default GOTO. */ /* Number of non default GOTO. */
count = 0; size_t count = 0;
for (i = begin; i < end; i++) for (i = begin; i < end; i++)
if (to_state[i] != default_state) if (to_state[i] != default_state)
count++; count++;
@@ -599,7 +598,7 @@ sort_actions (void)
if (0 < tally[i]) if (0 < tally[i])
{ {
int k; int k;
int t = tally[i]; size_t t = tally[i];
int w = width[i]; int w = width[i];
int j = nentries - 1; int j = nentries - 1;
@@ -628,7 +627,7 @@ static state_number
matching_state (vector_number vector) matching_state (vector_number vector)
{ {
vector_number i = order[vector]; vector_number i = order[vector];
int t; size_t t;
int w; int w;
int prev; int prev;
@@ -677,8 +676,8 @@ static base_number
pack_vector (vector_number vector) pack_vector (vector_number vector)
{ {
vector_number i = order[vector]; vector_number i = order[vector];
size_t t = tally[i];
int j; int j;
int t = tally[i];
int loc = 0; int loc = 0;
base_number *from = froms[i]; base_number *from = froms[i];
base_number *to = tos[i]; base_number *to = tos[i];