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

* src/reader.c (reader): Remove call to free_symtab ().

Browse Source 
* src/main.c (main): Call it here.
Include symtab.h.
* src/conflicts.c (initialize_conflicts): Rename as...
(solve_conflicts): this.
* src/print.c (print_core, print_actions, print_state)
(print_grammar): Dump to a file instead a `output_obstack'.
(print_results): Dump `output_obstack', and then proceed with the
FILE *.
* src/files.c (compute_output_file_names, close_files): New.
(output_files): Adjust.
* src/main.c (main): Adjust.
This commit is contained in:
Akim Demaille
2001-09-24 08:15:53 +00:00
parent 9a96ccfa20
commit bb84601097
23 changed files with 715 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/conflicts.c
View File

@@ -30,12 +30,12 @@
#include "LR0.h"
int any_conflicts = 0;
errs **err_table;
errs **err_table = NULL;
int expected_conflicts;
static char *conflicts;
static char *conflicts = NULL;
static unsigned *shiftset;
static unsigned *lookaheadset;
static unsigned *shiftset = NULL;
static unsigned *lookaheadset = NULL;
static int src_total;
static int rrc_total;
static int src_count;
@@ -264,7 +264,7 @@ set_conflicts (int state)
}
void
initialize_conflicts (void)
solve_conflicts (void)
{
int i;
@@ -458,7 +458,7 @@ conflict_report (int src_num, int rrc_num)
`---------------------------------------------*/
void
print_conflicts (void)
print_conflicts (FILE *out)
{
int i;
@@ -478,9 +478,8 @@ print_conflicts (void)
if (verbose_flag)
{
obstack_fgrow1 (&output_obstack, _("State %d contains"), i);
obstack_sgrow (&output_obstack,
conflict_report (src_count, rrc_count));
fprintf (out, _("State %d contains"), i);
fputs (conflict_report (src_count, rrc_count), out);
}
}
}

4
src/conflicts.h
View File

@@ -22,8 +22,8 @@
# define CONFLICTS_H_
# include "state.h"
void initialize_conflicts PARAMS ((void));
void print_conflicts PARAMS ((void));
void solve_conflicts PARAMS ((void));
void print_conflicts PARAMS ((FILE *out));
void print_reductions PARAMS ((int));
void free_conflicts PARAMS ((void));

82
src/files.c
View File

@@ -39,6 +39,7 @@ struct obstack graph_obstack;
char *spec_outfile = NULL; /* for -o. */
char *spec_file_prefix = NULL; /* for -b. */
char *spec_name_prefix = NULL; /* for -p. */
char *spec_verbose_file = NULL; /* for --verbose. */
char *spec_graph_file = NULL; /* for -g. */
char *spec_defines_file = NULL; /* for --defines. */
@@ -97,7 +98,7 @@ compute_header_macro (void)
{
int ite;
char *macro_name;
if (spec_defines_file)
macro_name = xstrdup (spec_defines_file);
else
@@ -105,7 +106,7 @@ compute_header_macro (void)
macro_name = XMALLOC (char,
strlen (base_name) +
strlen (header_extension) + 1);
stpcpy (macro_name, base_name);
strcat (macro_name, header_extension);
}
@@ -392,6 +393,38 @@ compute_base_names (void)
}
}
/*-------------------------------------------------------.
| Close the open files, compute the output files names. |
`-------------------------------------------------------*/
void
compute_output_file_names (void)
{
compute_base_names ();
/* If not yet done. */
if (!src_extension)
src_extension = ".c";
if (!header_extension)
header_extension = ".h";
/* It the defines filename if not given, we create it. */
if (!spec_defines_file)
spec_defines_file = stringappend (base_name, header_extension);
/* It the graph filename if not given, we create it. */
if (!spec_graph_file)
spec_graph_file = stringappend (short_base_name, ".vcg");
spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
attrsfile = stringappend (short_base_name, EXT_STYPE_H);
#ifndef MSDOS
stringappend (attrsfile, header_extension);
#endif /* MSDOS */
}
/*-----------------------------------------------------------------.
| Open the input file. Look for the skeletons. Find the names of |
| the output files. Prepare the obstacks. |
@@ -414,36 +447,23 @@ open_files (void)
/*-----------------------------------------------------.
| Close the open files, produce all the output files. |
`-----------------------------------------------------*/
/*-----------------------.
| Close the open file.. |
`-----------------------*/
void
close_files (void)
{
xfclose (finput);
}
/*---------------------------.
| Produce the output files. |
`---------------------------*/
void
output_files (void)
{
xfclose (finput);
compute_base_names ();
/* If not yet done. */
if (!src_extension)
src_extension = ".c";
if (!header_extension)
header_extension = ".h";
/* It the defines filename if not given, we create it. */
if (!spec_defines_file)
spec_defines_file = stringappend (base_name, header_extension);
/* It the graph filename if not given, we create it. */
if (!spec_graph_file)
spec_graph_file = stringappend (short_base_name, ".vcg");
attrsfile = stringappend (short_base_name, EXT_STYPE_H);
#ifndef MSDOS
stringappend (attrsfile, header_extension);
#endif /* MSDOS */
/* Output the main file. */
if (spec_outfile)
obstack_save (&table_obstack, spec_outfile);
@@ -472,12 +492,6 @@ output_files (void)
obstack_save (&guard_obstack, temp_name);
}
if (verbose_flag)
/* We used to use just .out if spec_name_prefix (-p) was used, but
that conflicts with Posix. */
obstack_save (&output_obstack,
stringappend (short_base_name, EXT_OUTPUT));
if (graph_flag)
obstack_save (&graph_obstack, spec_graph_file);
}

