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

tables: scope reduction

Browse Source 
* src/tables.c (save_column, pack_vector): Reduce the scope to
emphasize the structure of the code.
Rename the returned value "res" to make understanding easier.
This commit is contained in:
Akim Demaille
2012-12-26 17:56:20 +01:00
parent e697f05b35
commit 28be3b8e53
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/tables.c
View File

@@ -486,11 +486,6 @@ static void
save_column (symbol_number sym, state_number default_state) save_column (symbol_number sym, state_number default_state)
{ {
goto_number i; goto_number i;
base_number *sp;
base_number *sp1;
base_number *sp2;
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];
@@ -500,23 +495,24 @@ save_column (symbol_number sym, state_number default_state)
if (to_state[i] != default_state) if (to_state[i] != default_state)
count++; count++;
if (count == 0) if (count)
return; {
/* Allocate room for non defaulted gotos. */
vector_number symno = symbol_number_to_vector_number (sym);
base_number *sp1 = froms[symno] = xnmalloc (count, sizeof *sp1);
base_number *sp2 = tos[symno] = xnmalloc (count, sizeof *sp2);
/* Allocate room for non defaulted gotos. */ /* Store the state numbers of the non defaulted gotos. */
froms[symno] = sp = sp1 = xnmalloc (count, sizeof *sp1); for (i = begin; i < end; i++)
tos[symno] = sp2 = xnmalloc (count, sizeof *sp2); if (to_state[i] != default_state)
{
*sp1++ = from_state[i];
*sp2++ = to_state[i];
}
/* Store the state numbers of the non defaulted gotos. */ tally[symno] = count;
for (i = begin; i < end; i++) width[symno] = sp1[-1] - froms[symno][0] + 1;
if (to_state[i] != default_state) }
{
*sp1++ = from_state[i];
*sp2++ = to_state[i];
}
tally[symno] = count;
width[symno] = sp1[-1] - sp[0] + 1;
} }
@@ -675,42 +671,44 @@ matching_state (vector_number vector)
static base_number static base_number
pack_vector (vector_number vector) pack_vector (vector_number vector)
{ {
base_number res;
vector_number i = order[vector]; vector_number i = order[vector];
size_t t = tally[i]; size_t t = tally[i];
int j;
int loc = 0;
base_number *from = froms[i]; base_number *from = froms[i];
base_number *to = tos[i]; base_number *to = tos[i];
unsigned int *conflict_to = conflict_tos[i]; unsigned int *conflict_to = conflict_tos[i];
aver (t != 0); aver (t != 0);
for (j = lowzero - from[0]; ; j++) for (res = lowzero - from[0]; ; res++)
{ {
int k;
bool ok = true; bool ok = true;
aver (res < table_size);
{
int k;
for (k = 0; ok && k < t; k++)
{
int loc = res + state_number_as_int (from[k]);
if (table_size <= loc)
table_grow (loc);
aver (j < table_size); if (table[loc] != 0)
ok = false;
}
for (k = 0; ok && k < t; k++) if (ok)
{ for (k = 0; k < vector; k++)
loc = j + state_number_as_int (from[k]); if (pos[k] == res)
if (table_size <= loc) ok = false;
table_grow (loc); }
if (table[loc] != 0)
ok = false;
}
for (k = 0; ok && k < vector; k++)
if (pos[k] == j)
ok = false;
if (ok) if (ok)
{ {
int loc;
int k;
for (k = 0; k < t; k++) for (k = 0; k < t; k++)
{ {
loc = j + from[k]; loc = res + state_number_as_int (from[k]);
table[loc] = to[k]; table[loc] = to[k];
if (nondeterministic_parser && conflict_to != NULL) if (nondeterministic_parser && conflict_to != NULL)
conflict_table[loc] = conflict_to[k]; conflict_table[loc] = conflict_to[k];
@@ -723,8 +721,8 @@ pack_vector (vector_number vector)
if (high < loc) if (high < loc)
high = loc; high = loc;
aver (BASE_MINIMUM <= j && j <= BASE_MAXIMUM); aver (BASE_MINIMUM <= res && res <= BASE_MAXIMUM);
return j; return res;
} }
} }
} }