Instead of attaching lookaheads and duplicating the rules being

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 9f5521ae5144bff5845299b0a7aee8890004248a..c28f5b5ed2d1abbb319837f9278035d1d2e8a29f 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -21,35 +21,54 @@
 
 #include "system.h"
 #include "quotearg.h"
 
 #include "system.h"
 #include "quotearg.h"

-#include "gram.h"

 #include "symtab.h"
 #include "symtab.h"

+#include "gram.h"
+#include "reduce.h"

 #include "reader.h"
 
 #include "reader.h"
 

-/* comments for these variables are in gram.h  */
+/* Comments for these variables are in gram.h.  */

 
 

-int nitems;
-int nrules;
-int nsyms;
-int ntokens;
-int nvars;
-
-short *ritem = NULL;
-int nritems;
+item_number_t *ritem = NULL;
+unsigned int nritems = 0;

 
 rule_t *rules = NULL;
 
 rule_t *rules = NULL;

+rule_number_t nrules = 0;
+
+symbol_t **symbols = NULL;
+int nsyms = 0;
+int ntokens = 1;
+int nvars = 0;

 
 

-struct bucket **symbols = NULL;
-short *token_translations = NULL;
+symbol_number_t *token_translations = NULL;

 
 

-int start_symbol;
+int max_user_token_number = 256;

 
 

-int max_user_token_number;
+int glr_parser = 0;
+int pure_parser = 0;

 
 

-int semantic_parser;

 
 

-int pure_parser;
+/*----------------------------------------------------------------.
+| 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.                                            |
+`----------------------------------------------------------------*/

 
 

-int error_token_number;
+void
+rule_lhs_print (rule_t *rule, symbol_t *previous_lhs, FILE *out)
+{
+  fprintf (out, "  %3d ", rule->number);
+  if (previous_lhs != rule->lhs)
+    {
+      fprintf (out, "%s:", rule->lhs->tag);
+    }
+  else
+    {
+      int n;
+      for (n = strlen (previous_lhs->tag); n > 0; --n)
+       fputc (' ', out);
+      fputc ('|', out);
+    }
+}

 
 
 /*--------------------------------------.
 
 
 /*--------------------------------------.


@@ -60,13 +79,46 @@ int
 rule_rhs_length (rule_t *rule)
 {
   int res = 0;
 rule_rhs_length (rule_t *rule)
 {
   int res = 0;

-  short *rhsp;
+  item_number_t *rhsp;

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

+/*-------------------------------.
+| Print this RULE's RHS on OUT.  |
+`-------------------------------*/
+
+void
+rule_rhs_print (rule_t *rule, FILE *out)
+{
+  if (*rule->rhs >= 0)
+    {
+      item_number_t *r;
+      for (r = rule->rhs; *r >= 0; r++)
+       fprintf (out, " %s", symbols[*r]->tag);
+      fputc ('\n', out);
+    }
+  else
+    {
+      fprintf (out, " /* %s */\n", _("empty"));
+    }
+}
+
+
+/*-------------------------.
+| Print this RULE on OUT.  |
+`-------------------------*/
+
+void
+rule_print (rule_t *rule, FILE *out)
+{
+  fprintf (out, "%s:", rule->lhs->tag);
+  rule_rhs_print (rule, out);
+}
+
+

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


@@ -74,14 +126,13 @@ rule_rhs_length (rule_t *rule)
 void
 ritem_print (FILE *out)
 {
 void
 ritem_print (FILE *out)
 {

-  int i;
+  unsigned int i;

   fputs ("RITEM\n", out);
   for (i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)
   fputs ("RITEM\n", out);
   for (i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)

-      fprintf (out, "  %s", quotearg_style (escape_quoting_style,
-                                           symbols[ritem[i]]->tag));
+      fprintf (out, "  %s", symbols[ritem[i]]->tag);

     else
     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);
 }
 
   fputs ("\n\n", out);
 }
 


@@ -94,14 +145,130 @@ size_t
 ritem_longest_rhs (void)
 {
   int max = 0;
 ritem_longest_rhs (void)
 {
   int max = 0;

-  int i;
+  rule_number_t r;

 
 

-  for (i = 1; i < nrules + 1; ++i)
+  for (r = 0; r < nrules; ++r)

     {
     {

-      int length = rule_rhs_length (&rules[i]);
+      int length = rule_rhs_length (&rules[r]);

       if (length > max)
        max = length;
     }
 
   return max;
 }
       if (length > max)
        max = length;
     }
 
   return max;
 }

+
+
+/*----------------------------------------------------------------.
+| Print the grammar's rules numbers from BEGIN (inclusive) to END |
+| (exclusive) on OUT under TITLE.                                 |
+`----------------------------------------------------------------*/
+
+void
+grammar_rules_partial_print (FILE *out, const char *title,
+                            rule_number_t begin, rule_number_t end)
+{
+  int r;
+  symbol_t *previous_lhs = NULL;
+
+  /* rule # : LHS -> RHS */
+  fprintf (out, "%s\n\n", title);
+  for (r = begin; r < end; r++)
+    {
+      if (previous_lhs && previous_lhs != rules[r].lhs)
+       fputc ('\n', out);
+      rule_lhs_print (&rules[r], previous_lhs, out);
+      rule_rhs_print (&rules[r], out);
+      previous_lhs = rules[r].lhs;
+    }
+  fputs ("\n\n", out);
+}
+
+
+/*------------------------------------------.
+| Print the grammar's useful rules on OUT.  |
+`------------------------------------------*/
+
+void
+grammar_rules_print (FILE *out)
+{
+  grammar_rules_partial_print (out, _("Grammar"), 0, nrules);
+}
+
+
+/*-------------------.
+| Dump the grammar.  |
+`-------------------*/
+
+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);
+
+
+  fprintf (out, "Variables\n---------\n\n");
+  {
+    symbol_number_t i;
+    fprintf (out, "Value  Sprec  Sassoc  Tag\n");
+
+    for (i = ntokens; i < nsyms; i++)
+      fprintf (out, "%5d  %5d   %5d  %s\n",
+              i,
+              symbols[i]->prec, symbols[i]->assoc,
+              symbols[i]->tag);
+    fprintf (out, "\n\n");
+  }
+
+  fprintf (out, "Rules\n-----\n\n");
+  {
+    rule_number_t i;
+    fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
+    for (i = 0; i < nrules + nuseless_productions; i++)
+      {
+       rule_t *rule = &rules[i];
+       item_number_t *r = NULL;
+       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,
+                rule->prec ? rule->prec->prec : 0,
+                rule->prec ? rule->prec->assoc : 0,
+                rule->useful,
+                rule->rhs - ritem,
+                rule->rhs - ritem + rhs_count - 1,
+                rule->lhs->number);
+       /* Dumped the RHS. */
+       for (r = rule->rhs; *r >= 0; r++)
+         fprintf (out, " %3d", *r);
+       fprintf (out, "  [%d]\n", item_number_as_rule_number (*r));
+      }
+  }
+  fprintf (out, "\n\n");
+
+  fprintf (out, "Rules interpreted\n-----------------\n\n");
+  {
+    rule_number_t r;
+    for (r = 0; r < nrules + nuseless_productions; r++)
+      {
+       fprintf (out, "%-5d  ", r);
+       rule_print (&rules[r], out);
+      }
+  }
+  fprintf (out, "\n\n");
+}
+
+
+void
+grammar_free (void)
+{
+  XFREE (ritem);
+  free (rules);
+  XFREE (token_translations);
+  /* Free the symbol table data structure.  */
+  symbols_free ();
+  free_merger_functions ();
+}