xml: match DOT output and xml2dot.xsl processing

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 1fa981ec2c6c55db15a8f8ed0b79dbcd83e95d36..69ac8a1b574c9684cd49157ab9a25184839dbeeb 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,29 +1,27 @@
 /* Lists of symbols for Bison
 
 /* Lists of symbols for Bison
 

-   Copyright (C) 2002, 2005, 2006 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 "complain.h"
 
 #include <config.h>
 #include "system.h"
 
 #include "complain.h"

-#include "scan-code.h"

 #include "symlist.h"
 
 
 #include "symlist.h"
 
 


@@ -38,7 +36,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;


@@ -50,6 +48,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;


@@ -67,7 +67,8 @@ symbol_list_type_new (uniqstr type_name, location loc)
 
   res->content_type = SYMLIST_TYPE;
   res->content.type_name = type_name;
 
   res->content_type = SYMLIST_TYPE;
   res->content.type_name = type_name;

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

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


@@ -84,16 +85,17 @@ 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;
 }
 
 

-/*----------------------------------------.
-| Create a list containing a <!> at LOC.  |
-`----------------------------------------*/
+/*---------------------------------------.
+| Create a list containing a <> at LOC.  |
+`---------------------------------------*/

 
 symbol_list *
 symbol_list_default_tagless_new (location loc)
 
 symbol_list *
 symbol_list_default_tagless_new (location loc)


@@ -101,7 +103,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;


@@ -118,9 +121,7 @@ symbol_list_syms_print (const symbol_list *l, FILE *f)
   for (/* Nothing. */; l && l->content.sym; l = l->next)
     {
       symbol_print (l->content.sym, f);
   for (/* Nothing. */; l && l->content.sym; l = l->next)
     {
       symbol_print (l->content.sym, f);

-      fprintf (stderr,
-               code_props_is_value_used (l->action_props)
-               ? " used" : " unused");
+      fprintf (stderr, l->action_props.is_value_used ? " used" : " unused");

       if (l && l->content.sym)
        fprintf (f, ", ");
     }
       if (l && l->content.sym)
        fprintf (f, ", ");
     }


@@ -146,7 +147,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);
+    }

 }
 
 
 }
 
 


@@ -208,13 +215,16 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
   return l->content.sym->type_name;
 }
 
   return l->content.sym->type_name;
 }
 

+bool
+symbol_list_null (symbol_list *node)
+{
+  return !node ||
+    (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
+}

 
 void
 
 void

-symbol_list_destructor_set (symbol_list *node, const char *code, location loc)
+symbol_list_destructor_set (symbol_list *node, code_props const *destructor)

 {
 {

-  code_props destructor;
-  code_props_symbol_action_init (&destructor, code, loc);
-  code_props_translate_code (&destructor);

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


@@ -234,11 +244,8 @@ symbol_list_destructor_set (symbol_list *node, const char *code, location loc)
 }
 
 void
 }
 
 void

-symbol_list_printer_set (symbol_list *node, const char *code, location loc)
+symbol_list_printer_set (symbol_list *node, code_props const *printer)

 {
 {

-  code_props printer;
-  code_props_symbol_action_init (&printer, code, loc);
-  code_props_translate_code (&printer);

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