X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5123689ba05a181aedd892e2e2164a2288e42b22..32e1e0a4865d64946a5497aff057d7be28c1cc3d:/src/print.c

diff --git a/src/print.c b/src/print.c
index 31158a71..b967c73f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -47,19 +47,6 @@ print_token (int extnum, int token)
 }
 #endif
 
-static inline const char *
-escape (const char *s)
-{
-  return quotearg_n_style (1, escape_quoting_style, s);
-}
-
-/* Be cautious not to use twice the same slot in a single expression. */
-static inline const char *
-escape2 (const char *s)
-{
-  return quotearg_n_style (2, escape_quoting_style, s);
-}
-
 
 /*--------------------------------.
 | Report information on a state.  |
@@ -69,12 +56,11 @@ static void
 print_core (FILE *out, state_t *state)
 {
   int i;
-  short *sitems = state->items;
+  item_number_t *sitems = state->items;
   int snritems   = state->nitems;
 
-  /* New experimental feature: if TRACE_FLAGS output all the items of
-     a state, not only its kernel.  */
-  if (trace_flag)
+  /* Output all the items of a state, not only its kernel.  */
+  if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
       sitems = itemset;
@@ -85,8 +71,8 @@ print_core (FILE *out, state_t *state)
     {
       for (i = 0; i < snritems; i++)
 	{
-	  short *sp;
-	  short *sp1;
+	  item_number_t *sp;
+	  item_number_t *sp1;
 	  int rule;
 
 	  sp1 = sp = ritem + sitems[i];
@@ -95,15 +81,19 @@ print_core (FILE *out, state_t *state)
 	    sp++;
 
 	  rule = -(*sp);
-	  fprintf (out, "    %s  ->  ", escape (rules[rule].lhs->tag));
+	  fprintf (out, "    %s  ->  ", symbol_tag_get (rules[rule].lhs));
 
 	  for (sp = rules[rule].rhs; sp < sp1; sp++)
-	    fprintf (out, "%s ", escape (symbols[*sp]->tag));
+	    fprintf (out, "%s ", symbol_tag_get (symbols[*sp]));
 
 	  fputc ('.', out);
 
 	  for (/* Nothing */; *sp >= 0; ++sp)
-	    fprintf (out, " %s", escape (symbols[*sp]->tag));
+	    fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
+
+	  /* Display the lookaheads?  */
+	  if (report_flag & report_lookaheads)
+	    state_rule_lookaheads_print (state, &rules[rule], out);
 
 	  fprintf (out, _("   (rule %d)"), rule - 1);
 	  fputc ('\n', out);
@@ -118,16 +108,16 @@ static void
 print_shifts (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   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 = states[state1]->accessing_symbol;
+	state_number_t state1 = shiftp->shifts[i];
+	symbol_number_t symbol = states[state1]->accessing_symbol;
 	fprintf (out,
 		 _("    %-4s\tshift, and go to state %d\n"),
-		 escape (symbols[symbol]->tag), state1);
+		 symbol_tag_get (symbols[symbol]), state1);
       }
 
   if (i > 0)
@@ -144,7 +134,7 @@ print_errs (FILE *out, state_t *state)
   for (i = 0; i < errp->nerrs; ++i)
     if (errp->errs[i])
       fprintf (out, _("    %-4s\terror (nonassociative)\n"),
-	       escape (symbols[errp->errs[i]]->tag));
+	       symbol_tag_get (symbols[errp->errs[i]]));
 
   if (i > 0)
     fputc ('\n', out);
@@ -155,7 +145,7 @@ static void
 print_gotos (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     /* Skip token shifts.  */;
@@ -165,10 +155,10 @@ print_gotos (FILE *out, state_t *state)
       for (; i < shiftp->nshifts; i++)
 	if (!SHIFT_IS_DISABLED (shiftp, i))
 	  {
-	    int state1 = shiftp->shifts[i];
-	    int symbol = states[state1]->accessing_symbol;
+	    state_number_t state1 = shiftp->shifts[i];
+	    symbol_number_t symbol = states[state1]->accessing_symbol;
 	    fprintf (out, _("    %-4s\tgo to state %d\n"),
-		     escape (symbols[symbol]->tag), state1);
+		     symbol_tag_get (symbols[symbol]), state1);
 	  }
 
       fputc ('\n', out);
@@ -179,7 +169,7 @@ static void
 print_reductions (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
   reductions *redp = state->reductions;
   errs *errp = state->errs;
   int nodefault = 0;
@@ -190,9 +180,9 @@ print_reductions (FILE *out, state_t *state)
   if (state->consistent)
     {
       int rule = redp->rules[0];
-      int symbol = rules[rule].lhs->number;
+      symbol_number_t symbol = rules[rule].lhs->number;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
-	       rule - 1, escape (symbols[symbol]->tag));
+	       rule - 1, symbol_tag_get (symbols[symbol]));
       return;
     }
 
