Output yylloc macro defn in glr.c even if locations are not being generated.

[bison.git] / src / relation.c

diff --git a/src/relation.c b/src/relation.c
index fc48c28f5092cdcc9fe3fef3adf4e0aa1d98a43a..8f97fa9903bda1ce2c9b8b1e11ceb1bcbc9eca92 100644 (file)
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,5 +1,5 @@
 /* Binary relations.
 /* Binary relations.

-   Copyright (C) 2002  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -19,21 +19,24 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
    Boston, MA 02111-1307, USA.  */
 
 #include "system.h"

-#include "bitsetv.h"
-#include "relation.h"
+
+#include <bitsetv.h>
+

 #include "getargs.h"
 #include "getargs.h"

+#include "relation.h"

 
 void
 
 void

-relation_print (relation_t relation, size_t size, FILE *out)
+relation_print (relation r, size_t size, FILE *out)

 {
 {

-  unsigned i, j;
+  unsigned int i;
+  unsigned int j;

 
   for (i = 0; i < size; ++i)
     {
       fprintf (out, "%3d: ", i);
 
   for (i = 0; i < size; ++i)
     {
       fprintf (out, "%3d: ", i);

-      if (relation[i])
-       for (j = 0; relation[i][j] != -1; ++j)
-         fprintf (out, "%3d ", relation[i][j]);
+      if (r[i])
+       for (j = 0; r[i][j] != -1; ++j)
+         fprintf (out, "%3d ", r[i][j]);

       fputc ('\n', out);
     }
   fputc ('\n', out);
       fputc ('\n', out);
     }
   fputc ('\n', out);


@@ -47,9 +50,9 @@ relation_print (relation_t relation, size_t size, FILE *out)
 | two.                                                           |
 `---------------------------------------------------------------*/
 
 | two.                                                           |
 `---------------------------------------------------------------*/
 

-static relation_t R;
-static relation_nodes_t INDEX;
-static relation_nodes_t VERTICES;
+static relation R;
+static relation_nodes INDEX;
+static relation_nodes VERTICES;

 static int top;
 static int infinity;
 static bitsetv F;
 static int top;
 static int infinity;
 static bitsetv F;


@@ -90,17 +93,16 @@ traverse (int i)
 
 
 void
 
 
 void

-relation_digraph (relation_t relation, size_t size,
-                 bitsetv *function)
+relation_digraph (relation r, size_t size, bitsetv *function)

 {
 {

-  unsigned i;
+  unsigned int i;

 
   infinity = size + 2;
 
   infinity = size + 2;

-  INDEX = XCALLOC (relation_node_t, size + 1);
-  VERTICES = XCALLOC (relation_node_t, size + 1);
+  CALLOC (INDEX, size + 1);
+  CALLOC (VERTICES, size + 1);

   top = 0;
 
   top = 0;
 

-  R = relation;
+  R = r;

   F = *function;
 
   for (i = 0; i < size; i++)
   F = *function;
 
   for (i = 0; i < size; i++)


@@ -122,17 +124,17 @@ relation_digraph (relation_t relation, size_t size,
 `-------------------------------------------*/
 
 void
 `-------------------------------------------*/
 
 void

-relation_transpose (relation_t *R_arg, int n)
+relation_transpose (relation *R_arg, int n)

 {
   /* The result. */
 {
   /* The result. */

-  relation_t new_R = XCALLOC (relation_nodes_t, n);
+  relation new_R = CALLOC (new_R, n);

   /* END_R[I] -- next entry of NEW_R[I]. */
   /* END_R[I] -- next entry of NEW_R[I]. */

-  relation_t end_R = XCALLOC (relation_nodes_t, n);
+  relation end_R = CALLOC (end_R, n);

   /* NEDGES[I] -- total size of NEW_R[I]. */
   /* NEDGES[I] -- total size of NEW_R[I]. */

-  int *nedges = XCALLOC (int, n);
+  int *nedges = CALLOC (nedges, n);

   int i, j;
 
   int i, j;
 

-  if (trace_flag)
+  if (trace_flag & trace_sets)

     {
       fputs ("relation_transpose: input\n", stderr);
       relation_print (*R_arg, n, stderr);
     {
       fputs ("relation_transpose: input\n", stderr);
       relation_print (*R_arg, n, stderr);


@@ -148,7 +150,7 @@ relation_transpose (relation_t *R_arg, int n)
   for (i = 0; i < n; i++)
     if (nedges[i] > 0)
       {
   for (i = 0; i < n; i++)
     if (nedges[i] > 0)
       {

-       relation_node_t *sp = XCALLOC (relation_node_t, nedges[i] + 1);
+       relation_node *sp = CALLOC (sp, nedges[i] + 1);

        sp[nedges[i]] = -1;
        new_R[i] = sp;
        end_R[i] = sp;
        sp[nedges[i]] = -1;
        new_R[i] = sp;
        end_R[i] = sp;


@@ -171,7 +173,7 @@ relation_transpose (relation_t *R_arg, int n)
     XFREE ((*R_arg)[i]);
   free (*R_arg);
 
     XFREE ((*R_arg)[i]);
   free (*R_arg);
 

-  if (trace_flag)
+  if (trace_flag & trace_sets)

     {
       fputs ("relation_transpose: output\n", stderr);
       relation_print (new_R, n, stderr);
     {
       fputs ("relation_transpose: output\n", stderr);
       relation_print (new_R, n, stderr);