#include "getargs.h"
#include "state.h"
#include "reader.h"
+#include "closure.h"
#include "obstack.h"
#include "print_graph.h"
#include "vcg.h"
/* This part will construct the label of nodes. */
static void
-print_core (int state, struct obstack *node_obstack)
+print_core (state_t *state, struct obstack *node_obstack)
{
int i;
- state_t *statep = state_table[state];
+ short *sitems = state->items;
+ int snitems = state->nitems;
- if (!statep->nitems)
- return;
+ /* Output all the items of a state, not only its kernel. */
+ closure (sitems, snitems);
+ sitems = itemset;
+ snitems = nitemset;
- for (i = 0; i < statep->nitems; i++)
+ obstack_fgrow1 (node_obstack, "%2d: ", state->number);
+ for (i = 0; i < snitems; i++)
{
short *sp;
short *sp1;
int rule;
- sp1 = sp = ritem + statep->items[i];
+ sp1 = sp = ritem + sitems[i];
while (*sp > 0)
sp++;
rule = -(*sp);
if (i)
- obstack_1grow (node_obstack, '\n');
- obstack_fgrow1 (node_obstack, "%d: ", rule);
- obstack_fgrow1 (node_obstack, " %s -> ",
+ obstack_sgrow (node_obstack, "\n ");
+ obstack_fgrow1 (node_obstack, " %s -> ",
tags[rule_table[rule].lhs]);
for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
`---------------------------------------------------------------*/
static void
-print_actions (int state, const char *node_name)
+print_actions (state_t *state, const char *node_name)
{
int i;
- shifts *shiftp = state_table[state]->shifts;
- reductions *redp = state_table[state]->reductions;
+ shifts *shiftp = state->shifts;
+ reductions *redp = state->reductions;
#if 0
- errs *errp = state_table[state]->errs;
+ errs *errp = state->errs;
#endif
static char buff[10];
new_edge (&edge);
- if (state > state1)
+ if (state->number > state1)
edge.type = back_edge;
open_edge (&edge, fgraph);
/* The edge source is the current node. */
edge.sourcename = node_name;
sprintf (buff, "%d", state1);
edge.targetname = buff;
- edge.color = (symbol == 0) ? red : blue;
+ /* Shifts are blue, gotos are red. */
+ edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red;
edge.label = tags[symbol];
output_edge (&edge, fgraph);
close_edge (fgraph);
obstack_1grow (node_obstack, '\n');
}
- if (state_table[state]->consistent && redp)
+ if (state->consistent && redp)
{
rule = redp->rules[0];
symbol = rule_table[rule].lhs;
rule, tags[symbol]);
}
#endif
-
- if (i < shiftp->nshifts)
- for (; i < shiftp->nshifts; i++)
- if (!SHIFT_IS_DISABLED (shiftp, i))
- {
- int state1 = shiftp->shifts[i];
- int symbol = state_table[state1]->accessing_symbol;
-
- new_edge (&edge);
- open_edge (&edge, fgraph);
- edge.sourcename = node_name;
- sprintf (buff, "%d", state1);
- edge.targetname = buff;
- edge.color = red;
- edge.label = tags[symbol];
- output_edge (&edge, fgraph);
- close_edge (fgraph);
- }
}
`-------------------------------------------------------------*/
static void
-print_state (int state)
+print_state (state_t *state)
{
static char name[10];
struct obstack node_obstack;
/* The labels of the nodes are their the items. */
obstack_init (&node_obstack);
new_node (&node);
- sprintf (name, "%d", state);
+ sprintf (name, "%d", state->number);
node.title = name;
print_core (state, &node_obstack);
obstack_1grow (&node_obstack, '\0');
{
int i;
- if (!graph_flag)
- return;
-
/* Output file. */
fgraph = xfopen (spec_graph_file, "w");
output_graph (&graph, fgraph);
/* Output nodes and edges. */
+ new_closure (nitems);
for (i = 0; i < nstates; i++)
- print_state (i);
+ print_state (state_table[i]);
+ free_closure ();
/* Close graph. */
close_graph (&graph, fgraph);