maint: address syntax-check issues.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 84f7924458fb404ebce80d1017f8e8787e016eb8..46c8cd197eb0a70e9e5bcaf3bab65f87086ce2ca 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

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

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


@@ -21,13 +21,13 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

-#include <quotearg.h>
-
+#include "complain.h"
+#include "getargs.h"

 #include "gram.h"
 #include "gram.h"

+#include "print-xml.h"

 #include "reader.h"
 #include "reduce.h"
 #include "symtab.h"
 #include "reader.h"
 #include "reduce.h"
 #include "symtab.h"

-#include "print-xml.h"

 
 /* Comments for these variables are in gram.h.  */
 
 
 /* Comments for these variables are in gram.h.  */
 


@@ -46,46 +46,24 @@ symbol_number *token_translations = NULL;
 
 int max_user_token_number = 256;
 
 
 int max_user_token_number = 256;
 

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

 bool
 bool

-rule_useful_p (rule *r)
+rule_useful_in_grammar_p (rule *r)

 {
   return r->number < nrules;
 }
 
 {
   return r->number < nrules;
 }
 

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

 bool
 bool

-rule_useless_p (rule *r)
+rule_useless_in_grammar_p (rule *r)

 {
 {

-  return !rule_useful_p (r);
+  return !rule_useful_in_grammar_p (r);

 }
 
 }
 

-
-/*--------------------------------------------------------------------.
-| Return true IFF the rule is not flagged as useful *and* is useful.  |
-| In other words, it was discarded because of conflicts.              |
-`--------------------------------------------------------------------*/
-

 bool
 bool

-rule_never_reduced_p (rule *r)
+rule_useless_in_parser_p (rule *r)

 {
 {

-  return !r->useful && rule_useful_p (r);
+  return !r->useful && rule_useful_in_grammar_p (r);

 }
 
 }
 

-
-/*----------------------------------------------------------------.
-| Print this RULE's number and lhs on OUT.  If a PREVIOUS_LHS was |
-| already displayed (by a previous call for another rule), avoid  |
-| useless repetitions.                                            |
-`----------------------------------------------------------------*/
-

 void
 rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
 {
 void
 rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
 {


@@ -98,7 +76,7 @@ rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
     {
       int n;
       for (n = strlen (previous_lhs->tag); n > 0; --n)
     {
       int n;
       for (n = strlen (previous_lhs->tag); n > 0; --n)

-       fputc (' ', out);
+        fputc (' ', out);

       fputc ('|', out);
     }
 }
       fputc ('|', out);
     }
 }


@@ -109,26 +87,16 @@ rule_lhs_print_xml (rule *r, FILE *out, int level)
   xml_printf (out, level, "<lhs>%s</lhs>", r->lhs->tag);
 }
 
   xml_printf (out, level, "<lhs>%s</lhs>", r->lhs->tag);
 }
 

-
-/*--------------------------------------.
-| Return the number of symbols in RHS.  |
-`--------------------------------------*/
-
-int
+size_t

 rule_rhs_length (rule *r)
 {
 rule_rhs_length (rule *r)
 {

-  int res = 0;
+  size_t res = 0;

   item_number *rhsp;
   for (rhsp = r->rhs; *rhsp >= 0; ++rhsp)
     ++res;
   return res;
 }
 
   item_number *rhsp;
   for (rhsp = r->rhs; *rhsp >= 0; ++rhsp)
     ++res;
   return res;
 }
 

-
-/*-------------------------------.
-| Print this rule's RHS on OUT.  |
-`-------------------------------*/
-

 void
 rule_rhs_print (rule *r, FILE *out)
 {
 void
 rule_rhs_print (rule *r, FILE *out)
 {


@@ -136,7 +104,7 @@ rule_rhs_print (rule *r, FILE *out)
     {
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
     {
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)

-       fprintf (out, " %s", symbols[*rp]->tag);
+        fprintf (out, " %s", symbols[*rp]->tag);

       fputc ('\n', out);
     }
   else
       fputc ('\n', out);
     }
   else


@@ -153,9 +121,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++)
       item_number *rp;
       xml_puts (out, level, "<rhs>");
       for (rp = r->rhs; *rp >= 0; rp++)