7
src/files.h
View File

@@ -33,9 +33,12 @@ extern char *spec_name_prefix;
/* File name pfx specified with -b, or 0 if no -b. */
extern char *spec_file_prefix;
/* --verbose. */
extern char *spec_verbose_file;
/* File name specified for the output VCG graph. */
extern char *spec_graph_file;
/* File name specified with --defines. */
extern char *spec_defines_file;
@@ -69,7 +72,9 @@ extern char *infile;
extern char *attrsfile;
void open_files PARAMS((void));
void close_files PARAMS((void));
void compute_output_file_names PARAMS((void));
void output_files PARAMS((void));
FILE *xfopen PARAMS ((const char *name, const char *mode));

20
src/main.c
View File

@@ -34,6 +34,7 @@
#include "LR0.h"
#include "conflicts.h"
#include "print_graph.h"
#include "symtab.h"
/* The name this program was run with, for messages. */
char *program_name;
@@ -79,7 +80,15 @@ main (int argc, char *argv[])
lookahead is not enough to disambiguate the parsing. In file
conflicts. Also resolve s/r conflicts based on precedence
declarations. */
initialize_conflicts ();
solve_conflicts ();
/* Output file names. */
compute_output_file_names ();
/* Stop if there were errors, to avoid trashing previous output
files. */
if (complain_message_count)
exit (1);
/* Print information about results, if requested. */
print_results ();
@@ -90,12 +99,17 @@ main (int argc, char *argv[])
/* Output the tables and the parser to ftable. In file output. */
output ();
/* Free the symbol table data structure. */
free_symtab ();
/* Close the input files. */
close_files ();
free_conflicts ();
free_nullable ();
free_derives ();
if (!complain_message_count)
output_files ();
output_files ();
exit (complain_message_count ? 1 : 0);
}

148
src/print.c
View File

