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

Remove the last uses of mktemp and unlink/delete.

Browse Source 
* src/files.c (fdefines, ftable): Removed.
(defines_ostack, table_obstack): New.
Adjust dependencies of the former into uses of the latter.
* src/output.c (output_short_or_char_table, output_short_table):
Convert to using obstacks.
* src/reader.c (copy_comment2): Accept one FILE * and two
obstacks.
(output_token_defines, reader_output_yylsp): Use obstacks.
* src/system.h (obstack_fgrow3): New.
This commit is contained in:
Akim Demaille
2000-11-02 13:38:12 +00:00
parent dd60faeca4
commit 896fe5c10a
14 changed files with 556 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/files.c
View File

@@ -49,13 +49,13 @@
FILE *finput = NULL;
FILE *foutput = NULL;
FILE *fdefines = NULL;
FILE *ftable = NULL;
FILE *fguard = NULL;
FILE *fparser = NULL;
struct obstack action_obstack;
struct obstack attrs_obstack;
struct obstack table_obstack;
struct obstack defines_obstack;
/* File name specified with -o for the output file, or 0 if no -o. */
char *spec_outfile;
@@ -68,10 +68,7 @@ static char *defsfile;
static char *tabfile;
static char *guardfile;
static char *actfile;
static char *tmptabfile;
static char *tmpdefsfile;
extern char *mktemp (); /* So the compiler won't complain */
extern char *getenv ();
extern char *program_name;
@@ -189,7 +186,7 @@ open_files (void)
if (spec_outfile)
{
/* -o was specified. The precise -o name will be used for ftable.
/* -o was specified. The precise -o name will be used for FTABLE.
For other output files, remove the ".c" or ".tab.c" suffix. */
name_base = spec_outfile;
#ifdef MSDOS
@@ -291,27 +288,11 @@ open_files (void)
actfile = stringappend (name_base, short_base_length, ".act");
}
#ifdef MSDOS
tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "taXXXXXX"));
tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "deXXXXXX"));
#else
tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "tab.XXXXXX"));
tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "defs.XXXXXX"));
#endif /* not MSDOS */
ftable = xfopen (tmptabfile, "w+");
if (defines_flag)
{
defsfile = stringappend (name_base, base_length, ".h");
fdefines = xfopen (tmpdefsfile, "w+");
}
#if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
unlink (tmptabfile);
unlink (tmpdefsfile);
#endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
/* These are opened by `done' or `open_extra_files', if at all */
if (spec_outfile)
tabfile = spec_outfile;
@@ -334,6 +315,8 @@ open_files (void)
/* Initialize the obstacks. */
obstack_init (&action_obstack);
obstack_init (&attrs_obstack);
obstack_init (&table_obstack);
obstack_init (&defines_obstack);
}
@@ -384,27 +367,21 @@ done (void)
xfclose (foutput);
/* JF write out the output file */
if (!complain_message_count && ftable)
if (!complain_message_count)
{
FILE *ftmp;
register int c;
ftmp = xfopen (tabfile, "w");
rewind (ftable);
while ((c = getc (ftable)) != EOF)
putc (c, ftmp);
xfclose (ftmp);
xfclose (ftable);
/* Output the main file. */
FILE *ftab = xfopen (tabfile, "w");
size_t size = obstack_object_size (&table_obstack);
fwrite (obstack_finish (&table_obstack), 1, size, ftab);
xfclose (ftab);
/* Output the header file is wanted. */
if (defines_flag)
{
ftmp = xfopen (defsfile, "w");
fflush (fdefines);
rewind (fdefines);
while ((c = getc (fdefines)) != EOF)
putc (c, ftmp);
xfclose (ftmp);
xfclose (fdefines);
FILE *fdefs = xfopen (defsfile, "w");
size_t size = obstack_object_size (&defines_obstack);
fwrite (obstack_finish (&defines_obstack), 1, size, fdefs);
xfclose (fdefs);
}
}
@@ -428,21 +405,6 @@ done (void)
xfclose (fattrs);
}
#if defined (VMS) & !defined (__VMS_POSIX)
if (ftable)
delete (tmptabfile);
/* Don't call exit again, we're in atexit ().
if (!complain_message_count)
sys$exit(SS$_NORMAL);
sys$exit(SS$_ABORT); */
#else
#if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
if (tmptabfile)
unlink (tmptabfile);
if (tmpdefsfile)
unlink (tmpdefsfile);
#endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
/* Don't call exit again, we're in atexit ().
exit (complain_message_count ? 1 : 0); */
#endif /* not VMS, or __VMS_POSIX */
}

