src/location.h: #include "system.h" rather than <stdbool.h>.

[bison.git] / src / symlist.c

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

-   Copyright (C) 2002  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.
 


@@ -15,39 +16,68 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 

+#include <config.h>

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

+
+#include "complain.h"

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

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

 
 

-symbol_list_t *
-symbol_list_new (symbol_t *sym, location_t location)
+symbol_list *
+symbol_list_new (symbol *sym, location loc)

 {
 {

-  symbol_list_t *res = XMALLOC (symbol_list_t, 1);
-  res->next = NULL;
+  symbol_list *res = xmalloc (sizeof *res);
+

   res->sym = sym;
   res->sym = sym;

-  res->location = location;
+  res->location = loc;
+
+  res->midrule = NULL;
+

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

+  res->used = false;
+

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

+  res->dprec = 0;
+  res->merger = 0;
+
+  res->next = NULL;
+

   return res;
 }
 
 
   return res;
 }
 
 

-/*-----------------------------------------.
-| Prepend SYMBOL at LOCATION to the LIST.  |
-`-----------------------------------------*/
+/*------------------.
+| Print this list.  |
+`------------------*/
+
+void
+symbol_list_print (const symbol_list *l, FILE *f)
+{
+  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, ", ");
+    }
+}
+
+
+/*---------------------------------.
+| Prepend SYM at LOC to the LIST.  |
+`---------------------------------*/

 
 

-symbol_list_t *
-symbol_list_prepend (symbol_list_t *list,
-                    symbol_t *symbol, location_t location)
+symbol_list *
+symbol_list_prepend (symbol_list *list, symbol *sym, location loc)

 {
 {

-  symbol_list_t *res = symbol_list_new (symbol, location);
+  symbol_list *res = symbol_list_new (sym, loc);

   res->next = list;
   return res;
 }
   res->next = list;
   return res;
 }


@@ -58,9 +88,9 @@ symbol_list_prepend (symbol_list_t *list,
 `-------------------------------------------------*/
 
 void
 `-------------------------------------------------*/
 
 void

-symbol_list_free (symbol_list_t *list)
+symbol_list_free (symbol_list *list)

 {
 {

-  LIST_FREE (symbol_list_t, list);
+  LIST_FREE (symbol_list, list);

 }
 
 
 }
 
 


@@ -69,45 +99,64 @@ symbol_list_free (symbol_list_t *list)
 `--------------------*/
 
 unsigned int
 `--------------------*/
 
 unsigned int

-symbol_list_length (symbol_list_t *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 the data type (alternative in the union) of the value for |
-| symbol N in rule RULE.                                        |
-`--------------------------------------------------------------*/
+/*--------------------------------.
+| Get symbol N in symbol list L.  |
+`--------------------------------*/

 
 

-char *
-symbol_list_n_type_name_get (symbol_list_t *rule, location_t location, int n)
+symbol_list *
+symbol_list_n_get (symbol_list *l, int n)

 {
   int i;
 {
   int i;

-  symbol_list_t *rp;

 
   if (n < 0)
 
   if (n < 0)

+    return NULL;
+
+  for (i = 0; i < n; ++i)

     {
     {

-      complain_at (location, _("invalid $ value"));
-      return NULL;
+      l = l->next;
+      if (l == NULL || l->sym == NULL)
+       return NULL;

     }
 
     }
 

-  rp = rule;
-  i = 0;
+  return l;
+}
+
+
+/*--------------------------------------------------------------.
+| Get the data type (alternative in the union) of the value for |
+| symbol N in symbol list L.                                    |
+`--------------------------------------------------------------*/

 
 

-  while (i < n)
+uniqstr
+symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
+{
+  l = symbol_list_n_get (l, n);
+  if (!l)

     {
     {

-      rp = rp->next;
-      if (rp == NULL || rp->sym == NULL)
-       {
-         complain_at (location, _("invalid $ value"));
-         return NULL;
-       }
-      ++i;
+      complain_at (loc, _("invalid $ value: $%d"), n);
+      return NULL;

     }
     }

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

 
 

-  return rp->sym->type_name;
+
+/*----------------------------------------.
+| The symbol N in symbol list L is USED.  |
+`----------------------------------------*/
+
+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;

 }
 }