@@ -35,17 +35,17 @@
static void
print_token (int extnum, int token)
{
obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);
}
#endif
/*================================\
/*--------------------------------.
| Report information on a state. |
\================================*/
`--------------------------------*/
static void
print_core (int state)
print_core (FILE *out, int state)
{
int i;
int k;
@@ -68,30 +68,30 @@ print_core (int state)
sp++;
rule = -(*sp);
obstack_fgrow1 (&output_obstack, " %s -> ", tags[rlhs[rule]]);
fprintf (out, " %s -> ", tags[rlhs[rule]]);
for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
{
obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
fprintf (out, "%s ", tags[*sp]);
}
obstack_1grow (&output_obstack, '.');
fputc ('.', out);
while (*sp > 0)
{
obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
fprintf (out, " %s", tags[*sp]);
sp++;
}
obstack_fgrow1 (&output_obstack, _(" (rule %d)"), rule);
obstack_1grow (&output_obstack, '\n');
fprintf (out, _(" (rule %d)"), rule);
fputc ('\n', out);
}
obstack_1grow (&output_obstack, '\n');
fputc ('\n', out);
}
static void
print_actions (int state)
print_actions (FILE *out, int state)
{
int i;
int k;
@@ -109,9 +109,9 @@ print_actions (int state)
if (!shiftp && !redp)
{
if (final_state == state)
obstack_sgrow (&output_obstack, _(" $default\taccept\n"));
fprintf (out, _(" $default\taccept\n"));
else
obstack_sgrow (&output_obstack, _(" NO ACTIONS\n"));
fprintf (out, _(" NO ACTIONS\n"));
return;
}
@@ -129,16 +129,16 @@ print_actions (int state)
if (ISVAR (symbol))
break;
if (symbol == 0) /* I.e. strcmp(tags[symbol],"$")==0 */
obstack_fgrow1 (&output_obstack,
_(" $ \tgo to state %d\n"), state1);
fprintf (out,
_(" $ \tgo to state %d\n"), state1);
else
obstack_fgrow2 (&output_obstack,
_(" %-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)
obstack_1grow (&output_obstack, '\n');
fputc ('\n', out);
}
else
{
@@ -157,21 +157,20 @@ print_actions (int state)
if (!errp->errs[j])
continue;
symbol = errp->errs[j];
obstack_fgrow1 (&output_obstack, _(" %-4s\terror (nonassociative)\n"),
fprintf (out, _(" %-4s\terror (nonassociative)\n"),
tags[symbol]);
}
if (j > 0)
obstack_1grow (&output_obstack, '\n');
fputc ('\n', out);
}
if (consistent[state] && redp)
{
rule = redp->rules[0];
symbol = rlhs[rule];
obstack_fgrow2 (&output_obstack,
_(" $default\treduce using rule %d (%s)\n\n"),
rule, tags[symbol]);
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
rule, tags[symbol]);
}
else if (redp)
{
@@ -186,42 +185,41 @@ print_actions (int state)
continue;
state1 = shiftp->shifts[i];
symbol = accessing_symbol[state1];
obstack_fgrow2 (&output_obstack,
_(" %-4s\tgo to state %d\n"),
tags[symbol], state1);
fprintf (out, _(" %-4s\tgo to state %d\n"),
tags[symbol], state1);
}
obstack_1grow (&output_obstack, '\n');
fputc ('\n', out);
}
}
static void
print_state (int state)
print_state (FILE *out, int state)
{
obstack_sgrow (&output_obstack, "\n\n");
obstack_fgrow1 (&output_obstack, _("state %d"), state);
obstack_sgrow (&output_obstack, "\n\n");
print_core (state);
print_actions (state);
fputs ("\n\n", out);
fprintf (out, _("state %d"), state);
fputs ("\n\n", out);
print_core (out, state);
print_actions (out, state);
}
/*-----------------------------------------.
| Print information on the whole grammar. |
`-----------------------------------------*/
#define END_TEST(End) \
do { \
if (column + strlen(buffer) > (End)) \
{ \
obstack_fgrow1 (&output_obstack, "%s\n ", buffer); \
column = 3; \
buffer[0] = 0; \
} \
#define END_TEST(End) \
do { \
if (column + strlen(buffer) > (End)) \
{ \
fprintf (out, "%s\n ", buffer); \
column = 3; \
buffer[0] = 0; \
} \
} while (0)
static void
print_grammar (void)
print_grammar (FILE *out)
{
int i, j;
short *rule;
@@ -229,37 +227,30 @@ print_grammar (void)
int column = 0;
/* rule # : LHS -> RHS */
obstack_1grow (&output_obstack, '\n');
obstack_sgrow (&output_obstack, _("Grammar"));
obstack_1grow (&output_obstack, '\n');
fprintf (out, "\n%s\n", _("Grammar"));
for (i = 1; i <= nrules; i++)
/* Don't print rules disabled in reduce_grammar_tables. */
if (rlhs[i] >= 0)
{
obstack_fgrow2 (&output_obstack,
_("rule %-4d %s ->"), i, tags[rlhs[i]]);
fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
rule = &ritem[rrhs[i]];
if (*rule > 0)
while (*rule > 0)
obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
fprintf (out, " %s", tags[*rule++]);
else
obstack_sgrow (&output_obstack, _(" /* empty */"));
obstack_1grow (&output_obstack, '\n');
fprintf (out, " /* %s */\n", _("empty"));
}
/* TERMINAL (type #) : rule #s terminal is on RHS */
obstack_sgrow (&output_obstack, "\n");
obstack_sgrow (&output_obstack,
_("Terminals, with rules where they appear"));
obstack_sgrow (&output_obstack, "\n\n");
obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
fprintf (out, "%s (-1)\n", tags[0]);
for (i = 0; i <= max_user_token_number; i++)
if (token_translations[i] != 2)
{
buffer[0] = 0;
column = strlen (tags[token_translations[i]]);
obstack_sgrow (&output_obstack, tags[token_translations[i]]);
fputs (tags[token_translations[i]], out);
END_TEST (50);
sprintf (buffer, " (%d)", i);
@@ -271,13 +262,11 @@ print_grammar (void)
sprintf (buffer + strlen (buffer), " %d", j);
break;
}
obstack_fgrow1 (&output_obstack, "%s\n", buffer);
fprintf (out, "%s\n", buffer);
}
obstack_sgrow (&output_obstack, "\n");
obstack_sgrow (&output_obstack,
_("Nonterminals, with rules where they appear"));
obstack_sgrow (&output_obstack, "\n\n");
fprintf (out, "\n%s\n\n",
_("Nonterminals, with rules where they appear"));
for (i = ntokens; i <= nsyms - 1; i++)
{
int left_count = 0, right_count = 0;
@@ -295,7 +284,7 @@ print_grammar (void)
}
buffer[0] = 0;
obstack_sgrow (&output_obstack, tags[i]);
fputs (tags[i], out);
column = strlen (tags[i]);
sprintf (buffer, " (%d)", i);
END_TEST (0);
@@ -330,22 +319,33 @@ print_grammar (void)
}
}
}
obstack_fgrow1 (&output_obstack, "%s\n", buffer);
fprintf (out, "%s\n", buffer);
}
}
void
print_results (void)
{
int i;
if (any_conflicts)
print_conflicts ();
if (verbose_flag)
print_grammar ();
{
int i;
if (verbose_flag)
for (i = 0; i < nstates; i++)
print_state (i);
/* We used to use just .out if spec_name_prefix (-p) was used, but
that conflicts with Posix. */
FILE *out = xfopen (spec_verbose_file, "w");
size_t size = obstack_object_size (&output_obstack);
fwrite (obstack_finish (&output_obstack), 1, size, out);
if (any_conflicts)
print_conflicts (out);
print_grammar (out);
for (i = 0; i < nstates; i++)
print_state (out, i);
xfclose (out);
}
obstack_free (&output_obstack, NULL);
}

3
src/reader.c
View File

@@ -1959,9 +1959,6 @@ reader (void)
packsymbols ();
/* Convert the grammar into the format described in gram.h. */
packgram ();
/* Free the symbol table data structure since symbols are now all
referred to by symbol number. */
free_symtab ();
}