X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7612000cb004ae5b8516e3a34a79ab32050d688e..c527b2d4834cad9389a32992c70aafbefe729424:/src/print.c

diff --git a/src/print.c b/src/print.c
index f6817223..d7d04eab 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,330 +1,261 @@
 /* Print information on generated parser, for bison,
-   Copyright (C) 1984, 1986, 1989 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000, 2001 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
-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.
+   Bison is free software; you can redistribute it and/or modify
+   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.
 
-Bison 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.
+   Bison 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
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 
-#include <stdio.h>
 #include "system.h"
-#include "machine.h"
-#include "alloc.h"
 #include "files.h"
 #include "gram.h"
+#include "LR0.h"
+#include "lalr.h"
+#include "conflicts.h"
+#include "getargs.h"
 #include "state.h"
-
-
-extern char **tags;
-extern int nstates;
-extern short *accessing_symbol;
-extern core **state_table;
-extern shifts **shift_table;
-extern errs **err_table;
-extern reductions **reduction_table;
-extern char *consistent;
-extern char any_conflicts;
-extern char *conflicts;
-extern int final_state;
-
-extern void conflict_log();
-extern void verbose_conflict_log();
-extern void print_reductions();
-
-void print_token();
-void print_state();
-void print_core();
-void print_actions();
-void print_grammar();
-
-void
-terse()
+#include "reader.h"
+#include "print.h"
+#include "reduce.h"
+#include "closure.h"
+
+#if 0
+static void
+print_token (int extnum, int token)
 {
-  if (any_conflicts)
-    {
-      conflict_log();
-    }
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);
 }
+#endif
 
+
+/*--------------------------------.
+| Report information on a state.  |
+`--------------------------------*/
 
-void
-verbose()
+static void
+print_core (FILE *out, int state)
 {
-  register int i;
-
-  if (any_conflicts)
-    verbose_conflict_log();
+  int i;
+  short *sitems = state_table[state]->items;
+  int snitems   = state_table[state]->nitems;
 
-  print_grammar();
-
-  for (i = 0; i < nstates; i++)
+  /* New experimental feature: if TRACE_FLAGS output all the items of
+     a state, not only its kernel.  */
+  if (trace_flag)
     {
-      print_state(i);
+      closure (sitems, snitems);
+      sitems = itemset;
+      snitems = nitemset;
     }
-}
-
-
-void
-print_token(extnum, token)
-int extnum, token;
-{
-  fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);
-}
-
-
-void
-print_state(state)
-int state;
-{
-  fprintf(foutput, _("\n\nstate %d\n\n"), state);
-  print_core(state);
-  print_actions(state);
-}
-
-
-void
-print_core(state)
-int state;
-{
-  register int i;
-  register int k;
-  register int rule;
-  register core *statep;
-  register short *sp;
-  register short *sp1;
 
-  statep = state_table[state];
-  k = statep->nitems;
+  if (snitems)
+    {
+      for (i = 0; i < snitems; i++)
+	{
+	  short *sp;
+	  short *sp1;
+	  int rule;
 
-  if (k == 0) return;
+	  sp1 = sp = ritem + sitems[i];
 
-  for (i = 0; i < k; i++)
-    {
-      sp1 = sp = ritem + statep->items[i];
+	  while (*sp > 0)
+	    sp++;
 
-      while (*sp > 0)
-	sp++;
+	  rule = -(*sp);
+	  fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
 
-      rule = -(*sp);
-      fprintf(foutput, "    %s  ->  ", tags[rlhs[rule]]);
+	  for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
+	    fprintf (out, "%s ", tags[*sp]);
 
-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-	{
-	  fprintf(foutput, "%s ", tags[*sp]);
-	}
+	  fputc ('.', out);
 
-      putc('.', foutput);
+	  for (/* Nothing */; *sp > 0; ++sp)
+	    fprintf (out, " %s", tags[*sp]);
 
-      while (*sp > 0)
-	{
-	  fprintf(foutput, " %s", tags[*sp]);
-	  sp++;
+	  fprintf (out, _("   (rule %d)"), rule);
+	  fputc ('\n', out);
 	}
 
-      fprintf (foutput, _("   (rule %d)"), rule);
-      putc('\n', foutput);
+      fputc ('\n', out);
     }
-
-  putc('\n', foutput);
 }
 
-
-void
-print_actions(state)
-int state;
+static void
+print_actions (FILE *out, int state)
 {
-  register int i;
-  register int k;
-  register int state1;
-  register int symbol;
-  register shifts *shiftp;
-  register errs *errp;
-  register reductions *redp;
-  register int rule;
-
-  shiftp = shift_table[state];
-  redp = reduction_table[state];
-  errp = err_table[state];
-
-  if (!shiftp && !redp)
+  int i;
+
+  shifts   *shiftp = state_table[state]->shifts;
+  reductions *redp = state_table[state]->reductions;
+  errs       *errp = state_table[state]->errs;
+
+  if (!shiftp->nshifts && !redp)
     {
       if (final_state == state)
-	fprintf(foutput, _("    $default\taccept\n"));
+	fprintf (out, _("    $default\taccept\n"));
       else
-	fprintf(foutput, _("    NO ACTIONS\n"));
+	fprintf (out, _("    NO ACTIONS\n"));
       return;
     }
 
-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; i++)
-	{
-	  if (! shiftp->shifts[i]) continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = accessing_symbol[state1];
-	  /* The following line used to be turned off.  */
-	  if (ISVAR(symbol)) break;
-          if (symbol==0)      /* I.e. strcmp(tags[symbol],"$")==0 */
-            fprintf(foutput, _("    $   \tgo to state %d\n"), state1);
-          else
-            fprintf(foutput, _("    %-4s\tshift, and go to state %d\n"),
-                    tags[symbol], state1);
-	}
+  for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      {
+	int state1 = shiftp->shifts[i];
+	int symbol = state_table[state1]->accessing_symbol;
+	fprintf (out,
+		 _("    %-4s\tshift, and go to state %d\n"),
+		 tags[symbol], state1);
+      }
 
-      if (i > 0)
-	putc('\n', foutput);
-    }
-  else
-    {
-      i = 0;
-      k = 0;
-    }
+  if (i > 0)
+    fputc ('\n', out);
 
   if (errp)
     {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
+      int j;
+      for (j = 0; j < errp->nerrs; j++)
 	{
-	  if (! errp->errs[j]) continue;
-	  symbol = errp->errs[j];
-	  fprintf(foutput, _("    %-4s\terror (nonassociative)\n"), tags[symbol]);
+	  int symbol = errp->errs[j];
+	  if (!symbol)
+	    continue;
+	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
+		   tags[symbol]);
 	}
 
       if (j > 0)
-	putc('\n', foutput);
+	fputc ('\n', out);
     }
 