11
src/files.h
View File

@@ -29,9 +29,6 @@
extern FILE *finput; /* read grammar specifications */
extern FILE *foutput; /* optionally output messages describing the actions taken */
extern FILE *fdefines; /* optionally output #define's for token numbers. */
extern FILE *ftable; /* output the tables and the parser */
/* and also contains all the %{ ... %} definitions. */
extern FILE *fguard; /* if semantic parser, output yyguard, containing all the guard code */
extern FILE *fparser; /* read the parser to copy into ftable */
@@ -49,6 +46,14 @@ extern struct obstack action_obstack;
/* If semantic parser, output a .h file that defines YYSTYPE */
extern struct obstack attrs_obstack;
/* Output the tables and the parser and also contains all the %{
... %} definitions. */
extern struct obstack table_obstack;
/* optionally output #define's for token numbers. */
extern struct obstack defines_obstack;
extern char *infile;
extern int lineno;
extern char *outfile;

197
src/output.c
View File

@@ -126,7 +126,7 @@ static int high;
static inline void
output_short_or_char_table (FILE *out,
output_short_or_char_table (struct obstack *oout,
const char *comment,
const char *type,
const char *table_name,
@@ -137,19 +137,19 @@ output_short_or_char_table (FILE *out,
int i, j;
if (comment)
fprintf (out, "/* %s. */\n", comment);
obstack_fgrow1 (oout, "/* %s. */\n", comment);
fprintf (out, "static const %s %s[] =\n{\n %6d",
type, table_name, first_value);
obstack_fgrow3 (oout, "static const %s %s[] =\n{\n %6d",
type, table_name, first_value);
j = 1;
for (i = begin; i < end; i++)
{
putc (',', out);
obstack_1grow (oout, ',');
if (j >= 10)
{
fputs ("\n ", out);
obstack_grow_literal_string (oout, "\n ");
j = 1;
}
else
@@ -157,22 +157,22 @@ output_short_or_char_table (FILE *out,
j++;
}
fprintf (out, "%6d", short_table[i]);
obstack_fgrow1 (oout, "%6d", short_table[i]);
}
fprintf (out, "\n};\n");
obstack_grow_literal_string (oout, "\n};\n");
}
static inline void
output_short_table (FILE *out,
output_short_table (struct obstack *oout,
const char *comment,
const char *table_name,
short *short_table,
short first_value,
short begin, short end)
{
output_short_or_char_table (out, comment, "short", table_name, short_table,
output_short_or_char_table (oout, comment, "short", table_name, short_table,
first_value, begin, end);
}
@@ -265,13 +265,20 @@ output_headers (void)
/* Rename certain symbols if -p was specified. */
if (spec_name_prefix)
{
fprintf (ftable, "#define yyparse %sparse\n", spec_name_prefix);
fprintf (ftable, "#define yylex %slex\n", spec_name_prefix);
fprintf (ftable, "#define yyerror %serror\n", spec_name_prefix);
fprintf (ftable, "#define yylval %slval\n", spec_name_prefix);
fprintf (ftable, "#define yychar %schar\n", spec_name_prefix);
fprintf (ftable, "#define yydebug %sdebug\n", spec_name_prefix);
fprintf (ftable, "#define yynerrs %snerrs\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yyparse %sparse\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yylex %slex\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yyerror %serror\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yylval %slval\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yychar %schar\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yydebug %sdebug\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
"#define yynerrs %snerrs\n", spec_name_prefix);
}
}
@@ -305,19 +312,19 @@ output_trailers (void)
static void
output_token_translations (void)
{
fputs ("\
obstack_grow_literal_string (&table_obstack, "\
\n\
/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n",
ftable);
/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");
if (translations)
{
fprintf (ftable,
obstack_fgrow2 (&table_obstack,
"#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
\n\
\n",
max_user_token_number, nsyms);
output_short_or_char_table (ftable,
output_short_or_char_table (&table_obstack,
"YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
ntokens < 127 ? "char" : "short",
"yytranslate", token_translations,
@@ -325,7 +332,8 @@ output_token_translations (void)
}
else
{
fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n");
obstack_grow_literal_string (&table_obstack,
"\n#define YYTRANSLATE(x) (x)\n");
}
}
@@ -337,9 +345,9 @@ output_gram (void)
yyprhs and yyrhs are needed only for yydebug. */
/* With the no_parser option, all tables are generated */
if (!semantic_parser && !no_parser_flag)
fprintf (ftable, "\n#if YYDEBUG != 0\n");
obstack_grow_literal_string (&table_obstack, "\n#if YYDEBUG != 0\n");
output_short_table (ftable, NULL, "yyprhs", rrhs,
output_short_table (&table_obstack, NULL, "yyprhs", rrhs,
0, 1, nrules + 1);
{
@@ -354,20 +362,20 @@ output_gram (void)
for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
yyrhs[i] = *sp > 0 ? *sp : 0;
output_short_table (ftable, NULL, "yyrhs", yyrhs,
output_short_table (&table_obstack, NULL, "yyrhs", yyrhs,
ritem[0], 1, yyrhs_size);
XFREE (yyrhs);
}
if (!semantic_parser && !no_parser_flag)
fprintf (ftable, "\n#endif\n");
obstack_grow_literal_string (&table_obstack, "\n#endif\n");
}
static void
output_stos (void)
{
output_short_table (ftable, NULL, "yystos", accessing_symbol,
output_short_table (&table_obstack, NULL, "yystos", accessing_symbol,
0, 1, nstates);
}
@@ -379,33 +387,33 @@ output_rule_data (void)
int j;
short *short_tab = NULL;
fputs ("\n\
#if YYDEBUG != 0\n",
ftable);
obstack_grow_literal_string (&table_obstack, "\n\
#if YYDEBUG != 0\n");
output_short_table (ftable,
output_short_table (&table_obstack,
"YYRLINE[YYN] -- source line where rule number YYN was defined",
"yyrline", rline,
0, 1, nrules + 1);
fputs ("#endif\n\n", ftable);
obstack_grow_literal_string (&table_obstack, "#endif\n\n");
if (token_table_flag || no_parser_flag)
{
fprintf (ftable, "#define YYNTOKENS %d\n", ntokens);
fprintf (ftable, "#define YYNNTS %d\n", nvars);
fprintf (ftable, "#define YYNRULES %d\n", nrules);
fprintf (ftable, "#define YYNSTATES %d\n", nstates);
fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number);
obstack_fgrow1 (&table_obstack, "#define YYNTOKENS %d\n", ntokens);
obstack_fgrow1 (&table_obstack, "#define YYNNTS %d\n", nvars);
obstack_fgrow1 (&table_obstack, "#define YYNRULES %d\n", nrules);
obstack_fgrow1 (&table_obstack, "#define YYNSTATES %d\n", nstates);
obstack_fgrow1 (&table_obstack, "#define YYMAXUTOK %d\n\n",
max_user_token_number);
}
/* Output the table of symbol names. */
if (!token_table_flag && !no_parser_flag)
fputs ("\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n", ftable);
fputs ("\
/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n",
ftable);
fprintf (ftable,
obstack_grow_literal_string (&table_obstack,
"\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
obstack_grow_literal_string (&table_obstack, "\
/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
obstack_grow_literal_string (&table_obstack,
"static const char *const yytname[] =\n{\n ");
j = 0;
@@ -429,76 +437,76 @@ output_rule_data (void)
if (j + strsize > 75)
{
fputs ("\n ", ftable);
obstack_grow_literal_string (&table_obstack, "\n ");
j = 2;
}
putc ('\"', ftable);
obstack_1grow (&table_obstack, '\"');
for (p = tags[i]; p && *p; p++)
{
if (*p == '"' || *p == '\\')
{
fprintf (ftable, "\\%c", *p);
obstack_fgrow1 (&table_obstack, "\\%c", *p);
}
else if (*p == '\n')
{
fprintf (ftable, "\\n");
obstack_grow_literal_string (&table_obstack, "\\n");
}
else if (*p == '\t')
{
fprintf (ftable, "\\t");
obstack_grow_literal_string (&table_obstack, "\\t");
}
else if (*p == '\b')
{
fprintf (ftable, "\\b");
obstack_grow_literal_string (&table_obstack, "\\b");
}
else if (*p < 040 || *p >= 0177)
{
fprintf (ftable, "\\%03o", *p);
obstack_fgrow1 (&table_obstack, "\\%03o", *p);
}
else
{
putc (*p, ftable);
obstack_1grow (&table_obstack, *p);
}
}
fputs ("\", ", ftable);
obstack_grow_literal_string (&table_obstack, "\", ");
j += strsize;
}
/* add a NULL entry to list of tokens */
fprintf (ftable, "NULL\n};\n");
obstack_grow_literal_string (&table_obstack, "NULL\n};\n");
if (!token_table_flag && !no_parser_flag)
fprintf (ftable, "#endif\n\n");
obstack_grow_literal_string (&table_obstack, "#endif\n\n");
/* Output YYTOKNUM. */
if (token_table_flag)
{
output_short_table (ftable,
output_short_table (&table_obstack,
"YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX",
"yytoknum", user_toknums,
0, 1, ntokens + 1);
}
/* Output YYR1. */
output_short_table (ftable,
output_short_table (&table_obstack,
"YYR1[YYN] -- Symbol number of symbol that rule YYN derives",
"yyr1", rlhs,
0, 1, nrules + 1);
XFREE (rlhs + 1);
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
/* Output YYR2. */
short_tab = XMALLOC (short, nrules + 1);
for (i = 1; i < nrules; i++)
short_tab[i] = rrhs[i + 1] - rrhs[i] - 1;
short_tab[nrules] = nitems - rrhs[nrules] - 1;
output_short_table (ftable,
output_short_table (&table_obstack,
"YYR2[YYN] -- Number of symbols composing right hand side of rule YYN",
"yyr2", short_tab,
0, 1, nrules + 1);
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
XFREE (short_tab);
@@ -509,9 +517,9 @@ output_rule_data (void)
static void
output_defines (void)
{
fprintf (ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
fprintf (ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT);
fprintf (ftable, "#define\tYYNTBASE\t%d\n", ntokens);
obstack_fgrow1 (&table_obstack, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
obstack_fgrow1 (&table_obstack, "#define\tYYFLAG\t\t%d\n", MINSHORT);
obstack_fgrow1 (&table_obstack, "#define\tYYNTBASE\t%d\n", ntokens);
}
@@ -757,13 +765,13 @@ token_actions (void)
}
XFREE (actrow);
output_short_table (ftable,
output_short_table (&table_obstack,
"YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE\n\
doesn't specify something else to do. Zero means the default is an\n\
error",
"yydefact", yydefact,
yydefact[0], 1, nstates);
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
XFREE (yydefact);
}
@@ -901,7 +909,7 @@ goto_actions (void)
yydefgoto[i - ntokens] = default_state;
}
output_short_table (ftable, NULL, "yydefgoto", yydefgoto,
output_short_table (&table_obstack, NULL, "yydefgoto", yydefgoto,
yydefgoto[0], 1, nsyms - ntokens);
XFREE (state_count);
@@ -1104,12 +1112,12 @@ pack_table (void)
static void
output_base (void)
{
output_short_table (ftable, NULL, "yypact", base,
output_short_table (&table_obstack, NULL, "yypact", base,
base[0], 1, nstates);
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
output_short_table (ftable, NULL, "yypgoto", base,
output_short_table (&table_obstack, NULL, "yypgoto", base,
base[nstates], nstates + 1, nvectors);
XFREE (base);
@@ -1119,8 +1127,8 @@ output_base (void)
static void
output_table (void)
{
fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
output_short_table (ftable, NULL, "yytable", table,
obstack_fgrow1 (&table_obstack, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
output_short_table (&table_obstack, NULL, "yytable", table,
table[0], 1, high + 1);
XFREE (table);
}
@@ -1129,7 +1137,7 @@ output_table (void)
static void
output_check (void)
{
output_short_table (ftable, NULL, "yycheck", check,
output_short_table (&table_obstack, NULL, "yycheck", check,
check[0], 1, high + 1);
XFREE (check);
}
@@ -1162,10 +1170,10 @@ output_actions (void)
sort_actions ();
pack_table ();
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
output_base ();
output_table ();
putc ('\n', ftable);
obstack_1grow (&table_obstack, '\n');
output_check ();
}
@@ -1183,7 +1191,7 @@ output_parser (void)
#endif
if (pure_parser)
fprintf (ftable, "#define YYPURE 1\n\n");
obstack_grow_literal_string (&table_obstack, "#define YYPURE 1\n\n");
#ifdef DONTDEF
/* JF no longer needed 'cuz open_extra_files changes the currently
@@ -1220,16 +1228,16 @@ output_parser (void)
if (c == 'e')
write_line = 0;
else
fprintf (ftable, "#lin");
obstack_grow_literal_string (&table_obstack, "#lin");
}
else
fprintf (ftable, "#li");
obstack_grow_literal_string (&table_obstack, "#li");
}
else
fprintf (ftable, "#l");
obstack_grow_literal_string (&table_obstack, "#l");
}
else
fprintf (ftable, "#");
obstack_grow_literal_string (&table_obstack, "#");
}
/* now write out the line... */
@@ -1244,18 +1252,19 @@ output_parser (void)
number_of_dollar_signs++;
assert (number_of_dollar_signs == 1);
fwrite (obstack_finish (&action_obstack),
1, size, ftable);
obstack_grow (&table_obstack,
obstack_finish (&action_obstack),
size);
/* Skip the end of the line containing `$'. */
write_line = 0;
}
else
putc (c, ftable);
obstack_1grow (&table_obstack, c);
}
if (c == EOF)
break;
putc (c, ftable);
obstack_1grow (&table_obstack, c);
}
assert (number_of_dollar_signs == 1);
}
@@ -1266,12 +1275,12 @@ output_program (void)
int c;
if (!no_lines_flag)
fprintf (ftable, "#line %d \"%s\"\n", lineno, infile);
obstack_fgrow2 (&table_obstack, "#line %d \"%s\"\n", lineno, infile);
c = getc (finput);
while (c != EOF)
{
putc (c, ftable);
obstack_1grow (&table_obstack, c);
c = getc (finput);
}
}
@@ -1304,36 +1313,34 @@ output (void)
/* output_token_defines(ftable); / * JF put out token defines FIRST */
/* If using a simple parser the definition of YYSTYPE are put into
FTABLE. */
TABLE_OBSTACK. */
if (!semantic_parser)
{
size_t size = obstack_object_size (&attrs_obstack);
fwrite (obstack_finish (&attrs_obstack), 1, size, ftable);
obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
}
reader_output_yylsp (ftable);
reader_output_yylsp (&table_obstack);
if (debug_flag)
fputs ("\
obstack_grow_literal_string (&table_obstack, "\
#ifndef YYDEBUG\n\
# define YYDEBUG 1\n\
#endif\n\
\n",
ftable);
\n");
if (semantic_parser)
fprintf (ftable, "#include \"%s\"\n", attrsfile);
obstack_fgrow1 (&table_obstack, "#include \"%s\"\n", attrsfile);
if (!no_parser_flag)
fprintf (ftable, "#include <stdio.h>\n\n");
obstack_grow_literal_string (&table_obstack, "#include <stdio.h>\n\n");
/* Make "const" do nothing if not in ANSI C. */
fputs ("\
obstack_grow_literal_string (&table_obstack, "\
#ifndef __cplusplus\n\
# ifndef __STDC__\n\
# define const\n\
# endif\n\
#endif\n\
\n",
ftable);
\n");
free_itemsets ();
output_defines ();

105
src/reader.c
View File

@@ -219,7 +219,8 @@ copy_string (FILE *fin, FILE *fout, struct obstack *oout, int match)
`----------------------------------------------------------------*/
static inline void
copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
copy_comment2 (FILE *fin, FILE *out1,
struct obstack *oout2, struct obstack *oout)
{
int cplus_comment;
int ended;
@@ -228,10 +229,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
/* We read a `/', output it. */
if (out1)
putc ('/', out1);
if (out2)
putc ('/', out2);
if (oout)
obstack_1grow (oout, '/');
if (oout2)
obstack_1grow (oout2, '/');
switch ((c = getc (fin)))
{
@@ -248,10 +249,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (oout2)
obstack_1grow (oout2, c);
c = getc (fin);
ended = 0;
@@ -263,10 +264,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
{
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (oout2)
obstack_1grow (oout2, c);
c = getc (fin);
}
@@ -274,10 +275,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
{
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (oout2)
obstack_1grow (oout2, c);
ended = 1;
}
}
@@ -286,10 +287,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
lineno++;
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (oout2)
obstack_1grow (oout2, c);
if (cplus_comment)
ended = 1;
else
@@ -301,10 +302,10 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
{
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (oout2)
obstack_1grow (oout2, c);
c = getc (fin);
}
}
@@ -783,16 +784,16 @@ parse_union_decl (void)
obstack_1grow (&attrs_obstack, '\n');
obstack_grow_literal_string (&attrs_obstack, "typedef union");
if (fdefines)
fprintf (fdefines, "typedef union");
if (defines_flag)
obstack_grow_literal_string (&defines_obstack, "typedef union");
c = getc (finput);
while (c != EOF)
{
obstack_1grow (&attrs_obstack, c);
if (fdefines)
putc (c, fdefines);
if (defines_flag)
obstack_grow_literal_string (&defines_obstack, c);
switch (c)
{
@@ -801,7 +802,7 @@ parse_union_decl (void)
break;
case '/':
copy_comment2 (finput, 0, fdefines, &attrs_obstack);
copy_comment2 (finput, 0, &defines_obstack, &attrs_obstack);
break;
case '{':
@@ -815,8 +816,8 @@ parse_union_decl (void)
if (count <= 0)
{
obstack_grow_literal_string (&attrs_obstack, " YYSTYPE;\n");
if (fdefines)
fprintf (fdefines, " YYSTYPE;\n");
if (defines_flag)
obstack_grow_literal_string (&defines_obstack, " YYSTYPE;\n");
/* JF don't choke on trailing semi */
c = skip_white_space ();
if (c != ';')
@@ -1595,8 +1596,11 @@ readgram (void)
Most programs should declare their own type anyway. */
obstack_grow_literal_string (&attrs_obstack,
"#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
if (fdefines)
fprintf (fdefines, "#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
if (defines_flag)
obstack_grow_literal_string (&defines_obstack, "\
#ifndef YYSTYPE\n\
# define YYSTYPE int\n\
#endif\n");
}
/* Report any undefined symbols and consider them nonterminals. */
@@ -1620,7 +1624,7 @@ readgram (void)
`--------------------------------------------------------------*/
static void
output_token_defines (FILE *file)
output_token_defines (struct obstack *oout)
{
bucket *bp;
char *cp, *symbol;
@@ -1653,14 +1657,15 @@ output_token_defines (FILE *file)
if (c != '\0')
continue;
fprintf (file, "#define\t%s\t%d\n", symbol,
((translations && !raw_flag)
? bp->user_token_number : bp->value));
obstack_fgrow2 (oout, "#define\t%s\t%d\n",
symbol,
((translations && !raw_flag)
? bp->user_token_number : bp->value));
if (semantic_parser)
fprintf (file, "#define\tT%s\t%d\n", symbol, bp->value);
obstack_fgrow2 (oout, "#define\tT%s\t%d\n", symbol, bp->value);
}
putc ('\n', file);
obstack_1grow (oout, '\n');
}
@@ -1783,7 +1788,7 @@ packsymbols (void)
error_token_number = errtoken->value;
if (!no_parser_flag)
output_token_defines (ftable);
output_token_defines (&table_obstack);
if (startval->class == unknown_sym)
fatal (_("the start symbol %s is undefined"), startval->tag);
@@ -1794,15 +1799,16 @@ packsymbols (void)
if (defines_flag)
{
output_token_defines (fdefines);
output_token_defines (&defines_obstack);
if (!pure_parser)
{
if (spec_name_prefix)
fprintf (fdefines, "\nextern YYSTYPE %slval;\n",
spec_name_prefix);
obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
spec_name_prefix);
else
fprintf (fdefines, "\nextern YYSTYPE yylval;\n");
obstack_grow_literal_string (&defines_obstack,
"\nextern YYSTYPE yylval;\n");
}
if (semantic_parser)
@@ -1810,7 +1816,8 @@ packsymbols (void)
{
/* don't make these for dummy nonterminals made by gensym. */
if (*tags[i] != '@')
fprintf (fdefines, "#define\tNT%s\t%d\n", tags[i], i);
obstack_fgrow2 (&defines_obstack,
"#define\tNT%s\t%d\n", tags[i], i);
}
#if 0
/* `fdefines' is now a temporary file, so we need to copy its
@@ -1942,16 +1949,19 @@ reader (void)
undeftoken->class = token_sym;
undeftoken->user_token_number = 2;
/* Read the declaration section. Copy %{ ... %} groups to FTABLE
and FDEFINES file. Also notice any %token, %left, etc. found
there. */
putc ('\n', ftable);
fprintf (ftable, "\
/* Read the declaration section. Copy %{ ... %} groups to
TABLE_OBSTACK and FDEFINES file. Also notice any %token, %left,
etc. found there. */
obstack_1grow (&table_obstack, '\n');
obstack_fgrow3 (&table_obstack, "\
/* %s, made from %s\n\
by GNU bison %s. */\n\
\n", no_parser_flag ? "Bison-generated parse tables" : "A Bison parser", infile, VERSION);
\n",
no_parser_flag ? "Bison-generated parse tables" : "A Bison parser",
infile, VERSION);
fputs ("#define YYBISON 1 /* Identify Bison output. */\n\n", ftable);
obstack_grow_literal_string (&table_obstack,
"#define YYBISON 1 /* Identify Bison output. */\n\n");
read_declarations ();
/* Start writing the guard and action files, if they are needed. */
output_headers ();
@@ -1960,12 +1970,12 @@ reader (void)
readgram ();
/* Now we know whether we need the line-number stack. If we do,
write its type into the .tab.h file. */
if (fdefines)
reader_output_yylsp (fdefines);
if (defines_flag)
reader_output_yylsp (&defines_obstack);
/* Write closing delimiters for actions and guards. */
output_trailers ();
if (locations_flag)
fputs ("#define YYLSP_NEEDED\n\n", ftable);
obstack_grow_literal_string (&table_obstack, "#define YYLSP_NEEDED\n\n");
/* Assign the symbols their symbol numbers. Write #defines for the
token symbols into FDEFINES if requested. */
packsymbols ();
@@ -1978,10 +1988,10 @@ reader (void)
void
reader_output_yylsp (FILE *f)
reader_output_yylsp (struct obstack *oout)
{
if (locations_flag)
fputs ("\
obstack_grow_literal_string (oout, "\
\n\
#ifndef YYLTYPE\n\
typedef struct yyltype\n\
@@ -1997,6 +2007,5 @@ typedef struct yyltype\n\
\n\
# define YYLTYPE yyltype\n\
#endif\n\
\n",
f);
\n");
}

4
src/reader.h
View File

@@ -1,5 +1,5 @@
/* Input parser for bison
Copyright (C) 2000 Free Software Foundation, Inc.
Copyright 2000 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -30,7 +30,7 @@
extern void reader PARAMS ((void));
extern void reader_output_yylsp PARAMS ((FILE *));
extern void reader_output_yylsp PARAMS ((struct obstack *));
extern int lineno;
extern char **tags;

7
src/system.h
View File

@@ -187,3 +187,10 @@ do { \
sprintf (buf, Format, Arg1, Arg2); \
obstack_grow (Obs, buf, strlen (buf)); \
} while (0)
#define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3) \
do { \
char buf[4096]; \
sprintf (buf, Format, Arg1, Arg2, Arg3); \
obstack_grow (Obs, buf, strlen (buf)); \
} while (0)