* data/yacc.c (yytnamerr): Fix typo: local var should be of type

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index e394478dfc37b460230aac25210ae05877d65f28..28666b0c8cf4521770adabf08869257ea18c5fb4 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 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.
 


@@ -20,7 +20,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 <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>


@@ -65,7 +65,7 @@ rule_useful_p (rule *r)
 bool
 rule_useless_p (rule *r)
 {
 bool
 rule_useless_p (rule *r)
 {

-  return r->number >= nrules;
+  return !rule_useful_p (r);

 }
 
 
 }
 
 


@@ -77,7 +77,7 @@ rule_useless_p (rule *r)
 bool
 rule_never_reduced_p (rule *r)
 {
 bool
 rule_never_reduced_p (rule *r)
 {

-  return !r->useful && r->number < nrules;
+  return !r->useful && rule_useful_p (r);

 }
 
 
 }
 
 


@@ -269,7 +269,7 @@ grammar_dump (FILE *out, const char *title)
        rule *rule_i = &rules[i];
        item_number *rp = NULL;
        unsigned int rhs_itemno = rule_i->rhs - ritem;
        rule *rule_i = &rules[i];
        item_number *rp = NULL;
        unsigned int rhs_itemno = rule_i->rhs - ritem;

-       unsigned int rhs_count = 0;
+       unsigned int rhs_count = 0;

        /* Find the last RHS index in ritems. */
        for (rp = rule_i->rhs; *rp >= 0; ++rp)
          ++rhs_count;
        /* Find the last RHS index in ritems. */
        for (rp = rule_i->rhs; *rp >= 0; ++rp)
          ++rhs_count;


@@ -317,8 +317,7 @@ grammar_rules_never_reduced_report (const char *message)
     if (!rules[r].useful)
       {
        location_print (stderr, rules[r].location);
     if (!rules[r].useful)
       {
        location_print (stderr, rules[r].location);

-       fprintf (stderr, ": %s: %s: ",
-                _("warning"), message);
+       fprintf (stderr, ": %s: %s: ", _("warning"), message);

        rule_print (&rules[r], stderr);
       }
 }
        rule_print (&rules[r], stderr);
       }
 }


@@ -326,7 +325,8 @@ grammar_rules_never_reduced_report (const char *message)
 void
 grammar_free (void)
 {
 void
 grammar_free (void)
 {

-  free (ritem);
+  if (ritem)
+    free (ritem - 1);

   free (rules);
   free (token_translations);
   /* Free the symbol table data structure.  */
   free (rules);
   free (token_translations);
   /* Free the symbol table data structure.  */