@@ -214,20 +204,20 @@ print_reductions (FILE *out, state_t *state)
 
   if (state->nlookaheads == 1 && !nodefault)
     {
-      rule_t *default_rule = LArule[state->lookaheadsp];
+      rule_t *default_rule = state->lookaheads_rule[0];
 
-      bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);
+      bitset_and (lookaheadset, state->lookaheads[0], shiftset);
 
       for (i = 0; i < ntokens; i++)
 	if (bitset_test (lookaheadset, i))
 	  fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
-		   escape (symbols[i]->tag),
+		   symbol_tag_get (symbols[i]),
 		   default_rule->number - 1,
-		   escape2 (default_rule->lhs->tag));
+		   symbol_tag_get_n (default_rule->lhs, 1));
 
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
 	       default_rule->number - 1,
-	       escape (default_rule->lhs->tag));
+	       symbol_tag_get (default_rule->lhs));
     }
   else if (state->nlookaheads >= 1)
     {
@@ -241,7 +231,7 @@ print_reductions (FILE *out, state_t *state)
 	    int count = 0;
 	    int j;
 
-	    bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);
+	    bitset_andn (lookaheadset, state->lookaheads[i], shiftset);
 
 	    for (j = 0; j < ntokens; j++)
 	      if (bitset_test (lookaheadset, j))
@@ -250,8 +240,8 @@ print_reductions (FILE *out, state_t *state)
 	    if (count > cmax)
 	      {
 		cmax = count;
-		default_LA = state->lookaheadsp + i;
-		default_rule = LArule[state->lookaheadsp + i];
+		default_LA = i;
+		default_rule = state->lookaheads_rule[i];
 	      }
 
 	    bitset_or (shiftset, shiftset, lookaheadset);
@@ -270,16 +260,16 @@ print_reductions (FILE *out, state_t *state)
 	  int count = bitset_test (shiftset, i);
 
 	  for (j = 0; j < state->nlookaheads; ++j)
-	    if (bitset_test (LA[state->lookaheadsp + j], i))
+	    if (bitset_test (state->lookaheads[j], i))
 	      {
 		if (count == 0)
 		  {
-		    if (state->lookaheadsp + j != default_LA)
+		    if (j != default_LA)
 		      fprintf (out,
 			       _("    %-4s\treduce using rule %d (%s)\n"),
-			       escape (symbols[i]->tag),
-			       LArule[state->lookaheadsp + j]->number - 1,
-			       escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
+			       symbol_tag_get (symbols[i]),
+			       state->lookaheads_rule[j]->number - 1,
+			       symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));
 		    else
 		      defaulted = 1;
 
@@ -290,15 +280,15 @@ print_reductions (FILE *out, state_t *state)
 		    if (defaulted)
 		      fprintf (out,
 			       _("    %-4s\treduce using rule %d (%s)\n"),
-			       escape (symbols[i]->tag),
-			       LArule[default_LA]->number - 1,
-			       escape2 (LArule[default_LA]->lhs->tag));
+			       symbol_tag_get (symbols[i]),
+			       state->lookaheads_rule[default_LA]->number - 1,
+			       symbol_tag_get_n (state->lookaheads_rule[default_LA]->lhs, 1));
 		    defaulted = 0;
 		    fprintf (out,
 			     _("    %-4s\t[reduce using rule %d (%s)]\n"),
-			     escape (symbols[i]->tag),
-			     LArule[state->lookaheadsp + j]->number - 1,
-			     escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
+			     symbol_tag_get (symbols[i]),
+			     state->lookaheads_rule[j]->number - 1,
+			     symbol_tag_get_n (state->lookaheads_rule[j]->lhs, 1));
 		  }
 	      }
 	}
@@ -306,7 +296,7 @@ print_reductions (FILE *out, state_t *state)
       if (default_LA >= 0)
 	fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
 		 default_rule->number - 1,
-		 escape (default_rule->lhs->tag));
+		 symbol_tag_get (default_rule->lhs));
     }
 }
 
@@ -315,11 +305,11 @@ static void
 print_actions (FILE *out, state_t *state)
 {
   reductions *redp = state->reductions;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   if (shiftp->nshifts == 0 && redp->nreds == 0)
     {
-      if (final_state == state->number)
+      if (state->number == final_state->number)
        fprintf (out, _("    $default\taccept\n"));
       else
        fprintf (out, _("    NO ACTIONS\n"));
@@ -339,6 +329,9 @@ print_state (FILE *out, state_t *state)
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);
+  if ((report_flag & report_solved_conflicts)
+      && state->solved_conflicts)
+    fputs (state->solved_conflicts, out);
   fputs ("\n\n", out);
 }
 
