* tests/actions.at (AT_CHECK_PRINTER_AND_DESTRUCTOR): New.

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 7d81e2fe0f66a11f87cd5c56fa58b7a55029f985..fe0ee76d9d52b3faa98b54dad40e0c7c223d8ff0 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -51,7 +51,7 @@ print_core (struct obstack *oout, state_t *state)
   int snritems   = state->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
-  if (trace_flag)
+  if (report_flag & report_itemsets)
     {
       closure (sitems, snritems);
       sitems = itemset;
@@ -63,49 +63,46 @@ print_core (struct obstack *oout, state_t *state)
     {
       item_number_t *sp;
       item_number_t *sp1;
-      int rule;
+      rule_number_t rule;
 
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
        sp++;
 
-      rule = -(*sp);
+      rule = item_number_as_rule_number (*sp);
 
       if (i)
        obstack_1grow (oout, '\n');
       obstack_fgrow1 (oout, " %s -> ",
-                     symbol_tag_get (rules[rule].lhs));
+                     rules[rule].lhs->tag);
 
       for (sp = rules[rule].rhs; sp < sp1; sp++)
-       obstack_fgrow1 (oout, "%s ", symbol_tag_get (symbols[*sp]));
+       obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-       obstack_fgrow1 (oout, " %s", symbol_tag_get (symbols[*sp]));
+       obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
 
       /* Experimental feature: display the lookaheads. */
-      if (trace_flag && state->nlookaheads)
+      if (report_flag & report_lookaheads)
        {
-         int j, k;
-         int nlookaheads = 0;
-         /* Look for lookaheads corresponding to this rule. */
-         for (j = 0; j < state->nlookaheads; ++j)
-           for (k = 0; k < ntokens; ++k)
-             if (bitset_test (state->lookaheads[j], k)
-                 && state->lookaheads_rule[j]->number == rule)
-               nlookaheads++;
-         if (nlookaheads)
+         /* Find the reduction we are handling.  */
+         reductions_t *reds = state->reductions;
+         int redno = state_reduction_find (state, &rules[rule]);
+
+         /* Print them if there are.  */
+         if (reds->lookaheads && redno != -1)
            {
-             obstack_sgrow (oout, "  [");
-             for (j = 0; j < state->nlookaheads; ++j)
-               for (k = 0; k < ntokens; ++k)
-                 if (bitset_test (state->lookaheads[j], k)
-                     && state->lookaheads_rule[j]->number == rule)
-                   obstack_fgrow2 (oout, "%s%s",
-                                   symbol_tag_get (symbols[k]),
-                                   --nlookaheads ? ", " : "");
+             bitset_iterator biter;
+             int k;
+             int not_first = 0;
+             obstack_sgrow (oout, "[");
+             BITSET_FOR_EACH (biter, reds->lookaheads[redno], k, 0)
+               obstack_fgrow2 (oout, "%s%s",
+                               not_first++ ? ", " : "",
+                               symbols[k]->tag);
              obstack_sgrow (oout, "]");
            }
        }
@@ -123,36 +120,36 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
-  shifts_t   *shiftp = state->shifts;
-  reductions *redp = state->reductions;
+  transitions_t     *transitions = state->transitions;
+  reductions_t *redp = state->reductions;
 
   static char buff[10];
   edge_t edge;
 
-  if (!shiftp->nshifts && !redp)
+  if (!transitions->num && !redp)
     return;
 
-  for (i = 0; i < shiftp->nshifts; i++)
-    if (!SHIFT_IS_DISABLED (shiftp, i))
+  for (i = 0; i < transitions->num; i++)
+    if (!TRANSITION_IS_DISABLED (transitions, i))
       {
-       state_number_t state1 = shiftp->shifts[i];
-       symbol_number_t symbol = states[state1]->accessing_symbol;
+       state_t *state1 = transitions->states[i];
+       symbol_number_t symbol = state1->accessing_symbol;
 
        new_edge (&edge);
 
-       if (state->number > state1)
+       if (state->number > state1->number)
          edge.type = back_edge;
        open_edge (&edge, fgraph);
        /* The edge source is the current node.  */
        edge.sourcename = node_name;
-       sprintf (buff, "%d", state1);
+       sprintf (buff, "%d", state1->number);
        edge.targetname = buff;
        /* Shifts are blue, gotos are green, and error is red. */
-       if (SHIFT_IS_ERROR (shiftp, i))
+       if (TRANSITION_IS_ERROR (transitions, i))
          edge.color = red;
        else
-         edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
-       edge.label = symbol_tag_get (symbols[symbol]);
+         edge.color = TRANSITION_IS_SHIFT(transitions, i) ? blue : green;
+       edge.label = symbols[symbol]->tag;
        output_edge (&edge, fgraph);
        close_edge (fgraph);
       }