Regenerate.

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 106db46cb2f5f662f0fcd3937fc4fd8356334b8d..d91c3fca631dbb8fc4210e67f4f8d00a4f89b67a 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"


@@ -30,52 +31,98 @@
 `--------------------------------------*/
 
 symbol_list *
 `--------------------------------------*/
 
 symbol_list *

-symbol_list_new (symbol *sym, location loc)
+symbol_list_sym_new (symbol *sym, location loc)

 {
   symbol_list *res = xmalloc (sizeof *res);
 {
   symbol_list *res = xmalloc (sizeof *res);

-  res->next = NULL;
-  res->sym = sym;
+
+  res->content_type = SYMLIST_SYMBOL;
+  res->content.sym = sym;

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

+
+  res->midrule = NULL;
+  res->midrule_parent_rule = NULL;
+  res->midrule_parent_rhs_index = 0;
+

   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;
+}
+
+
+/*--------------------------------------------.
+| Create a list containing TYPE_NAME at LOC.  |
+`--------------------------------------------*/
+
+symbol_list *
+symbol_list_type_new (uniqstr type_name, location loc)
+{
+  symbol_list *res = xmalloc (sizeof *res);
+
+  res->content_type = SYMLIST_TYPE;
+  res->content.type_name = type_name;
+  res->location = loc;
+  res->next = NULL;
+
+  return res;
+}
+
+
+/*----------------------------------------------------.
+| Create a list containing a %symbol-default at LOC.  |
+`----------------------------------------------------*/
+
+symbol_list *
+symbol_list_default_new (location loc)
+{
+  symbol_list *res = xmalloc (sizeof *res);
+
+  res->content_type = SYMLIST_DEFAULT;
+  res->location = loc;
+  res->next = NULL;
+

   return res;
 }
 
 
   return res;
 }
 
 

-/*------------------.
-| Print this list.  |
-`------------------*/
+/*-----------------------------------------------------------------------.
+| Print this list, for which every content_type must be SYMLIST_SYMBOL.  |
+`-----------------------------------------------------------------------*/

 
 void
 
 void

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

 {
 {

-  for (/* Nothing. */; l && l->sym; l = l->next)
+  for (/* Nothing. */; l && l->content.sym; l = l->next)

     {
     {

-      symbol_print (l->sym, f);
-      if (l && l->sym)
-       fputc (' ', f);
+      symbol_print (l->content.sym, f);
+      fprintf (stderr, l->used ? " used" : " unused");
+      if (l && l->content.sym)
+       fprintf (f, ", ");

     }
 }
 
 
     }
 }
 
 

-/*---------------------------------.
-| Prepend SYM at LOC to the LIST.  |
-`---------------------------------*/
+/*---------------------------.
+| Prepend NODE to the LIST.  |
+`---------------------------*/

 
 symbol_list *
 
 symbol_list *

-symbol_list_prepend (symbol_list *list, symbol *sym, location loc)
+symbol_list_prepend (symbol_list *list, symbol_list *node)

 {
 {

-  symbol_list *res = symbol_list_new (sym, loc);
-  res->next = list;
-  return res;
+  node->next = list;
+  return node;

 }
 
 
 }
 
 

-/*-------------------------------------------------.
-| Free the LIST, but not the symbols it contains.  |
-`-------------------------------------------------*/
+/*-----------------------------------------------.
+| Free the LIST, but not the items it contains.  |
+`-----------------------------------------------*/

 
 void
 symbol_list_free (symbol_list *list)
 
 void
 symbol_list_free (symbol_list *list)


@@ -88,44 +135,106 @@ symbol_list_free (symbol_list *list)
 | Return its length.  |
 `--------------------*/
 
 | Return its length.  |
 `--------------------*/
 

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

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

-  for (/* Nothing. */; list; list = list->next)
+  for (/* Nothing. */;
+       l && !(l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL);
+       l = l->next)

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

+/*------------------------------.
+| Get item 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->content_type == SYMLIST_SYMBOL && l->content.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;
     }

+  assert (l->content_type == SYMLIST_SYMBOL);
+  return l->content.sym->type_name;
+}
+
+
+/*--------------------------------------.
+| The item N in symbol list L is USED.  |
+`--------------------------------------*/

 
 

-  i = 0;
+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;
+}

 
 

-  while (i < n)
+void
+symbol_list_destructor_set (symbol_list *node, const char *destructor,
+                            location loc)
+{
+  switch (node->content_type)

     {
     {

-      rp = rp->next;
-      if (rp == NULL || rp->sym == NULL)
-       {
-         complain_at (loc, _("invalid $ value: $%d"), n);
-         return NULL;
-       }
-      ++i;
+      case SYMLIST_SYMBOL:
+        symbol_destructor_set (node->content.sym, destructor, loc);
+        break;
+      case SYMLIST_TYPE:
+        semantic_type_destructor_set (
+          semantic_type_get (node->content.type_name), destructor, loc);
+        break;
+      case SYMLIST_DEFAULT:
+        default_destructor_set (destructor, loc);
+        break;

     }
     }

+}

 
 

-  return rp->sym->type_name;
+void
+symbol_list_printer_set (symbol_list *node, const char *printer, location loc)
+{
+  switch (node->content_type)
+    {
+      case SYMLIST_SYMBOL:
+        symbol_printer_set (node->content.sym, printer, loc);
+        break;
+      case SYMLIST_TYPE:
+        semantic_type_printer_set (
+          semantic_type_get (node->content.type_name), printer, loc);
+        break;
+      case SYMLIST_DEFAULT:
+        default_printer_set (printer, loc);
+        break;
+    }

 }
 }