c++: style: use "unsigned", not "unsigned int"

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index e3795a945301edb211784b60f2f9e0fe4ca44dee..6efcc891413ab10e86b2b6e1454afd5149c1f1d5 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,
 
 /* Print information on generated parser, for bison,
 

-   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2012 Free
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015 Free

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


@@ -106,8 +106,11 @@ print_core (FILE *out, state *s)
       for (sp = rules[r].rhs; sp < sp1; sp++)
         fprintf (out, " %s", symbols[*sp]->tag);
       fputs (" .", out);
       for (sp = rules[r].rhs; sp < sp1; sp++)
         fprintf (out, " %s", symbols[*sp]->tag);
       fputs (" .", out);

-      for (/* Nothing */; *sp >= 0; ++sp)
-        fprintf (out, " %s", symbols[*sp]->tag);
+      if (0 <= *rules[r].rhs)
+        for (/* Nothing */; 0 <= *sp; ++sp)
+          fprintf (out, " %s", symbols[*sp]->tag);
+      else
+        fprintf (out, " %%empty");

 
       /* Display the lookahead tokens?  */
       if (report_flag & report_lookahead_tokens
 
       /* Display the lookahead tokens?  */
       if (report_flag & report_lookahead_tokens


@@ -206,7 +209,7 @@ print_errs (FILE *out, state *s)
 
 
 /*-------------------------------------------------------------------------.
 
 
 /*-------------------------------------------------------------------------.

-| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be `default').  |
+| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be 'default').  |

 | If not ENABLED, the rule is masked by a shift or a reduce (S/R and       |
 | R/R conflicts).                                                          |
 `-------------------------------------------------------------------------*/
 | If not ENABLED, the rule is masked by a shift or a reduce (S/R and       |
 | R/R conflicts).                                                          |
 `-------------------------------------------------------------------------*/


@@ -334,12 +337,13 @@ print_reductions (FILE *out, state *s)
   if (default_reduction)
     {
       char *default_reductions =
   if (default_reduction)
     {
       char *default_reductions =

-        muscle_percent_define_get ("lr.default-reductions");
+        muscle_percent_define_get ("lr.default-reduction");

       print_reduction (out, width, _("$default"), default_reduction, true);
       aver (STREQ (default_reductions, "most")
             || (STREQ (default_reductions, "consistent")
                 && default_reduction_only)
             || (reds->num == 1 && reds->rules[0]->number == 0));
       print_reduction (out, width, _("$default"), default_reduction, true);
       aver (STREQ (default_reductions, "most")
             || (STREQ (default_reductions, "consistent")
                 && default_reduction_only)
             || (reds->num == 1 && reds->rules[0]->number == 0));

+      (void) default_reduction_only;

       free (default_reductions);
     }
 }
       free (default_reductions);
     }
 }


@@ -370,7 +374,7 @@ static void
 print_state (FILE *out, state *s)
 {
   fputs ("\n\n", out);
 print_state (FILE *out, state *s)
 {
   fputs ("\n\n", out);

-  fprintf (out, _("state %d"), s->number);
+  fprintf (out, _("State %d"), s->number);

   fputc ('\n', out);
   print_core (out, s);
   print_actions (out, s);
   fputc ('\n', out);
   print_core (out, s);
   print_actions (out, s);


@@ -514,7 +518,7 @@ print_results (void)
   print_grammar (out);
 
   /* If the whole state item sets, not only the kernels, are wanted,
   print_grammar (out);
 
   /* If the whole state item sets, not only the kernels, are wanted,

-     `closure' will be run, which needs memory allocation/deallocation.   */
+     'closure' will be run, which needs memory allocation/deallocation.   */

   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */