[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] tables: use size_t where appropriate
From: |
Akim Demaille |
Subject: |
[PATCH 2/6] tables: use size_t where appropriate |
Date: |
Thu, 27 Dec 2012 09:25:45 +0100 |
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.
---
src/tables.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/tables.c b/src/tables.c
index c1e8d2a..fb59dde 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -84,7 +84,7 @@ int nvectors;
static base_number **froms;
static base_number **tos;
static unsigned int **conflict_tos;
-static int *tally;
+static size_t *tally;
static base_number *width;
@@ -382,7 +382,7 @@ static void
save_row (state_number s)
{
symbol_number i;
- int count;
+ size_t count;
base_number *sp;
base_number *sp1;
base_number *sp2;
@@ -489,14 +489,13 @@ save_column (symbol_number sym, state_number
default_state)
base_number *sp;
base_number *sp1;
base_number *sp2;
- int count;
vector_number symno = symbol_number_to_vector_number (sym);
goto_number begin = goto_map[sym - ntokens];
goto_number end = goto_map[sym - ntokens + 1];
/* Number of non default GOTO. */
- count = 0;
+ size_t count = 0;
for (i = begin; i < end; i++)
if (to_state[i] != default_state)
count++;
@@ -599,7 +598,7 @@ sort_actions (void)
if (0 < tally[i])
{
int k;
- int t = tally[i];
+ size_t t = tally[i];
int w = width[i];
int j = nentries - 1;
@@ -628,7 +627,7 @@ static state_number
matching_state (vector_number vector)
{
vector_number i = order[vector];
- int t;
+ size_t t;
int w;
int prev;
@@ -677,8 +676,8 @@ static base_number
pack_vector (vector_number vector)
{
vector_number i = order[vector];
+ size_t t = tally[i];
int j;
- int t = tally[i];
int loc = 0;
base_number *from = froms[i];
base_number *to = tos[i];
--
1.8.0.2
- [PATCH 0/6] {master} internals: improve readability, Akim Demaille, 2012/12/27
- [PATCH 1/6] tables: style changes, Akim Demaille, 2012/12/27
- [PATCH 5/6] tables: scope reduction, Akim Demaille, 2012/12/27
- [PATCH 4/6] tables: scope reduction, Akim Demaille, 2012/12/27
- [PATCH 2/6] tables: use size_t where appropriate,
Akim Demaille <=
- [PATCH 3/6] tables: scope reduction, Akim Demaille, 2012/12/27
- [PATCH 6/6] tables: scope reduction, Akim Demaille, 2012/12/27
- Re: [PATCH 0/6] {master} internals: improve readability, Akim Demaille, 2012/12/27