Clean up recent patches a little.

Reported by Akim Demaille.
* doc/bison.texinfo (Understanding): Fix typos.
* src/print.c (print_reductions): Don't use negated variable.
(cherry picked from commit 379261b3fd4e799c37bda6d354e7b8fe582357a6)

diff --git a/ChangeLog b/ChangeLog
index d1c6c8af04f45ca1ddd49a5895e6f9eceb10de84..e784f9c1df31f00ae9a6e3f2ea89b79faf804c0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Clean up recent patches a little.
+       Reported by Akim Demaille.
+       * doc/bison.texinfo (Understanding): Fix typos.
+       * src/print.c (print_reductions): Don't use negated variable.
+

 2009-04-24  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        List accepted values for a %define enum variable with an invalid value.
 2009-04-24  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        List accepted values for a %define enum variable with an invalid value.

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 67a43008c93242334b81371d7d26070bc7088c5c..6adf2d5347206a3962a4cc1901f022acb305b964 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7473,8 +7473,8 @@ useless: STR;
 @command{bison} reports:
 
 @example
 @command{bison} reports:
 
 @example

-tmp.y: warning: 1 nonterminal useless in grammar
-tmp.y: warning: 1 rule useless in grammar
+calc.y: warning: 1 nonterminal useless in grammar
+calc.y: warning: 1 rule useless in grammar

 calc.y:11.1-7: warning: nonterminal useless in grammar: useless
 calc.y:11.10-12: warning: rule useless in grammar: useless: STR
 calc.y: conflicts: 7 shift/reduce
 calc.y:11.1-7: warning: nonterminal useless in grammar: useless
 calc.y:11.10-12: warning: rule useless in grammar: useless: STR
 calc.y: conflicts: 7 shift/reduce

diff --git a/src/print.c b/src/print.c
index 00e0149de621d32478d0ad7f3b1ceb9f8a63abbb..e240d6a313e13aaec2f232edaf6c61ec6a4c877a 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -245,7 +245,7 @@ print_reductions (FILE *out, state *s)
   rule *default_reduction = NULL;
   size_t width = 0;
   int i, j;
   rule *default_reduction = NULL;
   size_t width = 0;
   int i, j;

-  bool non_default_action = false;
+  bool default_reduction_only = true;

 
   if (reds->num == 0)
     return;
 
   if (reds->num == 0)
     return;


@@ -299,7 +299,7 @@ print_reductions (FILE *out, state *s)
        bool defaulted = false;
        bool count = bitset_test (no_reduce_set, i);
         if (count)
        bool defaulted = false;
        bool count = bitset_test (no_reduce_set, i);
         if (count)

-          non_default_action = true;
+          default_reduction_only = false;

 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))
 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))


@@ -308,7 +308,7 @@ print_reductions (FILE *out, state *s)
                {
                  if (reds->rules[j] != default_reduction)
                     {
                {
                  if (reds->rules[j] != default_reduction)
                     {

-                      non_default_action = true;
+                      default_reduction_only = false;

                       print_reduction (out, width,
                                        symbols[i]->tag,
                                        reds->rules[j], true);
                       print_reduction (out, width,
                                        symbols[i]->tag,
                                        reds->rules[j], true);


@@ -319,7 +319,7 @@ print_reductions (FILE *out, state *s)
                }
              else
                {
                }
              else
                {

-                  non_default_action = true;
+                  default_reduction_only = false;

                  if (defaulted)
                    print_reduction (out, width,
                                     symbols[i]->tag,
                  if (defaulted)
                    print_reduction (out, width,
                                     symbols[i]->tag,


@@ -339,7 +339,7 @@ print_reductions (FILE *out, state *s)
       print_reduction (out, width, _("$default"), default_reduction, true);
       aver (0 == strcmp (default_reductions, "all")
             || (0 == strcmp (default_reductions, "consistent")
       print_reduction (out, width, _("$default"), default_reduction, true);
       aver (0 == strcmp (default_reductions, "all")
             || (0 == strcmp (default_reductions, "consistent")

-                && !non_default_action)
+                && default_reduction_only)

             || (reds->num == 1 && reds->rules[0]->number == 0));
       free (default_reductions);
     }
             || (reds->num == 1 && reds->rules[0]->number == 0));
       free (default_reductions);
     }