Add Makevars.template, stamp-po.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 39045d76f800a47a857ffd38110f95a9f3f6c712..223b736d47dc0d49f12293ce90583710986c28cf 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,6 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003 Free Software
+   Foundation, Inc.

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


@@ -46,10 +47,6 @@ symbol_number *token_translations = NULL;
 
 int max_user_token_number = 256;
 
 
 int max_user_token_number = 256;
 

-int glr_parser = 0;
-int pure_parser = 0;
-
-

 /*--------------------------------------------------------------.
 | Return true IFF the rule has a `number' smaller than NRULES.  |
 `--------------------------------------------------------------*/
 /*--------------------------------------------------------------.
 | Return true IFF the rule has a `number' smaller than NRULES.  |
 `--------------------------------------------------------------*/


@@ -203,7 +200,7 @@ void
 grammar_rules_partial_print (FILE *out, const char *title,
                             rule_filter filter)
 {
 grammar_rules_partial_print (FILE *out, const char *title,
                             rule_filter filter)
 {

-  int r;
+  rule_number r;

   bool first = true;
   symbol *previous_lhs = NULL;
 
   bool first = true;
   symbol *previous_lhs = NULL;
 


@@ -270,11 +267,11 @@ grammar_dump (FILE *out, const char *title)
     for (i = 0; i < nrules + nuseless_productions; i++)
       {
        rule *rule_i = &rules[i];
     for (i = 0; i < nrules + nuseless_productions; i++)
       {
        rule *rule_i = &rules[i];

-       item_number *r = NULL;
+       item_number *rp = NULL;

        unsigned int rhs_itemno = rule_i->rhs - ritem;
        unsigned int rhs_count = 0;
        /* Find the last RHS index in ritems. */
        unsigned int rhs_itemno = rule_i->rhs - ritem;
        unsigned int rhs_count = 0;
        /* Find the last RHS index in ritems. */

-       for (r = rule_i->rhs; *r >= 0; ++r)
+       for (rp = rule_i->rhs; *rp >= 0; ++rp)

          ++rhs_count;
        fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
                 i,
          ++rhs_count;
        fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
                 i,


@@ -285,9 +282,9 @@ grammar_dump (FILE *out, const char *title)
                 rhs_itemno + rhs_count - 1,
                 rule_i->lhs->number);
        /* Dumped the RHS. */
                 rhs_itemno + rhs_count - 1,
                 rule_i->lhs->number);
        /* Dumped the RHS. */

-       for (r = rule_i->rhs; *r >= 0; r++)
-         fprintf (out, " %3d", *r);
-       fprintf (out, "  [%d]\n", item_number_as_rule_number (*r));
+       for (rp = rule_i->rhs; *rp >= 0; rp++)
+         fprintf (out, " %3d", *rp);
+       fprintf (out, "  [%d]\n", item_number_as_rule_number (*rp));

       }
   }
   fprintf (out, "\n\n");
       }
   }
   fprintf (out, "\n\n");


@@ -329,9 +326,9 @@ grammar_rules_never_reduced_report (const char *message)
 void
 grammar_free (void)
 {
 void
 grammar_free (void)
 {

-  free (ritem);
+  XFREE (ritem);

   free (rules);
   free (rules);

-  free (token_translations);
+  XFREE (token_translations);

   /* Free the symbol table data structure.  */
   symbols_free ();
   free_merger_functions ();
   /* Free the symbol table data structure.  */
   symbols_free ();
   free_merger_functions ();