X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c49a8e71cec845d32366432b824a9317e4a80160..4134cae3c5ff2fc3346ebc5b10d5c25c72c72cfe:/src/print.c?ds=sidebyside

diff --git a/src/print.c b/src/print.c
index ecd5d926..a5be5737 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,114 +1,64 @@
 /* Print information on generated parser, for bison,
-   Copyright (C) 1984, 1986, 1989 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, 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 "xalloc.h"
 #include "files.h"
 #include "gram.h"
+#include "LR0.h"
+#include "lalr.h"
+#include "conflicts.h"
+#include "getargs.h"
 #include "state.h"
+#include "reader.h"
+#include "print.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 PARAMS((void));
-extern void verbose_conflict_log PARAMS((void));
-extern void print_reductions PARAMS((int));
-
-void terse PARAMS((void));
-void verbose PARAMS((void));
-void print_token PARAMS((int, int));
-void print_state PARAMS((int));
-void print_core PARAMS((int));
-void print_actions PARAMS((int));
-void print_grammar PARAMS((void));
-
-void
-terse (void)
-{
-  if (any_conflicts)
-    {
-      conflict_log();
-    }
-}
-
-
-void
-verbose (void)
-{
-  register int i;
-
-  if (any_conflicts)
-    verbose_conflict_log();
-
-  print_grammar();
-
-  for (i = 0; i < nstates; i++)
-    {
-      print_state(i);
-    }
-}
-
-
-void
+#if 0
+static void
 print_token (int extnum, int token)
 {
-  fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);
+  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
 }
+#endif
 
+
+/*================================\
+| Report information on a state.  |
+\================================*/
 
-void
-print_state (int state)
-{
-  fprintf(foutput, _("\n\nstate %d\n\n"), state);
-  print_core(state);
-  print_actions(state);
-}
-
-
-void
+static void
 print_core (int state)
 {
-  register int i;
-  register int k;
-  register int rule;
-  register core *statep;
-  register short *sp;
-  register short *sp1;
+  int i;
+  int k;
+  int rule;
+  core *statep;
+  short *sp;
+  short *sp1;
 
   statep = state_table[state];
   k = statep->nitems;
 
-  if (k == 0) return;
+  if (k == 0)
+    return;
 
   for (i = 0; i < k; i++)
     {
@@ -118,40 +68,39 @@ print_core (int state)
 	sp++;
 
       rule = -(*sp);
-      fprintf(foutput, "    %s  ->  ", tags[rlhs[rule]]);
+      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);
 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
 	{
-	  fprintf(foutput, "%s ", tags[*sp]);
+	  obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
 	}
 
-      putc('.', foutput);
+      obstack_1grow (&output_obstack, '.');
 
       while (*sp > 0)
 	{
-	  fprintf(foutput, " %s", tags[*sp]);
+	  obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
 	  sp++;
 	}
 
-      fprintf (foutput, _("   (rule %d)"), rule);
-      putc('\n', foutput);
+      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
+      obstack_1grow (&output_obstack, '\n');
     }
 
-  putc('\n', foutput);
+  obstack_1grow (&output_obstack, '\n');
 }
 
-
-void
+static void
 print_actions (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;
+  int i;
+  int k;
+  int state1;
+  int symbol;
+  shifts *shiftp;
+  errs *errp;
+  reductions *redp;
+  int rule;
 
   shiftp = shift_table[state];
   redp = reduction_table[state];
@@ -160,9 +109,9 @@ print_actions (int state)
   if (!shiftp && !redp)
     {
       if (final_state == state)
-	fprintf(foutput, _("    $default\taccept\n"));
+	obstack_sgrow (&output_obstack, _("    $default\taccept\n"));
       else
-	fprintf(foutput, _("    NO ACTIONS\n"));
+	obstack_sgrow (&output_obstack, _("    NO ACTIONS\n"));
       return;
     }
 
@@ -172,20 +121,24 @@ print_actions (int state)
 
       for (i = 0; i < k; i++)
 	{
-	  if (! shiftp->shifts[i]) continue;
+	  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);
+	  if (ISVAR (symbol))
+	    break;
+	  if (symbol == 0)	/* I.e. strcmp(tags[symbol],"$")==0 */
+	    obstack_fgrow1 (&output_obstack,
+			    _("    $   \tgo to state %d\n"), state1);
+	  else
+	    obstack_fgrow2 (&output_obstack,
+			    _("    %-4s\tshift, and go to state %d\n"),
+			    tags[symbol], state1);
 	}
 
       if (i > 0)
-	putc('\n', foutput);
+	obstack_1grow (&output_obstack, '\n');
     }
   else
     {
@@ -201,73 +154,105 @@ print_actions (int state)
 
       for (j = 0; j < nerrs; j++)
 	{
-	  if (! errp->errs[j]) continue;
+	  if (!errp->errs[j])
+	    continue;
 	  symbol = errp->errs[j];
-	  fprintf(foutput, _("    %-4s\terror (nonassociative)\n"), tags[symbol]);
+	  obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),
+		   tags[symbol]);
 	}
 
       if (j > 0)
-	putc('\n', foutput);
+	obstack_1grow (&output_obstack, '\n');
     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];
