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

Introduce obstacks.

Browse Source 
Change each use of `faction' into a use of `action_obstack'.
* lib/obstack.h, lib/obstack.c: New files.
* src/files.c (faction): Remove.
(action_obstack): New.
Adjust all dependencies.
This commit is contained in:
Akim Demaille
2000-11-01 16:03:50 +00:00
parent 77aee78982
commit 8c7ebe4946
9 changed files with 1412 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/files.c
View File

@@ -1,5 +1,5 @@
/* Open and close files for bison,
Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -53,9 +53,10 @@ FILE *fdefines = NULL;
FILE *ftable = NULL;
FILE *fattrs = NULL;
FILE *fguard = NULL;
FILE *faction = NULL;
FILE *fparser = NULL;
struct obstack action_obstack;
/* File name specified with -o for the output file, or 0 if no -o. */
char *spec_outfile;
@@ -289,25 +290,18 @@ open_files (void)
{
/* use permanent name for actions file */
actfile = stringappend (name_base, short_base_length, ".act");
faction = xfopen (actfile, "w");
}
#ifdef MSDOS
if (!no_parser_flag)
actfile = mktemp (stringappend (tmp_base, tmp_len, "acXXXXXX"));
tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "atXXXXXX"));
tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "taXXXXXX"));
tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "deXXXXXX"));
#else
if (!no_parser_flag)
actfile = mktemp (stringappend (tmp_base, tmp_len, "act.XXXXXX"));
tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "attrs.XXXXXX"));
tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "tab.XXXXXX"));
tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "defs.XXXXXX"));
#endif /* not MSDOS */
if (!no_parser_flag)
faction = xfopen (actfile, "w+");
fattrs = xfopen (tmpattrsfile, "w+");
ftable = xfopen (tmptabfile, "w+");
@@ -318,8 +312,6 @@ open_files (void)
}
#if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
if (!no_parser_flag)
unlink (actfile);
unlink (tmpattrsfile);
unlink (tmptabfile);
unlink (tmpdefsfile);
@@ -343,6 +335,9 @@ open_files (void)
guardfile = stringappend (name_base, short_base_length, ".guard.c");
#endif /* not MSDOS */
#endif /* not VMS */
/* Setup the action obstack. */
obstack_init (&action_obstack);
}
@@ -397,7 +392,6 @@ open_extra_files (void)
void
done (void)
{
xfclose (faction);
xfclose (fattrs);
xfclose (fguard);
xfclose (finput);
@@ -429,9 +423,14 @@ done (void)
}
}
if (no_parser_flag)
{
FILE *faction = xfopen (actfile, "w");
size_t size = obstack_object_size (&action_obstack);
fwrite (obstack_finish (&action_obstack), 1, size, faction);
fclose (faction);
}
#if defined (VMS) & !defined (__VMS_POSIX)
if (faction && !no_parser_flag)
delete (actfile);
if (fattrs)
delete (tmpattrsfile);
if (ftable)
@@ -442,8 +441,6 @@ done (void)
sys$exit(SS$_ABORT); */
#else
#if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
if (actfile && !no_parser_flag)
unlink (actfile);
if (tmpattrsfile)
unlink (tmpattrsfile);
if (tmptabfile)

11
src/files.h
View File

@@ -1,5 +1,7 @@
#ifndef FILES_H_
# define FILES_H_
/* File names and variables for bison,
Copyright (C) 1984, 1989, 2000 Free Software Foundation, Inc.
Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -18,7 +20,6 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* These two should be pathnames for opening the sample parser files.
When bison is installed, they should be absolute pathnames.
XPFILE1 and XPFILE2 normally come from config.h. */
@@ -33,7 +34,6 @@ extern FILE *ftable; /* output the tables and the parser */
extern FILE *fattrs; /* if semantic parser, output a .h file that defines YYSTYPE */
/* and also contains all the %{ ... %} definitions. */
extern FILE *fguard; /* if semantic parser, output yyguard, containing all the guard code */
extern FILE *faction; /* output all the action code; precise form depends on which parser */
extern FILE *fparser; /* read the parser to copy into ftable */
/* File name specified with -o for the output file, or 0 if no -o. */
@@ -44,6 +44,10 @@ extern char *spec_name_prefix; /* for -a, from getargs.c */
/* File name pfx specified with -b, or 0 if no -b. */
extern char *spec_file_prefix;
/* Output all the action code; precise form depends on which parser. */
extern struct obstack action_obstack;
extern char *infile;
extern int lineno;
extern char *outfile;
@@ -57,3 +61,4 @@ void open_files PARAMS((void));
void open_extra_files PARAMS((void));
void done PARAMS((void));
#endif /* !FILES_H_ */

