style: use %code for local function declarations in our parser

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index cff87d7c031c8951e93b223117438c24d78612f9..f6cc3c5d87a86a4fc86a90c9025cb8170e01daee 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,31 +1,30 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

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

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

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #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"


@@ -47,116 +46,83 @@ 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 const *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 const *r)

 {
 {

-  return r->number >= nrules;
+  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 const *r)

 {
 {

-  return !r->useful && r->number < nrules;
+  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
 void

-rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
+rule_lhs_print (rule const *r, symbol const *previous_lhs, FILE *out)

 {
   fprintf (out, "  %3d ", r->number);
   if (previous_lhs != r->lhs)
 {
   fprintf (out, "  %3d ", r->number);
   if (previous_lhs != r->lhs)

-    {
-      fprintf (out, "%s:", r->lhs->tag);
-    }
+    fprintf (out, "%s:", r->lhs->tag);

   else
   else

-    {
-      int n;
-      for (n = strlen (previous_lhs->tag); n > 0; --n)
-       fputc (' ', out);
-      fputc ('|', out);
-    }
+    fprintf (out, "%*s|", (int) strlen (previous_lhs->tag), "");

 }
 
 }
 

+void
+rule_lhs_print_xml (rule const *r, FILE *out, int level)
+{
+  xml_printf (out, level, "<lhs>%s</lhs>", r->lhs->tag);
+}

 
 

-/*--------------------------------------.
-| Return the number of symbols in RHS.  |
-`--------------------------------------*/
-
-int
-rule_rhs_length (rule *r)
+size_t
+rule_rhs_length (rule const *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
 void

-rule_rhs_print (rule *r, FILE *out)
+rule_rhs_print (rule const *r, FILE *out)

 {
 {

-  if (*r->rhs >= 0)
+  if (0 <= *r->rhs)

     {
       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);
-      fputc ('\n', out);
+        fprintf (out, " %s", symbols[*rp]->tag);

     }
   else
     }
   else

-    {
-      fprintf (out, " /* %s */\n", _("empty"));
-    }
+    fputs (" %empty", out);

 }
 
 }
 

-
-/*-------------------------.
-| Print this rule on OUT.  |
-`-------------------------*/
-
-void
-rule_print (rule *r, FILE *out)
+static void
+rule_rhs_print_xml (rule const *r, FILE *out, int level)

 {
 {

-  fprintf (out, "%s:", r->lhs->tag);
-  rule_rhs_print (r, out);
+  if (*r->rhs >= 0)
+    {
+      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_puts (out, level, "</rhs>");
+    }
+  else
+    {
+      xml_puts (out, level, "<rhs>");
+      xml_puts (out, level + 1, "<empty/>");
+      xml_puts (out, level, "</rhs>");
+    }

 }
 
 }
 

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

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


@@ -170,11 +136,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)
 {


@@ -185,20 +146,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;


@@ -208,43 +164,71 @@ 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);

+      fprintf (out, "\n");

       previous_lhs = rules[r].lhs;
     }
   if (!first)
     fputs ("\n\n", out);
 }
 
       previous_lhs = rules[r].lhs;
     }
   if (!first)
     fputs ("\n\n", out);
 }
 

-
-/*------------------------------------------.
-| Print the grammar's useful rules on OUT.  |
-`------------------------------------------*/
-

 void
 grammar_rules_print (FILE *out)
 {
 void
 grammar_rules_print (FILE *out)
 {

-  grammar_rules_partial_print (out, _("Grammar"), rule_useful_p);
+  grammar_rules_partial_print (out, _("Grammar"), rule_useful_in_grammar_p);

 }
 
 }
 

+void
+grammar_rules_print_xml (FILE *out, int level)
+{
+  rule_number r;
+  bool first = true;

 
 

-/*-------------------.
-| Dump the grammar.  |
-`-------------------*/
+  for (r = 0; r < nrules + nuseless_productions; r++)
+    {
+      if (first)
+        xml_puts (out, level + 1, "<rules>");
+      first = false;
+      {
+        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>");
+    }
+  if (!first)
+    xml_puts (out, level + 1, "</rules>");
+  else
+   xml_puts (out, level + 1, "<rules/>");
+}

 
 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");


@@ -254,37 +238,39 @@ 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, "Rules\n-----\n\n");
   {
     rule_number i;
     fprintf (out, "\n\n");
   }
 
   fprintf (out, "Rules\n-----\n\n");
   {
     rule_number i;

-    fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
+    fprintf (out,
+             "Num (Prec, Assoc, Useful, Ritem Range) Lhs"
+             " -> Rhs (Ritem range) [Num]\n");

     for (i = 0; i < nrules + nuseless_productions; i++)
       {
     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 const *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");


@@ -294,39 +280,28 @@ 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  %s:", r, rules[r].lhs->tag);
+        rule_rhs_print (&rules[r], out);
+        fprintf (out, "\n");

       }
   }
   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);
-      }
+      complain (&rules[r].location, Wother, "%s", message);

 }
 
 void
 grammar_free (void)
 {
 }
 
 void
 grammar_free (void)
 {

-  free (ritem);
+  if (ritem)
+    free (ritem - 1);

   free (rules);
   free (token_translations);
   /* Free the symbol table data structure.  */
   free (rules);
   free (token_translations);
   /* Free the symbol table data structure.  */