-       xml_printf (out, level + 1, "<symbol class=\"%s\">%s</symbol>",
-                   symbol_class_get_string (symbols[*rp]),
-                   xml_escape (symbols[*rp]->tag));
+        xml_printf (out, level + 1, "<symbol>%s</symbol>",
+                    xml_escape (symbols[*rp]->tag));

       xml_puts (out, level, "</rhs>");
     }
   else
       xml_puts (out, level, "</rhs>");
     }
   else


@@ -166,10 +133,6 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
     }
 }
 
     }
 }
 

-/*-------------------------.
-| Print this rule on OUT.  |
-`-------------------------*/
-

 void
 rule_print (rule *r, FILE *out)
 {
 void
 rule_print (rule *r, FILE *out)
 {


@@ -177,11 +140,6 @@ rule_print (rule *r, FILE *out)
   rule_rhs_print (r, out);
 }
 
   rule_rhs_print (r, out);
 }
 

-
-/*------------------------.
-| Dump RITEM for traces.  |
-`------------------------*/
-

 void
 ritem_print (FILE *out)
 {
 void
 ritem_print (FILE *out)
 {


@@ -195,11 +153,6 @@ ritem_print (FILE *out)
   fputs ("\n\n", out);
 }
 
   fputs ("\n\n", out);
 }
 

-
-/*------------------------------------------.
-| Return the size of the longest rule RHS.  |
-`------------------------------------------*/
-

 size_t
 ritem_longest_rhs (void)
 {
 size_t
 ritem_longest_rhs (void)
 {


@@ -210,20 +163,15 @@ ritem_longest_rhs (void)
     {
       int length = rule_rhs_length (&rules[r]);
       if (length > max)
     {
       int length = rule_rhs_length (&rules[r]);
       if (length > max)

-       max = length;
+        max = length;

     }
 
   return max;
 }
 
     }
 
   return max;
 }
 

-
-/*-----------------------------------------------------------------.
-| Print the grammar's rules that match FILTER on OUT under TITLE.  |
-`-----------------------------------------------------------------*/
-

 void
 grammar_rules_partial_print (FILE *out, const char *title,
 void
 grammar_rules_partial_print (FILE *out, const char *title,

-                            rule_filter filter)
+                             rule_filter filter)

 {
   rule_number r;
   bool first = true;
 {
   rule_number r;
   bool first = true;


@@ -233,11 +181,11 @@ grammar_rules_partial_print (FILE *out, const char *title,
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
       if (filter && !filter (&rules[r]))
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
       if (filter && !filter (&rules[r]))

-       continue;
+        continue;

       if (first)
       if (first)

-       fprintf (out, "%s\n\n", title);
+        fprintf (out, "%s\n\n", title);

       else if (previous_lhs && previous_lhs != rules[r].lhs)
       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);
       first = false;
       rule_lhs_print (&rules[r], previous_lhs, out);
       rule_rhs_print (&rules[r], out);


@@ -247,69 +195,56 @@ grammar_rules_partial_print (FILE *out, const char *title,
     fputs ("\n\n", out);
 }
 
     fputs ("\n\n", out);
 }
 

-
-/*----------------------------------------------------------.
-| Print the grammar's rules that match FILTER on OUT (XML). |
-`-----------------------------------------------------------*/
+void
+grammar_rules_print (FILE *out)
+{
+  grammar_rules_partial_print (out, _("Grammar"), rule_useful_in_grammar_p);
+}

 
 void
 
 void

-grammar_rules_partial_print_xml (FILE *out, int level, bool rtag,
-                                rule_filter filter)
+grammar_rules_print_xml (FILE *out, int level)

 {
   rule_number r;
   bool first = true;
 
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
 {
   rule_number r;
   bool first = true;
 
   for (r = 0; r < nrules + nuseless_productions; r++)
     {

-      if (filter && !filter (&rules[r]))
-       continue;
-      if (rtag && first)
-       xml_puts (out, level + 1, "<rules>");
+      if (first)
+        xml_puts (out, level + 1, "<rules>");

       first = false;
       first = false;

-
-      xml_printf (out, level + 2, "<rule number=\"%d\">",
-                 rules[r].number);
+      {
+        char const *usefulness;
+        if (rule_useless_in_grammar_p (&rules[r]))
+          usefulness = "useless-in-grammar";
+        else if (rule_useless_in_parser_p (&rules[r]))
+          usefulness = "useless-in-parser";
+        else
+          usefulness = "useful";
+        xml_indent (out, level + 2);
+        fprintf (out, "<rule number=\"%d\" usefulness=\"%s\"",
+                 rules[r].number, usefulness);
+        if (rules[r].precsym)
+          fprintf (out, " percent_prec=\"%s\"",
+                   xml_escape (rules[r].precsym->tag));
+        fputs (">\n", out);
+      }

       rule_lhs_print_xml (&rules[r], out, level + 3);
       rule_rhs_print_xml (&rules[r], out, level + 3);
       xml_puts (out, level + 2, "</rule>");
     }
       rule_lhs_print_xml (&rules[r], out, level + 3);
       rule_rhs_print_xml (&rules[r], out, level + 3);
       xml_puts (out, level + 2, "</rule>");
     }

-  if (rtag)
-    {
-      if (!first)
-       xml_puts (out, level + 1, "</rules>");
-      else
-       xml_puts (out, level + 1, "<rules/>");
-    }
-}
-
-/*------------------------------------------.
-| Print the grammar's useful rules on OUT.  |
-`------------------------------------------*/
-
-void
-grammar_rules_print (FILE *out)
-{
-  grammar_rules_partial_print (out, _("Grammar"), rule_useful_p);
-}
-
-void
-grammar_rules_print_xml (FILE *out, int level)
-{
-  grammar_rules_partial_print_xml (out, level, true, rule_useful_p);
+  if (!first)
+    xml_puts (out, level + 1, "</rules>");
+  else
+   xml_puts (out, level + 1, "<rules/>");

 }
 
 }
 