57
src/output.c
View File

@@ -1,5 +1,5 @@
/* Output the generated parsing program for bison,
Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -91,6 +91,7 @@
*/
#include "system.h"
#include "obstack.h"
#include "getargs.h"
#include "xalloc.h"
#include "files.h"
@@ -214,6 +215,23 @@ register YYLTYPE *yylsp;\n\
switch (n)\n\
{"
#define ACTSTR_PROLOGUE \
"\n\
#include \""
#define ACTSTR_EPILOGUE \
"\"\n\
extern YYSTYPE yyval;\n\
extern int yychar;\n\
\n\
yyaction(n, yyvsp, yylsp)\n\
register int n;\n\
register YYSTYPE *yyvsp;\n\
register YYLTYPE *yylsp;\n\
{\n\
switch (n)\n\
{"
#define ACTSTR_SIMPLE "\n switch (yyn) {\n"
void
@@ -225,7 +243,20 @@ output_headers (void)
if (no_parser_flag)
return;
fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile);
if (semantic_parser)
{
obstack_grow_literal_string (&action_obstack,
ACTSTR_PROLOGUE);
obstack_grow (&action_obstack,
attrsfile, strlen (attrsfile));
obstack_grow_literal_string (&action_obstack,
ACTSTR_EPILOGUE);
}
else
{
obstack_grow_literal_string (&action_obstack, ACTSTR_SIMPLE);
}
/* if (semantic_parser) JF moved this below
fprintf(ftable, "#include \"%s\"\n", attrsfile);
fprintf(ftable, "#include <stdio.h>\n\n");
@@ -255,14 +286,18 @@ output_trailers (void)
if (semantic_parser)
fprintf (fguard, "\n }\n}\n");
fprintf (faction, "\n");
obstack_1grow (&action_obstack, '\n');
if (no_parser_flag)
return;
if (semantic_parser)
fprintf (faction, " }\n");
fprintf (faction, "}\n");
{
obstack_grow_literal_string (&action_obstack,
" }\n");
}
obstack_grow_literal_string (&action_obstack,
"}\n");
}
@@ -1201,15 +1236,17 @@ output_parser (void)
for (; c != '\n' && c != EOF; c = getc (fpars))
if (write_line)
{
/* `$' in the parser file indicates where to put the
actions. Copy them in at this point. */
if (c == '$')
{
size_t size = obstack_object_size (&action_obstack);
number_of_dollar_signs++;
assert (number_of_dollar_signs == 1);
/* `$' in the parser file indicates where to put the actions.
Copy them in at this point. */
rewind (faction);
for (c = getc (faction); c != EOF; c = getc (faction))
putc (c, ftable);
fwrite (obstack_finish (&action_obstack),
1, size, ftable);
/* Skip the end of the line containing `$'. */
write_line = 0;
}

166
src/reader.c
View File

