Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 08:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/print.c, src/print_graph.c (escape): New.

Browse Source 
Use it to quote the TAGS outputs.
* src/print_graph.c (print_state): Now errors are in red, and
reductions in green.
Prefer high to wide: output the state number on a line of its own.
This commit is contained in:
Akim Demaille
2001-12-27 18:11:20 +00:00
parent 80dac38c5e
commit 8adfa272f7
3 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2001-12-27 Akim Demaille <akim@epita.fr>
* src/print.c, src/print_graph.c (escape): New.
Use it to quote the TAGS outputs.
* src/print_graph.c (print_state): Now errors are in red, and
reductions in green.
Prefer high to wide: output the state number on a line of its own.
2001-12-27 Akim Demaille <akim@epita.fr> 2001-12-27 Akim Demaille <akim@epita.fr>
* src/state.h, src/state.c (reductions_new): New. * src/state.h, src/state.c (reductions_new): New.

62
src/print.c
View File

@@ -20,6 +20,7 @@
#include "system.h" #include "system.h"
#include "quotearg.h"
#include "files.h" #include "files.h"
#include "gram.h" #include "gram.h"
#include "LR0.h" #include "LR0.h"
@@ -43,6 +44,19 @@ print_token (int extnum, int token)
} }
#endif #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. | | Report information on a state. |
@@ -78,15 +92,15 @@ print_core (FILE *out, state_t *state)
sp++; sp++;
rule = -(*sp); rule = -(*sp);
fprintf (out, " %s -> ", tags[rule_table[rule].lhs]); fprintf (out, " %s -> ", escape (tags[rule_table[rule].lhs]));
for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++) for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
fprintf (out, "%s ", tags[*sp]); fprintf (out, "%s ", escape (tags[*sp]));
fputc ('.', out); fputc ('.', out);
for (/* Nothing */; *sp > 0; ++sp) for (/* Nothing */; *sp > 0; ++sp)
fprintf (out, " %s", tags[*sp]); fprintf (out, " %s", escape (tags[*sp]));
fprintf (out, _(" (rule %d)"), rule); fprintf (out, _(" (rule %d)"), rule);
fputc ('\n', out); fputc ('\n', out);
@@ -110,7 +124,7 @@ print_shifts (FILE *out, state_t *state)
int symbol = state_table[state1]->accessing_symbol; int symbol = state_table[state1]->accessing_symbol;
fprintf (out, fprintf (out,
_(" %-4s\tshift, and go to state %d\n"), _(" %-4s\tshift, and go to state %d\n"),
tags[symbol], state1); escape (tags[symbol]), state1);
} }
if (i > 0) if (i > 0)
@@ -127,7 +141,7 @@ print_errs (FILE *out, state_t *state)
for (i = 0; i < errp->nerrs; ++i) for (i = 0; i < errp->nerrs; ++i)
if (errp->errs[i]) if (errp->errs[i])
fprintf (out, _(" %-4s\terror (nonassociative)\n"), fprintf (out, _(" %-4s\terror (nonassociative)\n"),
tags[errp->errs[i]]); escape (tags[errp->errs[i]]));
if (i > 0) if (i > 0)
fputc ('\n', out); fputc ('\n', out);
@@ -151,7 +165,7 @@ print_gotos (FILE *out, state_t *state)
int state1 = shiftp->shifts[i]; int state1 = shiftp->shifts[i];
int symbol = state_table[state1]->accessing_symbol; int symbol = state_table[state1]->accessing_symbol;
fprintf (out, _(" %-4s\tgo to state %d\n"), fprintf (out, _(" %-4s\tgo to state %d\n"),
tags[symbol], state1); escape (tags[symbol]), state1);
} }
fputc ('\n', out); fputc ('\n', out);
@@ -175,7 +189,7 @@ print_reductions (FILE *out, state_t *state)
int rule = redp->rules[0]; int rule = redp->rules[0];
int symbol = rule_table[rule].lhs; int symbol = rule_table[rule].lhs;
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
rule, tags[symbol]); rule, escape (tags[symbol]));
return; return;
} }
@@ -207,11 +221,11 @@ print_reductions (FILE *out, state_t *state)
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
if (BITISSET (lookaheadset, i)) if (BITISSET (lookaheadset, i))
fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"), fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
tags[i], default_rule, escape (tags[i]), default_rule,
tags[rule_table[default_rule].lhs]); escape2 (tags[rule_table[default_rule].lhs]));
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
default_rule, tags[rule_table[default_rule].lhs]); default_rule, escape (tags[rule_table[default_rule].lhs]));
} }
else if (state->nlookaheads >= 1) else if (state->nlookaheads >= 1)
{ {
@@ -265,9 +279,9 @@ print_reductions (FILE *out, state_t *state)
if (state->lookaheadsp + j != default_LA) if (state->lookaheadsp + j != default_LA)
fprintf (out, fprintf (out,
_(" %-4s\treduce using rule %d (%s)\n"), _(" %-4s\treduce using rule %d (%s)\n"),
tags[i], escape (tags[i]),
LAruleno[state->lookaheadsp + j], LAruleno[state->lookaheadsp + j],
tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]); escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
else else
defaulted = 1; defaulted = 1;
@@ -278,15 +292,15 @@ print_reductions (FILE *out, state_t *state)
if (defaulted) if (defaulted)
fprintf (out, fprintf (out,
_(" %-4s\treduce using rule %d (%s)\n"), _(" %-4s\treduce using rule %d (%s)\n"),
tags[i], escape (tags[i]),
LAruleno[default_LA], LAruleno[default_LA],
tags[rule_table[LAruleno[default_LA]].lhs]); escape2 (tags[rule_table[LAruleno[default_LA]].lhs]));
defaulted = 0; defaulted = 0;
fprintf (out, fprintf (out,
_(" %-4s\t[reduce using rule %d (%s)]\n"), _(" %-4s\t[reduce using rule %d (%s)]\n"),
tags[i], escape (tags[i]),
LAruleno[state->lookaheadsp + j], LAruleno[state->lookaheadsp + j],
tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]); escape2 (tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]));
} }
} }
} }
@@ -294,7 +308,7 @@ print_reductions (FILE *out, state_t *state)
if (default_LA >= 0) if (default_LA >= 0)
fprintf (out, _(" $default\treduce using rule %d (%s)\n"), fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
default_rule, tags[rule_table[default_rule].lhs]); default_rule, escape (tags[rule_table[default_rule].lhs]));
} }
} }
@@ -361,11 +375,11 @@ print_grammar (FILE *out)
if (rule_table[i].useful) if (rule_table[i].useful)
{ {
fprintf (out, _(" %3d %3d %s ->"), fprintf (out, _(" %3d %3d %s ->"),
i, rule_table[i].line, tags[rule_table[i].lhs]); i, rule_table[i].line, escape (tags[rule_table[i].lhs]));
rule = &ritem[rule_table[i].rhs]; rule = &ritem[rule_table[i].rhs];
if (*rule > 0) if (*rule > 0)
while (*rule > 0) while (*rule > 0)
fprintf (out, " %s", tags[*rule++]); fprintf (out, " %s", escape (tags[*rule++]));
else else
fprintf (out, " /* %s */", _("empty")); fprintf (out, " /* %s */", _("empty"));
fputc ('\n', out); fputc ('\n', out);
@@ -375,14 +389,14 @@ print_grammar (FILE *out)
/* TERMINAL (type #) : rule #s terminal is on RHS */ /* TERMINAL (type #) : rule #s terminal is on RHS */
fprintf (out, "%s\n\n", _("Terminals, with rules where they appear")); fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
fprintf (out, "%s (-1)\n", tags[0]); fprintf (out, "%s (-1)\n", escape (tags[0]));
for (i = 0; i <= max_user_token_number; i++) for (i = 0; i <= max_user_token_number; i++)
if (token_translations[i] != 2) if (token_translations[i] != 2)
{ {
buffer[0] = 0; buffer[0] = 0;
column = strlen (tags[token_translations[i]]); column = strlen (escape (tags[token_translations[i]]));
fputs (tags[token_translations[i]], out); fputs (escape (tags[token_translations[i]]), out);
END_TEST (50); END_TEST (50);
sprintf (buffer, " (%d)", i); sprintf (buffer, " (%d)", i);
@@ -417,8 +431,8 @@ print_grammar (FILE *out)
} }
buffer[0] = 0; buffer[0] = 0;
fputs (tags[i], out); fputs (escape (tags[i]), out);
column = strlen (tags[i]); column = strlen (escape (tags[i]));
sprintf (buffer, " (%d)", i); sprintf (buffer, " (%d)", i);
END_TEST (0); END_TEST (0);

27
src/print_graph.c
View File

@@ -19,6 +19,7 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include "system.h" #include "system.h"
#include "quotearg.h"
#include "files.h" #include "files.h"
#include "gram.h" #include "gram.h"
#include "LR0.h" #include "LR0.h"
@@ -36,6 +37,13 @@
static graph_t graph; static graph_t graph;
static FILE *fgraph = NULL; static FILE *fgraph = NULL;
static inline const char *
escape (const char *s)
{
return quotearg_n_style (1, escape_quoting_style, s);
}
/* This part will construct the label of nodes. */ /* This part will construct the label of nodes. */
static void static void
print_core (state_t *state, struct obstack *node_obstack) print_core (state_t *state, struct obstack *node_obstack)
@@ -49,7 +57,7 @@ print_core (state_t *state, struct obstack *node_obstack)
sitems = itemset; sitems = itemset;
snitems = nitemset; snitems = nitemset;
obstack_fgrow1 (node_obstack, "%2d: ", state->number); obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
for (i = 0; i < snitems; i++) for (i = 0; i < snitems; i++)
{ {
short *sp; short *sp;
@@ -64,17 +72,17 @@ print_core (state_t *state, struct obstack *node_obstack)
rule = -(*sp); rule = -(*sp);
if (i) if (i)
obstack_sgrow (node_obstack, "\n "); obstack_1grow (node_obstack, '\n');
obstack_fgrow1 (node_obstack, " %s -> ", obstack_fgrow1 (node_obstack, " %s -> ",
tags[rule_table[rule].lhs]); escape (tags[rule_table[rule].lhs]));
for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++) for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
obstack_fgrow1 (node_obstack, "%s ", tags[*sp]); obstack_fgrow1 (node_obstack, "%s ", escape (tags[*sp]));
obstack_1grow (node_obstack, '.'); obstack_1grow (node_obstack, '.');
for (/* Nothing */; *sp > 0; ++sp) for (/* Nothing */; *sp > 0; ++sp)
obstack_fgrow1 (node_obstack, " %s", tags[*sp]); obstack_fgrow1 (node_obstack, " %s", escape (tags[*sp]));
} }
} }
@@ -113,9 +121,12 @@ print_actions (state_t *state, const char *node_name)
edge.sourcename = node_name; edge.sourcename = node_name;
sprintf (buff, "%d", state1); sprintf (buff, "%d", state1);
edge.targetname = buff; edge.targetname = buff;
/* Shifts are blue, gotos are red. */ /* Shifts are blue, gotos are green, and error is red. */
edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : red; if (SHIFT_IS_ERROR (shiftp, i))
edge.label = tags[symbol]; edge.color = red;
else
edge.color = SHIFT_IS_SHIFT(shiftp, i) ? blue : green;
edge.label = escape (tags[symbol]);
output_edge (&edge, fgraph); output_edge (&edge, fgraph);
close_edge (fgraph); close_edge (fgraph);
} }