-
-/*-------------------.
-| Dump the grammar.  |
-`-------------------*/
-

 void
 grammar_dump (FILE *out, const char *title)
 {
   fprintf (out, "%s\n\n", title);
   fprintf (out,
 void
 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");
 
 
   fprintf (out, "Variables\n---------\n\n");


@@ -319,9 +254,9 @@ grammar_dump (FILE *out, const char *title)
 
     for (i = ntokens; i < nsyms; i++)
       fprintf (out, "%5d  %5d   %5d  %s\n",
 
     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");
   }
 
     fprintf (out, "\n\n");
   }
 


@@ -331,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++)
       {
     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");
       }
   }
   fprintf (out, "\n\n");


@@ -359,31 +294,26 @@ grammar_dump (FILE *out, const char *title)
     rule_number r;
     for (r = 0; r < nrules + nuseless_productions; r++)
       {
     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\n");
 }
 
       }
   }
   fprintf (out, "\n\n");
 }
 

-
-/*------------------------------------------------------------------.
-| Report on STDERR the rules that are not flagged USEFUL, using the |
-| MESSAGE (which can be `useless rule' when invoked after grammar   |
-| reduction, or `never reduced' after conflicts were taken into     |
-| account).                                                         |
-`------------------------------------------------------------------*/
-

 void
 void

-grammar_rules_never_reduced_report (const char *message)
+grammar_rules_useless_report (const char *message)

 {
   rule_number r;
   for (r = 0; r < nrules ; ++r)
     if (!rules[r].useful)
       {
 {
   rule_number r;
   for (r = 0; r < nrules ; ++r)
     if (!rules[r].useful)
       {

-       location_print (stderr, rules[r].location);
-       fprintf (stderr, ": %s: %s: ", _("warning"), message);
-       rule_print (&rules[r], stderr);
+        warn_at (rules[r].location, "%s: ", message);
+        if (warnings_flag & warnings_other)
+          {
+            rule_print (&rules[r], stderr);
+            fflush (stderr);
+          }

       }
 }
 
       }
 }