@@ -1,5 +1,5 @@
/* Input parser for bison
Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000
Copyright 1984, 1986, 1989, 1992, 1998, 2000
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -21,6 +21,7 @@
#include "system.h"
#include "obstack.h"
#include "getargs.h"
#include "files.h"
#include "xalloc.h"
@@ -151,17 +152,21 @@ get_type_name (int n, symbol_list * rule)
return rp->sym->type_name;
}
/*-------------------------------------------------------------------.
| Dump the string from FINPUT to FOUTPUT. MATCH is the delimiter of |
| the string (either ' or "). |
`-------------------------------------------------------------------*/
/*-----------------------------------------------------------------.
| Dump the string from FIN to FOUT and OOUT if non null. MATCH is |
| the delimiter of the string (either ' or "). |
`-----------------------------------------------------------------*/
static inline void
copy_string (FILE *fin, FILE *fout, int match)
copy_string (FILE *fin, FILE *fout, struct obstack *oout, int match)
{
int c;
putc (match, fout);
if (fout)
putc (match, fout);
if (oout)
obstack_1grow (oout, match);
c = getc (fin);
while (c != match)
@@ -176,14 +181,21 @@ copy_string (FILE *fin, FILE *fout, int match)
continue;
}
putc (c, fout);
if (fout)
putc (c, fout);
if (oout)
obstack_1grow (oout, c);
if (c == '\\')
{
c = getc (fin);
if (c == EOF)
fatal (_("unterminated string at end of file"));
putc (c, fout);
if (fout)
putc (c, fout);
if (oout)
obstack_1grow (oout, c);
if (c == '\n')
lineno++;
}
@@ -191,7 +203,10 @@ copy_string (FILE *fin, FILE *fout, int match)
c = getc (fin);
}
putc (c, fout);
if (fout)
putc (c, fout);
if (oout)
obstack_1grow (oout, c);
}
@@ -204,16 +219,19 @@ copy_string (FILE *fin, FILE *fout, int match)
`----------------------------------------------------------------*/
static inline void
copy_comment2 (FILE *fin, FILE *out1, FILE *out2)
copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
{
int cplus_comment;
int ended;
int c;
/* We read a `/', output it. */
putc ('/', out1);
if (out1)
putc ('/', out1);
if (out2)
putc ('/', out2);
if (oout)
obstack_1grow (oout, '/');
switch ((c = getc (fin)))
{
@@ -228,9 +246,12 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2)
return;
}
putc (c, out1);
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
c = getc (fin);
ended = 0;
@@ -240,26 +261,35 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2)
{
while (c == '*')
{
putc (c, out1);
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
c = getc (fin);
}
if (c == '/')
{
putc (c, out1);
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
ended = 1;
}
}
else if (c == '\n')
{
lineno++;
putc (c, out1);
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
if (cplus_comment)
ended = 1;
else
@@ -269,9 +299,12 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2)
fatal (_("unterminated comment"));
else
{
putc (c, out1);
if (out1)
putc (c, out1);
if (out2)
putc (c, out2);
if (oout)
obstack_1grow (oout, c);
c = getc (fin);
}
}
@@ -284,9 +317,9 @@ copy_comment2 (FILE *fin, FILE *out1, FILE *out2)
`-------------------------------------------------------------------*/
static inline void
copy_comment (FILE *fin, FILE *fout)
copy_comment (FILE *fin, FILE *fout, struct obstack *oout)
{
copy_comment2 (fin, fout, NULL);
copy_comment2 (fin, fout, NULL, oout);
}
@@ -298,24 +331,32 @@ copy_comment (FILE *fin, FILE *fout)
`-----------------------------------------------------------------*/
static inline void
copy_at (FILE *fin, FILE *fout, int stack_offset)
copy_at (FILE *fin, FILE *fout, struct obstack *oout, int stack_offset)
{
int c;
c = getc (fin);
if (c == '$')
{
fprintf (fout, "yyloc");
if (fout)
fprintf (fout, "yyloc");
if (oout)
obstack_grow_literal_string (oout, "yylloc");
locations_flag = 1;
}
else if (isdigit (c) || c == '-')
{
int n;
char buf[4096];
ungetc (c, fin);
n = read_signed_integer (fin);
fprintf (fout, "yylsp[%d]", n - stack_offset);
sprintf (buf, "yylsp[%d]", n - stack_offset);
if (fout)
fputs (buf, fout);
if (oout)
obstack_grow (oout, buf, strlen (buf));
locations_flag = 1;
}
else
@@ -338,7 +379,7 @@ copy_at (FILE *fin, FILE *fout, int stack_offset)
`-------------------------------------------------------------------*/
static inline void
copy_dollar (FILE *fin, FILE *fout,
copy_dollar (FILE *fin, FILE *fout, struct obstack *oout,
symbol_list *rule, int stack_offset)
{
int c = getc (fin);
@@ -355,11 +396,20 @@ copy_dollar (FILE *fin, FILE *fout,
if (c == '$')
{
fprintf (fout, "yyval");
if (fout)
fputs ("yyval", fout);
if (oout)
obstack_grow_literal_string (oout, "yyval");
if (!type_name)
type_name = get_type_name (0, rule);
if (type_name)
fprintf (fout, ".%s", type_name);
{
if (fout)
fprintf (fout, ".%s", type_name);
if (oout)
obstack_fgrow1 (oout, ".%s", type_name);
}
if (!type_name && typed)
complain (_("$$ of `%s' has no declared type"),
rule->sym->tag);
@@ -373,9 +423,18 @@ copy_dollar (FILE *fin, FILE *fout,
if (!type_name && n > 0)
type_name = get_type_name (n, rule);
fprintf (fout, "yyvsp[%d]", n - stack_offset);
if (fout)
fprintf (fout, "yyvsp[%d]", n - stack_offset);
if (oout)
obstack_fgrow1 (oout, "yyvsp[%d]", n - stack_offset);
if (type_name)
fprintf (fout, ".%s", type_name);
{
if (fout)
fprintf (fout, ".%s", type_name);
if (oout)
obstack_fgrow1 (oout, ".%s", type_name);
}
if (!type_name && typed)
complain (_("$%d of `%s' has no declared type"),
n, rule->sym->tag);
@@ -422,11 +481,11 @@ copy_definition (void)
case '\'':
case '"':
copy_string (finput, fattrs, c);
copy_string (finput, fattrs, 0, c);
break;
case '/':
copy_comment (finput, fattrs);
copy_comment (finput, fattrs, 0);
break;
case EOF:
@@ -744,7 +803,7 @@ parse_union_decl (void)
break;
case '/':
copy_comment2 (finput, fattrs, fdefines);
copy_comment2 (finput, fattrs, fdefines, 0);
break;
case '{':
@@ -984,15 +1043,21 @@ copy_action (symbol_list *rule, int stack_offset)
{
int c;
int count;
char buf[4096];
/* offset is always 0 if parser has already popped the stack pointer */
if (semantic_parser)
stack_offset = 0;
fprintf (faction, "\ncase %d:\n", nrules);
sprintf (buf, "\ncase %d:\n", nrules);
obstack_grow (&action_obstack, buf, strlen (buf));
if (!no_lines_flag)
fprintf (faction, "#line %d \"%s\"\n", lineno, infile);
putc ('{', faction);
{
sprintf (buf, "#line %d \"%s\"\n", lineno, infile);
obstack_grow (&action_obstack, buf, strlen (buf));
}
obstack_1grow (&action_obstack, '{');
count = 1;
c = getc (finput);
@@ -1004,37 +1069,39 @@ copy_action (symbol_list *rule, int stack_offset)
switch (c)
{
case '\n':
putc (c, faction);
obstack_1grow (&action_obstack, c);
lineno++;
break;
case '{':
putc (c, faction);
obstack_1grow (&action_obstack, c);
count++;
break;
case '\'':
case '"':
copy_string (finput, faction, c);
copy_string (finput, 0, &action_obstack, c);
break;
case '/':
copy_comment (finput, faction);
copy_comment (finput, 0, &action_obstack);
break;
case '$':
copy_dollar (finput, faction, rule, stack_offset);
copy_dollar (finput, 0, &action_obstack,
rule, stack_offset);
break;
case '@':
copy_at (finput, faction, stack_offset);
copy_at (finput, 0, &action_obstack,
stack_offset);
break;
case EOF:
fatal (_("unmatched %s"), "`{'");
default:
putc (c, faction);
obstack_1grow (&action_obstack, c);
}
c = getc (finput);
@@ -1044,12 +1111,13 @@ copy_action (symbol_list *rule, int stack_offset)
if (--count)
{
putc (c, faction);
obstack_1grow (&action_obstack, c);
c = getc (finput);
}
}
fprintf (faction, ";\n break;}");
obstack_grow_literal_string (&action_obstack,
";\n break;}");
}
/*-------------------------------------------------------------------.
@@ -1108,19 +1176,19 @@ copy_guard (symbol_list *rule, int stack_offset)
case '\'':
case '"':
copy_string (finput, fguard, c);
copy_string (finput, fguard, 0, c);
break;
case '/':
copy_comment (finput, fguard);
copy_comment (finput, fguard, 0);
break;
case '$':
copy_dollar (finput, fguard, rule, stack_offset);
copy_dollar (finput, fguard, 0, rule, stack_offset);
break;
case '@':
copy_at (finput, fguard, stack_offset);
copy_at (finput, fguard, 0, stack_offset);
break;
case EOF:
@@ -1823,9 +1891,9 @@ packgram (void)
/*-------------------------------------------------------------------.
| Read in the grammar specification and record it in the format |
| described in gram.h. All guards are copied into the FGUARD file |
| and all actions into FACTION, in each case forming the body of a C |
| function (YYGUARD or YYACTION) which contains a switch statement |
| to decide which guard or action to execute. |
| and all actions into ACTION_OBSTACK, in each case forming the body |
| of a C function (YYGUARD or YYACTION) which contains a switch |
| statement to decide which guard or action to execute. |
`-------------------------------------------------------------------*/
void

19
src/system.h
View File

@@ -161,3 +161,22 @@ extern int errno;
# define FALSE (0)
#endif
typedef int bool;
/*-----------.
| Obstacks. |
`-----------*/
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
#include "obstack.h"
#define obstack_grow_literal_string(Obs, Str) \
obstack_grow (Obs, Str, sizeof (Str) - 1)
#define obstack_fgrow1(Obs, Format, Arg1) \
do { \
char buf[4096]; \
sprintf (buf, Format, Arg1); \
obstack_grow (Obs, buf, strlen (buf)); \
} while (0)