-      fprintf(foutput, _("    $default\treduce using rule %d (%s)\n\n"),
-     	        rule, tags[symbol]);
+      obstack_fgrow2 (&output_obstack,
+		      _("    $default\treduce using rule %d (%s)\n\n"),
+		      rule, tags[symbol]);
     }
   else if (redp)
     {
-      print_reductions(state);
+      print_reductions (state);
     }
 
   if (i < k)
     {
       for (; i < k; i++)
 	{
-	  if (! shiftp->shifts[i]) continue;
+	  if (!shiftp->shifts[i])
+	    continue;
 	  state1 = shiftp->shifts[i];
 	  symbol = accessing_symbol[state1];
-	  fprintf(foutput, _("    %-4s\tgo to state %d\n"), tags[symbol], state1);
+	  obstack_fgrow2 (&output_obstack,
+			  _("    %-4s\tgo to state %d\n"),
+			  tags[symbol], state1);
 	}
 
-      putc('\n', foutput);
+      obstack_1grow (&output_obstack, '\n');
     }
 }
 
-#define END_TEST(end) \
-  if (column + strlen(buffer) > (end))					 \
-    { fprintf (foutput, "%s\n   ", buffer); column = 3; buffer[0] = 0; } \
-  else
-
-void
+static void
+print_state (int state)
+{
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_fgrow1 (&output_obstack, _("state %d"), state);
+  obstack_sgrow (&output_obstack, "\n\n");
+  print_core (state);
+  print_actions (state);
+}
+
+/*-----------------------------------------.
+| Print information on the whole grammar.  |
+`-----------------------------------------*/
+
+#define END_TEST(End)						\
+do {								\
+  if (column + strlen(buffer) > (End))				\
+    {								\
+      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);	\
+      column = 3;						\
+      buffer[0] = 0;						\
+    }								\
+} while (0)
+
+
+static void
 print_grammar (void)
 {
   int i, j;
-  short* rule;
+  short *rule;
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
-  fputs(_("\nGrammar\n"), foutput);
+  obstack_1grow (&output_obstack, '\n');
+  obstack_sgrow (&output_obstack, _("Grammar"));
+  obstack_1grow (&output_obstack, '\n');
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {
-	fprintf(foutput, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
+	obstack_fgrow2 (&output_obstack,
+			_("rule %-4d %s ->"), i, tags[rlhs[i]]);
 	rule = &ritem[rrhs[i]];
 	if (*rule > 0)
 	  while (*rule > 0)
-	    fprintf(foutput, " %s", tags[*rule++]);
+	    obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
 	else
-	  fputs (_("		/* empty */"), foutput);
-	putc('\n', foutput);
+	  obstack_sgrow (&output_obstack, _("		/* empty */"));
+	obstack_1grow (&output_obstack, '\n');
       }
 
   /* 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]);
+  obstack_sgrow (&output_obstack, "\n");
+  obstack_sgrow (&output_obstack,
+		 _("Terminals, with rules where they appear"));
+  obstack_sgrow (&output_obstack, "\n\n");
+  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
   if (translations)
     {
       for (i = 0; i <= max_user_token_number; i++)
@@ -275,46 +260,47 @@ print_grammar (void)
 	  {
 	    buffer[0] = 0;
 	    column = strlen (tags[token_translations[i]]);
-	    fprintf(foutput, "%s", tags[token_translations[i]]);
+	    obstack_sgrow (&output_obstack, tags[token_translations[i]]);
 	    END_TEST (50);
 	    sprintf (buffer, " (%d)", i);
 
 	    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);
+	      for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+		if (*rule == token_translations[i])
+		  {
+		    END_TEST (65);
+		    sprintf (buffer + strlen (buffer), " %d", j);
+		    break;
+		  }
+	    obstack_fgrow1 (&output_obstack, "%s\n", buffer);
 	  }
     }
   else
-    for (i = 1; i < ntokens; i++)
-      {
-	buffer[0] = 0;
-	column = strlen (tags[i]);
-	fprintf(foutput, "%s", tags[i]);
-	END_TEST (50);
-	sprintf (buffer, " (%d)", i);
+    {
+      for (i = 1; i < ntokens; i++)
+	{
+	  buffer[0] = 0;
+	  column = strlen (tags[i]);
+	  obstack_sgrow (&output_obstack, tags[i]);
+	  END_TEST (50);
+	  sprintf (buffer, " (%d)", i);
 
-	for (j = 1; j <= nrules; j++)
-	  {
+	  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);
+		  sprintf (buffer + strlen (buffer), " %d", j);
 		  break;
 		}
-	  }
-	fprintf (foutput, "%s\n", buffer);
-      }
+	  obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+	}
+    }
 
-  fputs(_("\nNonterminals, with rules where they appear\n\n"), foutput);
+  obstack_sgrow (&output_obstack, "\n");
+  obstack_sgrow (&output_obstack,
+		 _("Nonterminals, with rules where they appear"));
+  obstack_sgrow (&output_obstack, "\n\n");
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
@@ -332,7 +318,7 @@ print_grammar (void)
 	}
 
       buffer[0] = 0;
-      fprintf(foutput, "%s", tags[i]);
+      obstack_sgrow (&output_obstack, tags[i]);
       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
@@ -340,33 +326,49 @@ print_grammar (void)
       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);
+		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++)
 		if (*rule == i)
 		  {
 		    END_TEST (65);
-		    sprintf (buffer + strlen(buffer), " %d", j);
+		    sprintf (buffer + strlen (buffer), " %d", j);
 		    break;
 		  }
 	    }
 	}
-      fprintf (foutput, "%s\n", buffer);
+      obstack_fgrow1 (&output_obstack, "%s\n", buffer);
     }
 }
+
+void
+print_results (void)
+{
+  int i;
+
+  if (any_conflicts)
+    print_conflicts ();
+
+  if (verbose_flag)
+    print_grammar ();
+
+  if (verbose_flag)
+    for (i = 0; i < nstates; i++)
+      print_state (i);
+}