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

style: scope reduction in relation.c

Browse Source
This commit is contained in:
Akim Demaille
2019-02-09 08:49:45 +01:00
parent dd232b95b7
commit e18ad5a96b
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/relation.c
View File

@@ -29,14 +29,11 @@
void void
relation_print (relation r, relation_node size, FILE *out) relation_print (relation r, relation_node size, FILE *out)
{ {
relation_node i; for (relation_node i = 0; i < size; ++i)
relation_node j;
for (i = 0; i < size; ++i)
{ {
fprintf (out, "%3lu: ", (unsigned long) i); fprintf (out, "%3lu: ", (unsigned long) i);
if (r[i]) if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j) for (relation_node j = 0; r[i][j] != END_NODE; ++j)
fprintf (out, "%3lu ", (unsigned long) r[i][j]); fprintf (out, "%3lu ", (unsigned long) r[i][j]);
fputc ('\n', out); fputc ('\n', out);
} }
@@ -61,14 +58,13 @@ static bitsetv F;
static void static void
traverse (relation_node i) traverse (relation_node i)
{ {
relation_node j;
relation_node height; relation_node height;
VERTICES[++top] = i; VERTICES[++top] = i;
INDEX[i] = height = top; INDEX[i] = height = top;
if (R[i]) if (R[i])
for (j = 0; R[i][j] != END_NODE; ++j) for (relation_node j = 0; R[i][j] != END_NODE; ++j)
{ {
if (INDEX[R[i][j]] == 0) if (INDEX[R[i][j]] == 0)
traverse (R[i][j]); traverse (R[i][j]);
@@ -82,7 +78,7 @@ traverse (relation_node i)
if (INDEX[i] == height) if (INDEX[i] == height)
for (;;) for (;;)
{ {
j = VERTICES[top--]; relation_node j = VERTICES[top--];
INDEX[j] = infinity; INDEX[j] = infinity;
if (i == j) if (i == j)
@@ -96,8 +92,6 @@ traverse (relation_node i)
void void
relation_digraph (relation r, relation_node size, bitsetv *function) relation_digraph (relation r, relation_node size, bitsetv *function)
{ {
relation_node i;
infinity = size + 2; infinity = size + 2;
INDEX = xcalloc (size + 1, sizeof *INDEX); INDEX = xcalloc (size + 1, sizeof *INDEX);
VERTICES = xnmalloc (size + 1, sizeof *VERTICES); VERTICES = xnmalloc (size + 1, sizeof *VERTICES);
@@ -106,7 +100,7 @@ relation_digraph (relation r, relation_node size, bitsetv *function)
R = r; R = r;
F = *function; F = *function;
for (i = 0; i < size; i++) for (relation_node i = 0; i < size; i++)
if (INDEX[i] == 0 && R[i]) if (INDEX[i] == 0 && R[i])
traverse (i); traverse (i);
@@ -125,14 +119,6 @@ void
relation_transpose (relation *R_arg, relation_node n) relation_transpose (relation *R_arg, relation_node n)
{ {
relation r = *R_arg; relation r = *R_arg;
/* The result. */
relation new_R = xnmalloc (n, sizeof *new_R);
/* END_R[I] -- next entry of NEW_R[I]. */
relation end_R = xnmalloc (n, sizeof *end_R);
/* NEDGES[I] -- total size of NEW_R[I]. */
size_t *nedges = xcalloc (n, sizeof *nedges);
relation_node i;
relation_node j;
if (trace_flag & trace_sets) if (trace_flag & trace_sets)
{ {
@@ -141,13 +127,19 @@ relation_transpose (relation *R_arg, relation_node n)
} }
/* Count. */ /* Count. */
for (i = 0; i < n; i++) /* NEDGES[I] -- total size of NEW_R[I]. */
size_t *nedges = xcalloc (n, sizeof *nedges);
for (relation_node i = 0; i < n; i++)
if (r[i]) if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j) for (relation_node j = 0; r[i][j] != END_NODE; ++j)
++nedges[r[i][j]]; ++nedges[r[i][j]];
/* Allocate. */ /* Allocate. */
for (i = 0; i < n; i++) /* The result. */
relation new_R = xnmalloc (n, sizeof *new_R);
/* END_R[I] -- next entry of NEW_R[I]. */
relation end_R = xnmalloc (n, sizeof *end_R);
for (relation_node i = 0; i < n; i++)
{ {
relation_node *sp = NULL; relation_node *sp = NULL;
if (nedges[i] > 0) if (nedges[i] > 0)
@@ -160,16 +152,16 @@ relation_transpose (relation *R_arg, relation_node n)
} }
/* Store. */ /* Store. */
for (i = 0; i < n; i++) for (relation_node i = 0; i < n; i++)
if (r[i]) if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j) for (relation_node j = 0; r[i][j] != END_NODE; ++j)
*end_R[r[i][j]]++ = i; *end_R[r[i][j]]++ = i;
free (nedges); free (nedges);
free (end_R); free (end_R);
/* Free the input: it is replaced with the result. */ /* Free the input: it is replaced with the result. */
for (i = 0; i < n; i++) for (relation_node i = 0; i < n; i++)
free (r[i]); free (r[i]);
free (r); free (r);