-  if (consistent[state] && redp)
+  if (state_table[state]->consistent && redp)
     {
-      rule = redp->rules[0];
-      symbol = rlhs[rule];
-      fprintf(foutput, _("    $default\treduce using rule %d (%s)\n\n"),
-     	        rule, tags[symbol]);
+      int rule = redp->rules[0];
+      int symbol = rule_table[rule].lhs;
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+	       rule, tags[symbol]);
     }
   else if (redp)
     {
-      print_reductions(state);
+      print_reductions (out, state);
     }
 
-  if (i < k)
+  if (i < shiftp->nshifts)
     {
-      for (; i < k; i++)
-	{
-	  if (! shiftp->shifts[i]) continue;
-	  state1 = shiftp->shifts[i];
-	  symbol = accessing_symbol[state1];
-	  fprintf(foutput, _("    %-4s\tgo to state %d\n"), tags[symbol], state1);
-	}
+      for (; i < shiftp->nshifts; i++)
+	if (!SHIFT_IS_DISABLED (shiftp, i))
+	  {
+	    int state1 = shiftp->shifts[i];
+	    int symbol = state_table[state1]->accessing_symbol;
+	    fprintf (out, _("    %-4s\tgo to state %d\n"),
+		     tags[symbol], state1);
+	  }
 
-      putc('\n', foutput);
+      fputc ('\n', out);
     }
 }
 
