X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7b21ee09daf2163a7195637028d0c167005140aa..a17187e56386747a9b4d9633c3d116c2087f2b8b:/src/relation.c?ds=sidebyside
diff --git a/src/relation.c b/src/relation.c
index 9e2c2bd4..2d4215ec 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,23 +1,24 @@
/* Binary relations.
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+
+ Copyright (C) 2002, 2004-2005, 2009-2012 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
#include
@@ -35,8 +36,8 @@ relation_print (relation r, relation_node size, FILE *out)
{
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);
@@ -69,25 +70,25 @@ traverse (relation_node i)
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 (;;)
{
- 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]);
}
}
@@ -123,6 +124,7 @@ relation_digraph (relation r, relation_node size, bitsetv *function)
void
relation_transpose (relation *R_arg, relation_node n)
{
+ relation r = *R_arg;
/* The result. */
relation new_R = xnmalloc (n, sizeof *new_R);
/* END_R[I] -- next entry of NEW_R[I]. */
@@ -135,44 +137,41 @@ relation_transpose (relation *R_arg, relation_node n)
if (trace_flag & trace_sets)
{
fputs ("relation_transpose: input\n", stderr);
- relation_print (*R_arg, n, stderr);
+ relation_print (r, n, stderr);
}
/* Count. */
for (i = 0; i < n; i++)
- if ((*R_arg)[i])
- for (j = 0; (*R_arg)[i][j] != END_NODE; ++j)
- ++nedges[(*R_arg)[i][j]];
+ if (r[i])
+ for (j = 0; r[i][j] != END_NODE; ++j)
+ ++nedges[r[i][j]];
/* 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;
}
/* Store. */
for (i = 0; i < n; i++)
- if ((*R_arg)[i])
- for (j = 0; (*R_arg)[i][j] != END_NODE; ++j)
- {
- *end_R[(*R_arg)[i][j]] = i;
- ++end_R[(*R_arg)[i][j]];
- }
+ if (r[i])
+ for (j = 0; r[i][j] != END_NODE; ++j)
+ *end_R[r[i][j]]++ = i;
free (nedges);
free (end_R);
/* Free the input: it is replaced with the result. */
for (i = 0; i < n; i++)
- free ((*R_arg)[i]);
- free (*R_arg);
+ free (r[i]);
+ free (r);
if (trace_flag & trace_sets)
{