projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/maint'
[bison.git]
/
src
/
relation.c
diff --git
a/src/relation.c
b/src/relation.c
index 4682742c3ed2855f482ff9a9bff0d5a599ed742d..2d4215ecb62e1a357db92e273df651ec09e7cdff 100644
(file)
--- a/
src/relation.c
+++ b/
src/relation.c
@@
-1,6
+1,6
@@
/* Binary relations.
/* Binary relations.
- Copyright (C) 2002, 2004-2005, 2009-201
1
Free Software Foundation,
+ Copyright (C) 2002, 2004-2005, 2009-201
2
Free Software Foundation,
Inc.
This file is part of Bison, the GNU Compiler Compiler.
Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@
-36,8
+36,8
@@
relation_print (relation r, relation_node size, FILE *out)
{
fprintf (out, "%3lu: ", (unsigned long int) i);
if (r[i])
{
fprintf (out, "%3lu: ", (unsigned long int) i);
if (r[i])
- for (j = 0; r[i][j] != END_NODE; ++j)
- fprintf (out, "%3lu ", (unsigned long int) r[i][j]);
+
for (j = 0; r[i][j] != END_NODE; ++j)
+
fprintf (out, "%3lu ", (unsigned long int) r[i][j]);
fputc ('\n', out);
}
fputc ('\n', out);
fputc ('\n', out);
}
fputc ('\n', out);
@@
-70,25
+70,25
@@
traverse (relation_node i)
if (R[i])
for (j = 0; R[i][j] != END_NODE; ++j)
{
if (R[i])
for (j = 0; R[i][j] != END_NODE; ++j)
{
- if (INDEX[R[i][j]] == 0)
- traverse (R[i][j]);
+
if (INDEX[R[i][j]] == 0)
+
traverse (R[i][j]);
- if (INDEX[i] > INDEX[R[i][j]])
- INDEX[i] = INDEX[R[i][j]];
+
if (INDEX[i] > INDEX[R[i][j]])
+
INDEX[i] = INDEX[R[i][j]];
- bitset_or (F[i], F[i], F[R[i][j]]);
+
bitset_or (F[i], F[i], F[R[i][j]]);
}
if (INDEX[i] == height)
for (;;)
{
}
if (INDEX[i] == height)
for (;;)
{
- j = VERTICES[top--];
- INDEX[j] = infinity;
+
j = VERTICES[top--];
+
INDEX[j] = infinity;
- if (i == j)
- break;
+
if (i == j)
+
break;
- bitset_copy (F[j], F[i]);
+
bitset_copy (F[j], F[i]);
}
}
}
}
@@
-144,17
+144,17
@@
relation_transpose (relation *R_arg, relation_node n)
for (i = 0; i < n; i++)
if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j)
for (i = 0; i < n; i++)
if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j)
- ++nedges[r[i][j]];
+
++nedges[r[i][j]];
/* Allocate. */
for (i = 0; i < n; i++)
{
relation_node *sp = NULL;
if (nedges[i] > 0)
/* Allocate. */
for (i = 0; i < n; i++)
{
relation_node *sp = NULL;
if (nedges[i] > 0)
- {
- sp = xnmalloc (nedges[i] + 1, sizeof *sp);
- sp[nedges[i]] = END_NODE;
- }
+
{
+
sp = xnmalloc (nedges[i] + 1, sizeof *sp);
+
sp[nedges[i]] = END_NODE;
+
}
new_R[i] = sp;
end_R[i] = sp;
}
new_R[i] = sp;
end_R[i] = sp;
}
@@
-163,7
+163,7
@@
relation_transpose (relation *R_arg, relation_node n)
for (i = 0; i < n; i++)
if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j)
for (i = 0; i < n; i++)
if (r[i])
for (j = 0; r[i][j] != END_NODE; ++j)
- *end_R[r[i][j]]++ = i;
+
*end_R[r[i][j]]++ = i;
free (nedges);
free (end_R);
free (nedges);
free (end_R);