@@ -360,46 +353,32 @@ do {						\
 static void
 print_grammar (FILE *out)
 {
-  int i, j;
-  short *rule;
+  symbol_number_t i;
+  item_number_t *rule;
   char buffer[90];
   int column = 0;
 
-  /* rule # : LHS -> RHS */
-  fprintf (out, "%s\n\n", _("Grammar"));
-  fprintf (out, "  %s\n", _("Number, Line, Rule"));
-  for (i = 1; i < nrules + 1; i++)
-    {
-      fprintf (out, _("  %3d %3d %s ->"),
-	       i - 1, rules[i].line, escape (rules[i].lhs->tag));
-      rule = rules[i].rhs;
-      if (*rule >= 0)
-	while (*rule >= 0)
-	  fprintf (out, " %s", escape (symbols[*rule++]->tag));
-      else
-	fprintf (out, " /* %s */", _("empty"));
-      fputc ('\n', out);
-    }
-  fputs ("\n\n", out);
-
+  grammar_rules_print (out);
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   for (i = 0; i < max_user_token_number + 1; i++)
-    if (token_translations[i] != 2)
+    if (token_translations[i] != undeftoken->number)
       {
+	const char *tag = symbol_tag_get (symbols[token_translations[i]]);
+	int r;
 	buffer[0] = 0;
-	column = strlen (escape (symbols[token_translations[i]]->tag));
-	fputs (escape (symbols[token_translations[i]]->tag), out);
+	column = strlen (tag);
+	fputs (tag, out);
 	END_TEST (50);
 	sprintf (buffer, " (%d)", i);
 
-	for (j = 1; j < nrules + 1; j++)
-	  for (rule = rules[j].rhs; *rule >= 0; rule++)
-	    if (*rule == token_translations[i])
+	for (r = 1; r < nrules + 1; r++)
+	  for (rule = rules[r].rhs; *rule >= 0; rule++)
+	    if (item_number_as_symbol_number (*rule) == token_translations[i])
 	      {
 		END_TEST (65);
-		sprintf (buffer + strlen (buffer), " %d", j - 1);
+		sprintf (buffer + strlen (buffer), " %d", r - 1);
 		break;
 	      }
 	fprintf (out, "%s\n", buffer);
@@ -411,13 +390,15 @@ print_grammar (FILE *out)
   for (i = ntokens; i < nsyms; i++)
     {
       int left_count = 0, right_count = 0;
+      int r;
+      const char *tag = symbol_tag_get (symbols[i]);
 
-      for (j = 1; j < nrules + 1; j++)
+      for (r = 1; r < nrules + 1; r++)
 	{
-	  if (rules[j].lhs->number == i)
+	  if (rules[r].lhs->number == i)
 	    left_count++;
-	  for (rule = rules[j].rhs; *rule >= 0; rule++)
-	    if (*rule == i)
+	  for (rule = rules[r].rhs; *rule >= 0; rule++)
+	    if (item_number_as_symbol_number (*rule) == i)
 	      {
 		right_count++;
 		break;
@@ -425,8 +406,8 @@ print_grammar (FILE *out)
 	}
 
       buffer[0] = 0;
-      fputs (escape (symbols[i]->tag), out);
-      column = strlen (escape (symbols[i]->tag));
+      fputs (tag, out);
+      column = strlen (tag);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
 
@@ -435,11 +416,11 @@ print_grammar (FILE *out)
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on left:"));
 
-	  for (j = 1; j < nrules + 1; j++)
+	  for (r = 1; r < nrules + 1; r++)
 	    {
 	      END_TEST (65);
-	      if (rules[j].lhs->number == i)
-		sprintf (buffer + strlen (buffer), " %d", j - 1);
+	      if (rules[r].lhs->number == i)
+		sprintf (buffer + strlen (buffer), " %d", r - 1);
 	    }
 	}
 
@@ -449,13 +430,13 @@ print_grammar (FILE *out)
 	    sprintf (buffer + strlen (buffer), ",");
 	  END_TEST (50);
 	  sprintf (buffer + strlen (buffer), _(" on right:"));
-	  for (j = 1; j < nrules + 1; j++)
+	  for (r = 1; r < nrules + 1; r++)
 	    {
-	      for (rule = rules[j].rhs; *rule >= 0; rule++)
-		if (*rule == i)
+	      for (rule = rules[r].rhs; *rule >= 0; rule++)
+		if (item_number_as_symbol_number (*rule) == i)
 		  {
 		    END_TEST (65);
-		    sprintf (buffer + strlen (buffer), " %d", j - 1);
+		    sprintf (buffer + strlen (buffer), " %d", r - 1);
 		    break;
 		  }
 	    }
@@ -468,28 +449,20 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
-  size_t i;
+  state_number_t 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)
+  /* If the whole state item sets, not only the kernels, are wanted,
+     `closure' will be run, which needs memory allocation/deallocation.   */
+  if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   shiftset =  bitset_create (ntokens, BITSET_FIXED);
@@ -498,7 +471,7 @@ print_results (void)
     print_state (out, states[i]);
   bitset_free (shiftset);
   bitset_free (lookaheadset);
-  if (trace_flag)
+  if (report_flag & report_itemsets)
     free_closure ();
 
   xfclose (out);