Add it for real.

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 3615626117d2d031c15d6aa507521144d1623b2f..70db82f07cd8a04242cbdce0e41a1b1284540baf 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006 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,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include "complain.h"
 #include "system.h"
 
 #include "complain.h"


@@ -33,13 +34,21 @@ symbol_list *
 symbol_list_new (symbol *sym, location loc)
 {
   symbol_list *res = xmalloc (sizeof *res);
 symbol_list_new (symbol *sym, location loc)
 {
   symbol_list *res = xmalloc (sizeof *res);

-  res->next = NULL;
+

   res->sym = sym;
   res->location = loc;
   res->sym = sym;
   res->location = loc;

+
+  res->midrule = NULL;
+

   res->action = NULL;
   res->action = NULL;

+  res->used = false;
+

   res->ruleprec = NULL;
   res->dprec = 0;
   res->merger = 0;
   res->ruleprec = NULL;
   res->dprec = 0;
   res->merger = 0;

+
+  res->next = NULL;
+

   return res;
 }
 
   return res;
 }
 


@@ -49,10 +58,15 @@ symbol_list_new (symbol *sym, location loc)
 `------------------*/
 
 void
 `------------------*/
 
 void

-symbol_list_print (FILE *f, symbol_list *l)
+symbol_list_print (const symbol_list *l, FILE *f)

 {
 {

-  for (/* Nothing. */; l; l = l->next)
-    symbol_print (f, l->sym);
+  for (/* Nothing. */; l && l->sym; l = l->next)
+    {
+      symbol_print (l->sym, f);
+      fprintf (stderr, l->used ? " used" : " unused");
+      if (l && l->sym)
+       fprintf (f, ", ");
+    }

 }
 
 
 }
 
 


@@ -85,44 +99,64 @@ symbol_list_free (symbol_list *list)
 `--------------------*/
 
 unsigned int
 `--------------------*/
 
 unsigned int

-symbol_list_length (symbol_list *list)
+symbol_list_length (const symbol_list *l)

 {
   int res = 0;
 {
   int res = 0;

-  for (/* Nothing. */; list; list = list->next)
+  for (/* Nothing. */; l; l = l->next)

     ++res;
   return res;
 }
 
 
     ++res;
   return res;
 }
 
 

+/*--------------------------------.
+| Get symbol N in symbol list L.  |
+`--------------------------------*/
+
+symbol_list *
+symbol_list_n_get (symbol_list *l, int n)
+{
+  int i;
+
+  if (n < 0)
+    return NULL;
+
+  for (i = 0; i < n; ++i)
+    {
+      l = l->next;
+      if (l == NULL || l->sym == NULL)
+       return NULL;
+    }
+
+  return l;
+}
+
+

 /*--------------------------------------------------------------.
 | Get the data type (alternative in the union) of the value for |
 /*--------------------------------------------------------------.
 | Get the data type (alternative in the union) of the value for |

-| symbol N in symbol list RP.                                   |
+| symbol N in symbol list L.                                    |

 `--------------------------------------------------------------*/
 
 uniqstr
 `--------------------------------------------------------------*/
 
 uniqstr

-symbol_list_n_type_name_get (symbol_list *rp, location loc, int n)
+symbol_list_n_type_name_get (symbol_list *l, location loc, int n)

 {
 {

-  int i;
-
-  if (n < 0)
+  l = symbol_list_n_get (l, n);
+  if (!l)

     {
       complain_at (loc, _("invalid $ value: $%d"), n);
       return NULL;
     }
     {
       complain_at (loc, _("invalid $ value: $%d"), n);
       return NULL;
     }

+  return l->sym->type_name;
+}

 
 

-  i = 0;

 
 

-  while (i < n)
-    {
-      rp = rp->next;
-      if (rp == NULL || rp->sym == NULL)
-       {
-         complain_at (loc, _("invalid $ value: $%d"), n);
-         fprintf (stderr, "\n");
-         return NULL;
-       }
-      ++i;
-    }
+/*----------------------------------------.
+| The symbol N in symbol list L is USED.  |
+`----------------------------------------*/

 
 

-  return rp->sym->type_name;
+void
+symbol_list_n_used_set (symbol_list *l, int n, bool used)
+{
+  l = symbol_list_n_get (l, n);
+  if (l)
+    l->used = used;

 }
 }