Merge remote-tracking branch 'origin/maint'

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 76acceec15ff94710fcf7eb0378590f6f245549d..ef5353a6c4e241087b6df175ce8424f8cf3930b8 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,6 +1,6 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2011 Free Software
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2012 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,9 +21,8 @@
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "complain.h"
+#include "getargs.h"
 #include "gram.h"
 #include "print-xml.h"
 #include "reader.h"
@@ -77,7 +76,7 @@ rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
     {
       int n;
       for (n = strlen (previous_lhs->tag); n > 0; --n)
-       fputc (' ', out);
+        fputc (' ', out);
       fputc ('|', out);
     }
 }
@@ -88,10 +87,10 @@ rule_lhs_print_xml (rule *r, FILE *out, int level)
   xml_printf (out, level, "<lhs>%s</lhs>", r->lhs->tag);
 }
 
-int
+size_t
 rule_rhs_length (rule *r)
 {
-  int res = 0;
+  size_t res = 0;
   item_number *rhsp;
   for (rhsp = r->rhs; *rhsp >= 0; ++rhsp)
     ++res;
@@ -105,12 +104,11 @@ rule_rhs_print (rule *r, FILE *out)
     {
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
-       fprintf (out, " %s", symbols[*rp]->tag);
-      fputc ('\n', out);
+        fprintf (out, " %s", symbols[*rp]->tag);
     }
   else
     {
-      fprintf (out, " /* %s */\n", _("empty"));
+      fprintf (out, " /* %s */", _("empty"));
     }
 }
 
@@ -122,8 +120,8 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
       item_number *rp;
       xml_puts (out, level, "<rhs>");
       for (rp = r->rhs; *rp >= 0; rp++)
-       xml_printf (out, level + 1, "<symbol>%s</symbol>",
-                   xml_escape (symbols[*rp]->tag));
+        xml_printf (out, level + 1, "<symbol>%s</symbol>",
+                    xml_escape (symbols[*rp]->tag));
       xml_puts (out, level, "</rhs>");
     }
   else
@@ -134,7 +132,7 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
     }
 }
 
-void
+static void
 rule_print (rule *r, FILE *out)
 {
   fprintf (out, "%s:", r->lhs->tag);
@@ -164,7 +162,7 @@ ritem_longest_rhs (void)
     {
       int length = rule_rhs_length (&rules[r]);
       if (length > max)
-       max = length;
+        max = length;
     }
 
   return max;
@@ -172,7 +170,7 @@ ritem_longest_rhs (void)
 
 void
 grammar_rules_partial_print (FILE *out, const char *title,
-                            rule_filter filter)
+                             rule_filter filter)
 {
   rule_number r;
   bool first = true;
@@ -182,14 +180,15 @@ grammar_rules_partial_print (FILE *out, const char *title,
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
       if (filter && !filter (&rules[r]))
-       continue;
+        continue;
       if (first)
-       fprintf (out, "%s\n\n", title);
+        fprintf (out, "%s\n\n", title);
       else if (previous_lhs && previous_lhs != rules[r].lhs)
-       fputc ('\n', out);
+        fputc ('\n', out);
       first = false;
       rule_lhs_print (&rules[r], previous_lhs, out);
       rule_rhs_print (&rules[r], out);
+      fprintf (out, "\n");
       previous_lhs = rules[r].lhs;
     }
   if (!first)
@@ -211,7 +210,7 @@ grammar_rules_print_xml (FILE *out, int level)
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
       if (first)
-       xml_puts (out, level + 1, "<rules>");
+        xml_puts (out, level + 1, "<rules>");
       first = false;
       {
         char const *usefulness;
@@ -244,8 +243,8 @@ grammar_dump (FILE *out, const char *title)
 {
   fprintf (out, "%s\n\n", title);
   fprintf (out,
-          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
-          ntokens, nvars, nsyms, nrules, nritems);
+           "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
+           ntokens, nvars, nsyms, nrules, nritems);
 
 
   fprintf (out, "Variables\n---------\n\n");
@@ -255,9 +254,9 @@ grammar_dump (FILE *out, const char *title)
 
     for (i = ntokens; i < nsyms; i++)
       fprintf (out, "%5d  %5d   %5d  %s\n",
-              i,
-              symbols[i]->prec, symbols[i]->assoc,
-              symbols[i]->tag);
+               i,
+               symbols[i]->prec, symbols[i]->assoc,
+               symbols[i]->tag);
     fprintf (out, "\n\n");
   }
 
@@ -267,25 +266,25 @@ grammar_dump (FILE *out, const char *title)
     fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
     for (i = 0; i < nrules + nuseless_productions; i++)
       {
-       rule *rule_i = &rules[i];
-       item_number *rp = NULL;
-       unsigned int rhs_itemno = rule_i->rhs - ritem;
-       unsigned int rhs_count = 0;
-       /* Find the last RHS index in ritems. */
-       for (rp = rule_i->rhs; *rp >= 0; ++rp)
-         ++rhs_count;
-       fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
-                i,
-                rule_i->prec ? rule_i->prec->prec : 0,
-                rule_i->prec ? rule_i->prec->assoc : 0,
-                rule_i->useful,
-                rhs_itemno,
-                rhs_itemno + rhs_count - 1,
-                rule_i->lhs->number);
-       /* Dumped the RHS. */
-       for (rp = rule_i->rhs; *rp >= 0; rp++)
-         fprintf (out, " %3d", *rp);
-       fprintf (out, "  [%d]\n", item_number_as_rule_number (*rp));
+        rule *rule_i = &rules[i];
+        item_number *rp = NULL;
+        unsigned int rhs_itemno = rule_i->rhs - ritem;
+        unsigned int rhs_count = 0;
+        /* Find the last RHS index in ritems. */
+        for (rp = rule_i->rhs; *rp >= 0; ++rp)
+          ++rhs_count;
+        fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
+                 i,
+                 rule_i->prec ? rule_i->prec->prec : 0,
+                 rule_i->prec ? rule_i->prec->assoc : 0,
+                 rule_i->useful,
+                 rhs_itemno,
+                 rhs_itemno + rhs_count - 1,
+                 rule_i->lhs->number);
+        /* Dumped the RHS. */
+        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");
@@ -295,8 +294,9 @@ grammar_dump (FILE *out, const char *title)
     rule_number r;
     for (r = 0; r < nrules + nuseless_productions; r++)
       {
-       fprintf (out, "%-5d  ", r);
-       rule_print (&rules[r], out);
+        fprintf (out, "%-5d  ", r);
+        rule_print (&rules[r], out);
+        fprintf (out, "\n");
       }
   }
   fprintf (out, "\n\n");
@@ -305,14 +305,19 @@ grammar_dump (FILE *out, const char *title)
 void
 grammar_rules_useless_report (const char *message)
 {
-  rule_number r;
-  for (r = 0; r < nrules ; ++r)
-    if (!rules[r].useful)
-      {
-        warn_at (rules[r].location, "%s: ", message);
-        rule_print (&rules[r], stderr);
-        fflush (stderr);
-      }
+  warnings w = Wother;
+  if (warnings_flag & w)
+    {
+      rule_number r;
+      for (r = 0; r < nrules ; ++r)
+        if (!rules[r].useful)
+          {
+            complain_at (rules[r].location, w | silent, "%s: ", message);
+            rule_print (&rules[r], stderr);
+            warnings_print_categories (w);
+            fprintf (stderr, "\n");
+          }
+    }
 }
 
 void