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

style: scope reduction in lalr.cc

Browse Source 
* src/lalr.c: Shorten variable scopes.
(lookahead_tokens_print): Use the same variable name in two loops
iterating over the same structure.
This commit is contained in:
Akim Demaille
2013-11-18 10:29:23 +01:00
parent 44186fc4ec
commit a339aef48a
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/lalr.c
View File

@@ -67,17 +67,13 @@ static goto_number **includes;
static goto_list **lookback; static goto_list **lookback;
void void
set_goto_map (void) set_goto_map (void)
{ {
state_number s; state_number s;
goto_number *temp_map; goto_number *temp_map = xnmalloc (nvars + 1, sizeof *temp_map);
goto_map = xcalloc (nvars + 1, sizeof *goto_map); goto_map = xcalloc (nvars + 1, sizeof *goto_map);
temp_map = xnmalloc (nvars + 1, sizeof *temp_map);
ngotos = 0; ngotos = 0;
for (s = 0; s < nstates; ++s) for (s = 0; s < nstates; ++s)
{ {
@@ -132,16 +128,13 @@ set_goto_map (void)
goto_number goto_number
map_goto (state_number s0, symbol_number sym) map_goto (state_number s0, symbol_number sym)
{ {
goto_number high; goto_number low = goto_map[sym - ntokens];
goto_number low; goto_number high = goto_map[sym - ntokens + 1] - 1;
goto_number middle;
state_number s;
low = goto_map[sym - ntokens];
high = goto_map[sym - ntokens + 1] - 1;
for (;;) for (;;)
{ {
goto_number middle;
state_number s;
aver (low <= high); aver (low <= high);
middle = (low + high) / 2; middle = (low + high) / 2;
s = from_state[middle]; s = from_state[middle];
@@ -412,7 +405,6 @@ static void
lookahead_tokens_print (FILE *out) lookahead_tokens_print (FILE *out)
{ {
state_number i; state_number i;
int j, k;
fprintf (out, "Lookahead tokens: BEGIN\n"); fprintf (out, "Lookahead tokens: BEGIN\n");
for (i = 0; i < nstates; ++i) for (i = 0; i < nstates; ++i)
{ {
@@ -421,21 +413,25 @@ lookahead_tokens_print (FILE *out)
int n_lookahead_tokens = 0; int n_lookahead_tokens = 0;
if (reds->lookahead_tokens) if (reds->lookahead_tokens)
for (k = 0; k < reds->num; ++k) {
if (reds->lookahead_tokens[k]) int j;
++n_lookahead_tokens; for (j = 0; j < reds->num; ++j)
if (reds->lookahead_tokens[j])
++n_lookahead_tokens;
}
fprintf (out, "State %d: %d lookahead tokens\n", fprintf (out, "State %d: %d lookahead tokens\n",
i, n_lookahead_tokens); i, n_lookahead_tokens);
if (reds->lookahead_tokens) if (reds->lookahead_tokens)
for (j = 0; j < reds->num; ++j) {
BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0) int j, k;
{ for (j = 0; j < reds->num; ++j)
fprintf (out, " on %d (%s) -> rule %d\n", BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0)
k, symbols[k]->tag, fprintf (out, " on %d (%s) -> rule %d\n",
reds->rules[j]->number); k, symbols[k]->tag,
}; reds->rules[j]->number);
}
} }
fprintf (out, "Lookahead tokens: END\n"); fprintf (out, "Lookahead tokens: END\n");
} }