(reduce_grammar): Remove unnecessary cast to bool.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index f02e132f635d8414efbbf866b58048310884c00b..0e0a8c21bebecb0588e8b20fdd628f00f0ea7452 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -36,9 +36,6 @@
 #include "symlist.h"
 #include "symtab.h"
 
 #include "symlist.h"
 #include "symtab.h"
 

-static void grammar_midrule_action (void);
-static void grammar_symbol_append (symbol *sym, location loc);
-

 static symbol_list *grammar = NULL;
 static bool start_flag = false;
 merger_list *merge_functions;
 static symbol_list *grammar = NULL;
 static bool start_flag = false;
 merger_list *merge_functions;


@@ -168,7 +165,7 @@ grammar_symbol_append (symbol *sym, location loc)
 
   grammar_end = p;
 
 
   grammar_end = p;
 

-  /* SYM = 0 stands for an end of rule, it is not an actual
+  /* A null SYM stands for an end of rule; it is not an actual

      part of it.  */
   if (sym)
     ++nritems;
      part of it.  */
   if (sym)
     ++nritems;


@@ -247,20 +244,22 @@ grammar_rule_check (const symbol_list *r)
        warn_at (r->location,
                 _("empty rule for typed nonterminal, and no action"));
     }
        warn_at (r->location,
                 _("empty rule for typed nonterminal, and no action"));
     }

-  
+

   /* Check that typed symbol values are used.  */
   {
   /* Check that typed symbol values are used.  */
   {

-    symbol_list *l = r;
+    symbol_list const *l = r;

     int n = 0;
     for (; l && l->sym; l = l->next, ++n)
       if (! (l->used
             || !l->sym->type_name
             /* The default action, $$ = $1, `uses' both.  */
     int n = 0;
     for (; l && l->sym; l = l->next, ++n)
       if (! (l->used
             || !l->sym->type_name
             /* The default action, $$ = $1, `uses' both.  */

-            || !r->action && (n == 0 || n == 1)))
-       if (n)
-         warn_at (r->location, _("unused value: $%d"), n);
-       else
-         warn_at (r->location, _("unset value: $$"));
+            || (!r->action && (n == 0 || n == 1))))
+       {
+         if (n)
+           warn_at (r->location, _("unused value: $%d"), n);
+         else
+           warn_at (r->location, _("unset value: $$"));
+       }

   }
 }
 
   }
 }