-#define END_TEST(end) \
-  if (column + strlen(buffer) > (end))					 \
-    { fprintf (foutput, "%s\n   ", buffer); column = 3; buffer[0] = 0; } \
-  else
-
-void
-print_grammar()
+static void
+print_state (FILE *out, int state)
+{
+  fprintf (out, _("state %d"), state);
+  fputs ("\n\n", out);
+  print_core (out, state);
+  print_actions (out, state);
+  fputs ("\n\n", out);
+}
+
+/*-----------------------------------------.
+| Print information on the whole grammar.  |
+`-----------------------------------------*/
+
+#define END_TEST(End)				\
+do {						\
+  if (column + strlen(buffer) > (End))		\
+    {						\
+      fprintf (out, "%s\n   ", buffer);		\
+      column = 3;				\
+      buffer[0] = 0;				\
+    }						\
+} while (0)
+
+
+static void
+print_grammar (FILE *out)
 {
   int i, j;
-  short* rule;
+  short *rule;
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
-  fputs(_("\nGrammar\n"), foutput);
+  fprintf (out, "%s\n\n", _("Grammar"));
+  fprintf (out, "  %s\n", _("Number, Line, Rule"));
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
-    if (rlhs[i] >= 0)
+    if (rule_table[i].useful)
       {
-	fprintf(foutput, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
-	rule = &ritem[rrhs[i]];
+	fprintf (out, _("  %3d %3d %s ->"),
+		 i, rule_table[i].line, tags[rule_table[i].lhs]);
+	rule = &ritem[rule_table[i].rhs];
 	if (*rule > 0)
 	  while (*rule > 0)
-	    fprintf(foutput, " %s", tags[*rule++]);
+	    fprintf (out, " %s", tags[*rule++]);
 	else
-	  fputs (_("		/* empty */"), foutput);
-	putc('\n', foutput);
+	  fprintf (out, " /* %s */", _("empty"));
+	fputc ('\n', out);
       }
+  fputs ("\n\n", out);
+
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
-  fputs(_("\nTerminals, with rules where they appear\n\n"), foutput);
-  fprintf(foutput, "%s (-1)\n", tags[0]);
-  if (translations)
-    {
-      for (i = 0; i <= max_user_token_number; i++)
-	if (token_translations[i] != 2)
-	  {
-	    buffer[0] = 0;
-	    column = strlen (tags[token_translations[i]]);
-	    fprintf(foutput, "%s", tags[token_translations[i]]);
-	    END_TEST (50);
-	    sprintf (buffer, " (%d)", i);
+  fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);
 
-	    for (j = 1; j <= nrules; j++)
-	      {
-		for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-		  if (*rule == token_translations[i])
-		    {
-		      END_TEST (65);
-		      sprintf (buffer + strlen(buffer), " %d", j);
-		      break;
-		    }
-	      }
-	    fprintf (foutput, "%s\n", buffer);
-	  }
-    }
-  else
-    for (i = 1; i < ntokens; i++)
+  for (i = 0; i <= max_user_token_number; i++)
+    if (token_translations[i] != 2)
       {
 	buffer[0] = 0;
-	column = strlen (tags[i]);
-	fprintf(foutput, "%s", tags[i]);
+	column = strlen (tags[token_translations[i]]);
+	fputs (tags[token_translations[i]], out);
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
 	for (j = 1; j <= nrules; j++)
-	  {
-	    for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-	      if (*rule == i)
-		{
-		  END_TEST (65);
-		  sprintf (buffer + strlen(buffer), " %d", j);
-		  break;
-		}
-	  }
-	fprintf (foutput, "%s\n", buffer);
+	  for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
+	    if (*rule == token_translations[i])
+	      {
+		END_TEST (65);
+		sprintf (buffer + strlen (buffer), " %d", j);
+		break;
+	      }
+	fprintf (out, "%s\n", buffer);
       }
+  fputs ("\n\n", out);
+
 
-  fputs(_("\nNonterminals, with rules where they appear\n\n"), foutput);
+  fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
 
       for (j = 1; j <= nrules; j++)
 	{
-	  if (rlhs[j] == i)
+	  if (rule_table[j].lhs == i)
 	    left_count++;
-	  for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+	  for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
 	    if (*rule == i)
 	      {
 		right_count++;
@@ -333,7 +264,7 @@ print_grammar()
 	}
 
       buffer[0] = 0;
-      fprintf(foutput, "%s", tags[i]);
+      fputs (tags[i], out);
       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
@@ -341,33 +272,68 @@ print_grammar()
       if (left_count > 0)
 	{
 	  END_TEST (50);
-	  sprintf (buffer + strlen(buffer), _(" on left:"));
+	  sprintf (buffer + strlen (buffer), _(" on left:"));
 
 	  for (j = 1; j <= nrules; j++)
 	    {
 	      END_TEST (65);
-	      if (rlhs[j] == i)
-		sprintf (buffer + strlen(buffer), " %d", j);
+	      if (rule_table[j].lhs == i)
+		sprintf (buffer + strlen (buffer), " %d", j);
 	    }
 	}
 
       if (right_count > 0)
 	{
 	  if (left_count > 0)
-	    sprintf (buffer + strlen(buffer), ",");
+	    sprintf (buffer + strlen (buffer), ",");
 	  END_TEST (50);
-	  sprintf (buffer + strlen(buffer), _(" on right:"));
+	  sprintf (buffer + strlen (buffer), _(" on right:"));
 	  for (j = 1; j <= nrules; j++)
 	    {
-	      for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+	      for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
 		if (*rule == i)
 		  {
 		    END_TEST (65);
-		    sprintf (buffer + strlen(buffer), " %d", j);
+		    sprintf (buffer + strlen (buffer), " %d", j);
 		    break;
 		  }
 	    }
 	}
-      fprintf (foutput, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);
     }
+  fputs ("\n\n", out);
+}
+
+void
+print_results (void)
+{
+  int i;
+
+  /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
+     that conflicts with Posix.  */
+  FILE *out = xfopen (spec_verbose_file, "w");
+
+  size_t size = obstack_object_size (&output_obstack);
+  fwrite (obstack_finish (&output_obstack), 1, size, out);
+  obstack_free (&output_obstack, NULL);
+
+  if (size)
+    fputs ("\n\n", out);
+
+  reduce_output (out);
+  conflicts_output (out);
+
+  print_grammar (out);
+
+  /* New experimental feature: output all the items of a state,
+     not only its kernel.  Requires to run closure, which need
+     memory allocation/deallocation.  */
+  if (trace_flag)
+    new_closure (nitems);
+  for (i = 0; i < nstates; i++)
+    print_state (out, i);
+  if (trace_flag)
+    free_closure ();
+
+  xfclose (out);
 }