Update.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 51aa94844dbd39dcb3a7c56510bc7416b2df8090..ebb7e7399e45ffe85438fdae31ab1fe0454a10a9 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -47,6 +47,40 @@ int glr_parser = 0;
 int pure_parser = 0;
 
 
+/*--------------------------------------------------------------.
+| Return true IFF the rule has a `number' smaller than NRULES.  |
+`--------------------------------------------------------------*/
+
+bool
+rule_useful_p (rule_t *r)
+{
+  return r->number < nrules;
+}
+
+
+/*-------------------------------------------------------------.
+| Return true IFF the rule has a `number' higher than NRULES.  |
+`-------------------------------------------------------------*/
+
+bool
+rule_useless_p (rule_t *r)
+{
+  return r->number >= nrules;
+}
+
+
+/*--------------------------------------------------------------------.
+| Return true IFF the rule is not flagged as useful *and* is useful.  |
+| In other words, it was discarded because of conflicts.              |
+`--------------------------------------------------------------------*/
+
+bool
+rule_never_reduced_p (rule_t *r)
+{
+  return !r->useful && r->number < nrules;
+}
+
+
 /*----------------------------------------------------------------.
 | Print this RULE's number and lhs on OUT.  If a PREVIOUS_LHS was |
 | already displayed (by a previous call for another rule), avoid  |
@@ -56,7 +90,7 @@ int pure_parser = 0;
 void
 rule_lhs_print (rule_t *rule, symbol_t *previous_lhs, FILE *out)
 {
-  fprintf (out, "  %3d ", rule->number - 1);
+  fprintf (out, "  %3d ", rule->number);
   if (previous_lhs != rule->lhs)
     {
       fprintf (out, "%s:", rule->lhs->tag);
@@ -132,7 +166,7 @@ ritem_print (FILE *out)
     if (ritem[i] >= 0)
       fprintf (out, "  %s", symbols[ritem[i]]->tag);
     else
-      fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
+      fprintf (out, "  (rule %d)\n", item_number_as_rule_number (ritem[i]));
   fputs ("\n\n", out);
 }
 
@@ -147,7 +181,7 @@ ritem_longest_rhs (void)
   int max = 0;
   rule_number_t r;
 
-  for (r = 1; r < nrules + 1; ++r)
+  for (r = 0; r < nrules; ++r)
     {
       int length = rule_rhs_length (&rules[r]);
       if (length > max)
@@ -158,29 +192,34 @@ ritem_longest_rhs (void)
 }
 
 
-/*----------------------------------------------------------------.
-| Print the grammar's rules numbers from BEGIN (inclusive) to END |
-| (exclusive) on OUT under TITLE.                                 |
-`----------------------------------------------------------------*/
+/*-----------------------------------------------------------------.
+| Print the grammar's rules that match FILTER on OUT under TITLE.  |
+`-----------------------------------------------------------------*/
 
 void
 grammar_rules_partial_print (FILE *out, const char *title,
-                            rule_number_t begin, rule_number_t end)
+                            rule_filter_t filter)
 {
   int r;
+  bool first = TRUE;
   symbol_t *previous_lhs = NULL;
 
   /* rule # : LHS -> RHS */
-  fprintf (out, "%s\n\n", title);
-  for (r = begin; r < end; r++)
+  for (r = 0; r < nrules + nuseless_productions; r++)
     {
-      if (previous_lhs && previous_lhs != rules[r].lhs)
+      if (filter && !filter (&rules[r]))
+       continue;
+      if (first)
+       fprintf (out, "%s\n\n", title);
+      else if (previous_lhs && previous_lhs != rules[r].lhs)
        fputc ('\n', out);
+      first = FALSE;
       rule_lhs_print (&rules[r], previous_lhs, out);
       rule_rhs_print (&rules[r], out);
       previous_lhs = rules[r].lhs;
     }
-  fputs ("\n\n", out);
+  if (!first)
+    fputs ("\n\n", out);
 }
 
 
@@ -191,7 +230,7 @@ grammar_rules_partial_print (FILE *out, const char *title,
 void
 grammar_rules_print (FILE *out)
 {
-  grammar_rules_partial_print (out, _("Grammar"), 1, nrules + 1);
+  grammar_rules_partial_print (out, _("Grammar"), rule_useful_p);
 }
 
 
@@ -225,26 +264,27 @@ grammar_dump (FILE *out, const char *title)
   {
     rule_number_t i;
     fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
-    for (i = 1; i < nrules + nuseless_productions + 1; i++)
+    for (i = 0; i < nrules + nuseless_productions; i++)
       {
        rule_t *rule = &rules[i];
        item_number_t *r = NULL;
-       int rhs_count = 0;
+       unsigned int rhs_itemno = rule->rhs - ritem;
+       unsigned int rhs_count = 0;
        /* Find the last RHS index in ritems. */
        for (r = rule->rhs; *r >= 0; ++r)
          ++rhs_count;
-       fprintf (out, "%3d (%2d, %2d, %2d, %2d-%2d)   %2d ->",
-                i - 1,
+       fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
+                i,
                 rule->prec ? rule->prec->prec : 0,
                 rule->prec ? rule->prec->assoc : 0,
                 rule->useful,
-                rule->rhs - ritem,
-                rule->rhs - ritem + rhs_count - 1,
+                rhs_itemno,
+                rhs_itemno + rhs_count - 1,
                 rule->lhs->number);
        /* Dumped the RHS. */
        for (r = rule->rhs; *r >= 0; r++)
          fprintf (out, " %3d", *r);
-       fprintf (out, "  [%d]\n", -(*r) - 1);
+       fprintf (out, "  [%d]\n", item_number_as_rule_number (*r));
       }
   }
   fprintf (out, "\n\n");
@@ -252,7 +292,7 @@ grammar_dump (FILE *out, const char *title)
   fprintf (out, "Rules interpreted\n-----------------\n\n");
   {
     rule_number_t r;
-    for (r = 1; r < nrules + nuseless_productions + 1; r++)
+    for (r = 0; r < nrules + nuseless_productions; r++)
       {
        fprintf (out, "%-5d  ", r);
        rule_print (&rules[r], out);
@@ -262,11 +302,32 @@ grammar_dump (FILE *out, const char *title)
 }
 
 
+/*------------------------------------------------------------------.
+| 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
+grammar_rules_never_reduced_report (const char *message)
+{
+  rule_number_t 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);
+      }
+}
+
 void
 grammar_free (void)
 {
   XFREE (ritem);
-  free (rules + 1);
+  free (rules);
   XFREE (token_translations);
   /* Free the symbol table data structure.  */
   symbols_free ();