Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index c5c262726eb25ed713a7d469657fe4a45d78d294..1fbc5cbbfa7658764f63ecd0fa1e51c2a83d1790 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,23 +1,22 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2007, 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 <config.h>
 #include "system.h"


@@ -25,7 +24,6 @@
 #include "complain.h"
 #include "symlist.h"
 
 #include "complain.h"
 #include "symlist.h"
 

-

 /*--------------------------------------.
 | Create a list containing SYM at LOC.  |
 `--------------------------------------*/
 /*--------------------------------------.
 | Create a list containing SYM at LOC.  |
 `--------------------------------------*/


@@ -37,7 +35,7 @@ symbol_list_sym_new (symbol *sym, location loc)
 
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
 
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;

-  res->location = loc;
+  res->location = res->sym_loc = loc;

 
   res->midrule = NULL;
   res->midrule_parent_rule = NULL;
 
   res->midrule = NULL;
   res->midrule_parent_rule = NULL;


@@ -49,6 +47,8 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->dprec = 0;
   res->merger = 0;
 
   res->dprec = 0;
   res->merger = 0;
 

+  res->named_ref = NULL;
+

   res->next = NULL;
 
   return res;
   res->next = NULL;
 
   return res;


@@ -65,8 +65,13 @@ symbol_list_type_new (uniqstr type_name, location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_TYPE;
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_TYPE;

-  res->content.type_name = type_name;
-  res->location = loc;
+  res->content.sem_type = xmalloc (sizeof (semantic_type));
+  res->content.sem_type->tag = type_name;
+  res->content.sem_type->location = loc;
+  res->content.sem_type->status = undeclared;
+
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;

   res->next = NULL;
 
   return res;
   res->next = NULL;
 
   return res;


@@ -83,7 +88,8 @@ symbol_list_default_tagged_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGGED;
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGGED;

-  res->location = loc;
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;

   res->next = NULL;
 
   return res;
   res->next = NULL;
 
   return res;


@@ -100,7 +106,8 @@ symbol_list_default_tagless_new (location loc)
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGLESS;
   symbol_list *res = xmalloc (sizeof *res);
 
   res->content_type = SYMLIST_DEFAULT_TAGLESS;

-  res->location = loc;
+  res->location = res->sym_loc = loc;
+  res->named_ref = NULL;

   res->next = NULL;
 
   return res;
   res->next = NULL;
 
   return res;


@@ -119,7 +126,7 @@ symbol_list_syms_print (const symbol_list *l, FILE *f)
       symbol_print (l->content.sym, f);
       fprintf (stderr, l->action_props.is_value_used ? " used" : " unused");
       if (l && l->content.sym)
       symbol_print (l->content.sym, f);
       fprintf (stderr, l->action_props.is_value_used ? " used" : " unused");
       if (l && l->content.sym)

-       fprintf (f, ", ");
+        fprintf (f, ", ");

     }
 }
 
     }
 }
 


@@ -143,7 +150,13 @@ symbol_list_prepend (symbol_list *list, symbol_list *node)
 void
 symbol_list_free (symbol_list *list)
 {
 void
 symbol_list_free (symbol_list *list)
 {

-  LIST_FREE (symbol_list, list);
+  symbol_list *node, *next;
+  for (node = list; node; node = next)
+    {
+      next = node->next;
+      named_ref_free (node->named_ref);
+      free (node);
+    }

 }
 
 
 }
 
 


@@ -180,7 +193,7 @@ symbol_list_n_get (symbol_list *l, int n)
       l = l->next;
       if (l == NULL
           || (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))
       l = l->next;
       if (l == NULL
           || (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))

-       return NULL;
+        return NULL;

     }
 
   return l;
     }
 
   return l;


@@ -198,61 +211,47 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
   l = symbol_list_n_get (l, n);
   if (!l)
     {
   l = symbol_list_n_get (l, n);
   if (!l)
     {

-      complain_at (loc, _("invalid $ value: $%d"), n);
+      complain_at (loc, complaint, _("invalid $ value: $%d"), n);

       return NULL;
     }
   aver (l->content_type == SYMLIST_SYMBOL);
   return l->content.sym->type_name;
 }
 
       return NULL;
     }
   aver (l->content_type == SYMLIST_SYMBOL);
   return l->content.sym->type_name;
 }
 

-
-void
-symbol_list_destructor_set (symbol_list *node, char const *code,
-                            location loc)
+bool
+symbol_list_null (symbol_list *node)

 {
 {

-  code_props destructor;
-  code_props_symbol_action_init (&destructor, code, loc);
-  code_props_translate_code (&destructor);
-  code = destructor.code;
-  switch (node->content_type)
-    {
-      case SYMLIST_SYMBOL:
-        symbol_destructor_set (node->content.sym, code, loc);
-        break;
-      case SYMLIST_TYPE:
-        semantic_type_destructor_set (
-          semantic_type_get (node->content.type_name), code, loc);
-        break;
-      case SYMLIST_DEFAULT_TAGGED:
-        default_tagged_destructor_set (code, loc);
-        break;
-      case SYMLIST_DEFAULT_TAGLESS:
-        default_tagless_destructor_set (code, loc);
-        break;
-    }
+  return !node ||
+    (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));

 }
 
 void
 }
 
 void

-symbol_list_printer_set (symbol_list *node, char const *code, location loc)
+symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+                            location loc, char const *code)

 {
 {

-  code_props printer;
-  code_props_symbol_action_init (&printer, code, loc);
-  code_props_translate_code (&printer);
-  code = printer.code;
+  code_props cprops;
+  code_props_symbol_action_init (&cprops, code, loc);
+  code_props_translate_code (&cprops);

   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:
   switch (node->content_type)
     {
       case SYMLIST_SYMBOL:

-        symbol_printer_set (node->content.sym, code, loc);
+        symbol_code_props_set (node->content.sym, kind, &cprops);
+        if (node->content.sym->status == undeclared)
+          node->content.sym->status = used;

         break;
       case SYMLIST_TYPE:
         break;
       case SYMLIST_TYPE:

-        semantic_type_printer_set (
-          semantic_type_get (node->content.type_name), code, loc);
+        semantic_type_code_props_set
+          (semantic_type_get (node->content.sem_type->tag,
+                              &node->content.sem_type->location),
+           kind, &cprops);
+        if (node->content.sem_type->status == undeclared)
+          node->content.sem_type->status = used;

         break;
       case SYMLIST_DEFAULT_TAGGED:
         break;
       case SYMLIST_DEFAULT_TAGGED:

-        default_tagged_printer_set (code, loc);
+        default_tagged_code_props_set (kind, &cprops);

         break;
       case SYMLIST_DEFAULT_TAGLESS:
         break;
       case SYMLIST_DEFAULT_TAGLESS:

-        default_tagless_printer_set (code, loc);
+        default_tagless_code_props_set (kind, &cprops);

         break;
     }
 }
         break;
     }
 }