[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02-print-eof.patch
From: |
Akim Demaille |
Subject: |
02-print-eof.patch |
Date: |
Thu, 13 Dec 2001 11:24:16 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/print.c (print_actions): Output the handling of `$' as the
traces do: shifting the token EOF. Before EOF was treated as a
nonterminal.
* tests/regression.at: Adjust some tests.
* src/print_graph.c (print_core): Complete the set of items via
closure. The next-to-final and final states are still unsatisfying,
but that's to be addressed elsewhere.
No longer output the rule numbers, but do output the state number.
A single loop for the shifts + gotos is enough, but picked a
distinct color for each.
(print_graph): Initialize and finalize closure.
Index: src/print.c
--- src/print.c Sat, 08 Dec 2001 17:14:16 +0100 akim
+++ src/print.c Tue, 11 Dec 2001 19:58:33 +0100 akim
@@ -111,21 +111,14 @@
return;
}
- for (i = 0; i < shiftp->nshifts; i++)
+ 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 = state_table[state1]->accessing_symbol;
- /* The following line used to be turned off. */
- if (ISVAR (symbol))
- break;
- if (symbol == 0) /* I.e. strcmp(tags[symbol],"$")==0 */
- fprintf (out,
- _(" $ \tgo to state %d\n"), state1);
- else
- fprintf (out,
- _(" %-4s\tshift, and go to state %d\n"),
- tags[symbol], state1);
+ fprintf (out,
+ _(" %-4s\tshift, and go to state %d\n"),
+ tags[symbol], state1);
}
if (i > 0)
Index: src/print_graph.c
--- src/print_graph.c Sat, 08 Dec 2001 13:33:23 +0100 akim
+++ src/print_graph.c Tue, 11 Dec 2001 20:21:57 +0100 akim
@@ -28,6 +28,7 @@
#include "getargs.h"
#include "state.h"
#include "reader.h"
+#include "closure.h"
#include "obstack.h"
#include "print_graph.h"
#include "vcg.h"
@@ -40,18 +41,22 @@
print_core (int state, struct obstack *node_obstack)
{
int i;
- state_t *statep = state_table[state];
+ short *sitems = state_table[state]->items;
+ int snitems = state_table[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);
+ 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++;
@@ -59,8 +64,7 @@
rule = -(*sp);
if (i)
- obstack_1grow (node_obstack, '\n');
- obstack_fgrow1 (node_obstack, "%d: ", rule);
+ obstack_sgrow (node_obstack, "\n ");
obstack_fgrow1 (node_obstack, " %s -> ",
tags[rule_table[rule].lhs]);
@@ -120,7 +124,8 @@
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);
@@ -162,24 +167,6 @@
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);
- }
}
@@ -249,8 +236,10 @@
output_graph (&graph, fgraph);
/* Output nodes and edges. */
+ new_closure (nitems);
for (i = 0; i < nstates; i++)
print_state (i);
+ free_closure ();
/* Close graph. */
close_graph (&graph, fgraph);
Index: tests/regression.at
--- tests/regression.at Sat, 08 Dec 2001 21:39:43 +0100 akim
+++ tests/regression.at Tue, 11 Dec 2001 20:37:19 +0100 akim
@@ -105,7 +105,7 @@ exp: exp OP exp | NUM;
exp -> exp . OP exp (rule 1)
- $ go to state 5
+ $ shift, and go to state 5
OP shift, and go to state 3
@@ -134,7 +134,7 @@ exp: exp OP exp | NUM;
state 5
- $ go to state 6
+ $ shift, and go to state 6
@@ -209,7 +209,7 @@ exp: exp OP exp | NUM;
exp -> exp . OP exp (rule 1)
- $ go to state 5
+ $ shift, and go to state 5
OP shift, and go to state 3
@@ -237,7 +237,7 @@ exp: exp OP exp | NUM;
state 5
- $ go to state 6
+ $ shift, and go to state 6
@@ -376,7 +376,7 @@ expr:
state 6
- $ go to state 7
+ $ shift, and go to state 7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 02-print-eof.patch,
Akim Demaille <=