Merge remote-tracking branch 'origin/maint'

[bison.git] / src / relation.c

diff --git a/src/relation.c b/src/relation.c
index da62af8fb0e8f68125db248a2c4a16a667f94baa..2d4215ecb62e1a357db92e273df651ec09e7cdff 100644 (file)
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,23 +1,24 @@
 /* Binary relations.
 /* Binary relations.

-   Copyright (C) 2002, 2004, 2005 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.
 
 
    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
    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
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

 #include "system.h"
 
 #include <bitsetv.h>
 #include "system.h"
 
 #include <bitsetv.h>


@@ -35,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);


@@ -69,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]);

       }
 }
 
       }
 }
 


@@ -143,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;
     }


@@ -162,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);