grammar: introduce %empty

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 196db4c855f29fa3b0803bef823158a67054d298..005d808b5a40a012791259566000065af0450adb 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-2007, 2009-2012 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,

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


@@ -36,19 +36,19 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
   res->location = res->sym_loc = loc;
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
   res->location = res->sym_loc = loc;

+  res->named_ref = NULL;

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

-  code_props_none_init (&res->action_props);
-
+  /* Members used for LHS only.  */

   res->ruleprec = NULL;
   res->ruleprec = NULL;

+  res->percent_empty_loc = empty_location;
+  code_props_none_init (&res->action_props);

   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;


@@ -85,12 +85,17 @@ symbol_list_type_new (uniqstr type_name, location loc)
 void
 symbol_list_syms_print (const symbol_list *l, FILE *f)
 {
 void
 symbol_list_syms_print (const symbol_list *l, FILE *f)
 {

+  char const *sep = "";

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

+      fputs (sep, f);
+      fputs (l->content_type == SYMLIST_SYMBOL ? "symbol: "
+             : l->content_type == SYMLIST_TYPE ? "type: "
+             : "invalid content_type: ",
+             f);

       symbol_print (l->content.sym, f);
       symbol_print (l->content.sym, f);

-      fprintf (stderr, l->action_props.is_value_used ? " used" : " unused");
-      if (l && l->content.sym)
-        fprintf (f, ", ");
+      fputs (l->action_props.is_value_used ? " used" : " unused", f);
+      sep = ", ";

     }
 }
 
     }
 }
 


@@ -107,6 +112,23 @@ symbol_list_prepend (symbol_list *list, symbol_list *node)
 }
 
 
 }
 
 

+/*-------------------------.
+| Append NODE to the LIST. |
+`-------------------------*/
+
+symbol_list *
+symbol_list_append (symbol_list *list, symbol_list *node)
+{
+  if (!list)
+    return node;
+  symbol_list *next = list;
+  while (next->next)
+    next = next->next;
+  next->next = node;
+  return list;
+}
+
+

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


@@ -119,6 +141,8 @@ symbol_list_free (symbol_list *list)
     {
       next = node->next;
       named_ref_free (node->named_ref);
     {
       next = node->next;
       named_ref_free (node->named_ref);

+      if (node->content_type == SYMLIST_TYPE)
+        free (node->content.sem_type);

       free (node);
     }
 }
       free (node);
     }
 }