scan-skel.l: shift complain_args arguments

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 4847c4cc7224b0faefdef47c547ec60bd59b5840..ca1dc24ea54a89713b3426219d50d7dd457be73e 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>

+#include <quotearg.h>

 #include "system.h"
 
 #include "LR0.h"
 #include "system.h"
 
 #include "LR0.h"


@@ -54,7 +55,7 @@ print_core (struct obstack *oout, state *s)
       snritems = nitemset;
     }
 
       snritems = nitemset;
     }
 

-  obstack_printf (oout, "%d", s->number);
+  obstack_printf (oout, "state %d\\n", s->number);

   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;


@@ -68,15 +69,15 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
 
       r = item_number_as_rule_number (*sp);
 

-      obstack_printf (oout, "\n%s -> ", rules[r].lhs->tag);
+      obstack_printf (oout, "%d: %s -> ", r, escape (rules[r].lhs->tag));

 
       for (sp = rules[r].rhs; sp < sp1; sp++)
 
       for (sp = rules[r].rhs; sp < sp1; sp++)

-        obstack_printf (oout, "%s ", symbols[*sp]->tag);
+        obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));

 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)

-        obstack_printf (oout, " %s", symbols[*sp]->tag);
+        obstack_printf (oout, " %s", escape (symbols[*sp]->tag));

 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens
 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens


@@ -92,15 +93,17 @@ print_core (struct obstack *oout, state *s)
               bitset_iterator biter;
               int k;
               char const *sep = "";
               bitset_iterator biter;
               int k;
               char const *sep = "";

-              obstack_sgrow (oout, "[");
+              obstack_1grow (oout, '[');

               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {
               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {

-                  obstack_printf (oout, "%s%s", sep, symbols[k]->tag);
+                  obstack_sgrow (oout, sep);
+                  obstack_sgrow (oout, escape (symbols[k]->tag));

                   sep = ", ";
                 }
                   sep = ", ";
                 }

-              obstack_sgrow (oout, "]");
+              obstack_1grow (oout, ']');

             }
         }
             }
         }

+      obstack_sgrow (oout, "\\l");

     }
 }
 
     }
 }
 


@@ -117,6 +120,9 @@ print_actions (state const *s, FILE *fgraph)
 
   transitions const *trans = s->transitions;
 
 
   transitions const *trans = s->transitions;
 

+  /* Display reductions. */
+  output_red (s, s->reductions, fgraph);
+

   if (!trans->num && !s->reductions)
     return;
 
   if (!trans->num && !s->reductions)
     return;