#include "system.h"
#include "obstack.h"
+#include "quotearg.h"
#include "getargs.h"
#include "xalloc.h"
#include "files.h"
if (j >= 10)
{
- obstack_grow_literal_string (oout, "\n ");
+ obstack_sgrow (oout, "\n ");
j = 1;
}
else
obstack_fgrow1 (oout, "%6d", short_table[i]);
}
- obstack_grow_literal_string (oout, "\n};\n");
+ obstack_sgrow (oout, "\n};\n");
}
| certain files. |
`--------------------------------------------------------------*/
+/* Don't put the `%s' insides quotes, since it quotearg puts them. */
+
#define GUARDSTR \
"\n\
-#include \"%s\"\n\
+#include %s\n\
extern int yyerror;\n\
extern int yycost;\n\
extern char * yymsg;\n\
#define ACTSTR \
"\n\
-#include \"%s\"\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_PROLOGUE \
-"\n\
-#include \""
-
-#define ACTSTR_EPILOGUE \
-"\"\n\
+#include %s\n\
extern YYSTYPE yyval;\n\
extern int yychar;\n\
\n\
void
output_headers (void)
{
+ char *attrsfile_quoted = 0;
+
if (semantic_parser)
- fprintf (fguard, GUARDSTR, attrsfile);
+ {
+ /* FIXME: This is *buggy*. ATTRSFILE is not computed yet, since
+ we are waiting for the full input file to have been read to
+ be sure of the output file name. So basically, here, a SEGV
+ is guaranteed. OTOH, currently semantic parsers are not
+ supported. */
+ attrsfile_quoted = quotearg_style (c_quoting_style, attrsfile);
+ obstack_fgrow1 (&guard_obstack, GUARDSTR, attrsfile_quoted);
+ }
if (no_parser_flag)
return;
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);
- }
+ obstack_fgrow1 (&action_obstack, ACTSTR, attrsfile_quoted);
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");
-*/
+ obstack_sgrow (&action_obstack, ACTSTR_SIMPLE);
/* Rename certain symbols if -p was specified. */
if (spec_name_prefix)
{
obstack_fgrow1 (&table_obstack,
- "#define yyparse %sparse\n", spec_name_prefix);
+ "#define yyparse %sparse\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yylex %slex\n", spec_name_prefix);
+ "#define yylex %slex\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yyerror %serror\n", spec_name_prefix);
+ "#define yyerror %serror\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yylval %slval\n", spec_name_prefix);
+ "#define yylval %slval\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yychar %schar\n", spec_name_prefix);
+ "#define yychar %schar\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yydebug %sdebug\n", spec_name_prefix);
+ "#define yydebug %sdebug\n", spec_name_prefix);
obstack_fgrow1 (&table_obstack,
- "#define yynerrs %snerrs\n", spec_name_prefix);
+ "#define yynerrs %snerrs\n", spec_name_prefix);
}
}
output_trailers (void)
{
if (semantic_parser)
- fprintf (fguard, "\n }\n}\n");
+ obstack_sgrow (&guard_obstack, "\n }\n}\n");
obstack_1grow (&action_obstack, '\n');
return;
if (semantic_parser)
- {
- obstack_grow_literal_string (&action_obstack,
- " }\n");
- }
- obstack_grow_literal_string (&action_obstack,
- "}\n");
+ obstack_sgrow (&action_obstack, " }\n");
+
+ obstack_sgrow (&action_obstack, "}\n");
}
static void
output_token_translations (void)
{
- obstack_grow_literal_string (&table_obstack, "\
+ obstack_sgrow (&table_obstack, "\
\n\
/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");
}
else
{
- obstack_grow_literal_string (&table_obstack,
- "\n#define YYTRANSLATE(x) (x)\n");
+ obstack_sgrow (&table_obstack,
+ "\n#define YYTRANSLATE(x) (x)\n");
}
}
yyprhs and yyrhs are needed only for yydebug. */
/* With the no_parser option, all tables are generated */
if (!semantic_parser && !no_parser_flag)
- obstack_grow_literal_string (&table_obstack, "\n#if YYDEBUG != 0\n");
+ obstack_sgrow (&table_obstack, "\n#if YYDEBUG != 0\n");
output_short_table (&table_obstack, NULL, "yyprhs", rrhs,
0, 1, nrules + 1);
}
if (!semantic_parser && !no_parser_flag)
- obstack_grow_literal_string (&table_obstack, "\n#endif\n");
+ obstack_sgrow (&table_obstack, "\n#endif\n");
}
int j;
short *short_tab = NULL;
- obstack_grow_literal_string (&table_obstack, "\n\
+ obstack_sgrow (&table_obstack, "\n\
#if YYDEBUG != 0\n");
output_short_table (&table_obstack,
"yyrline", rline,
0, 1, nrules + 1);
- obstack_grow_literal_string (&table_obstack, "#endif\n\n");
+ obstack_sgrow (&table_obstack, "#endif\n\n");
if (token_table_flag || no_parser_flag)
{
/* Output the table of symbol names. */
if (!token_table_flag && !no_parser_flag)
- obstack_grow_literal_string (&table_obstack,
- "\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
- obstack_grow_literal_string (&table_obstack, "\
+ obstack_sgrow (&table_obstack,
+ "\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
+ obstack_sgrow (&table_obstack, "\
/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
- obstack_grow_literal_string (&table_obstack,
+ obstack_sgrow (&table_obstack,
"static const char *const yytname[] =\n{\n ");
j = 0;
if (j + strsize > 75)
{
- obstack_grow_literal_string (&table_obstack, "\n ");
+ obstack_sgrow (&table_obstack, "\n ");
j = 2;
}
for (p = tags[i]; p && *p; p++)
{
if (*p == '"' || *p == '\\')
- {
- obstack_fgrow1 (&table_obstack, "\\%c", *p);
- }
+ obstack_fgrow1 (&table_obstack, "\\%c", *p);
else if (*p == '\n')
- {
- obstack_grow_literal_string (&table_obstack, "\\n");
- }
+ obstack_sgrow (&table_obstack, "\\n");
else if (*p == '\t')
- {
- obstack_grow_literal_string (&table_obstack, "\\t");
- }
+ obstack_sgrow (&table_obstack, "\\t");
else if (*p == '\b')
- {
- obstack_grow_literal_string (&table_obstack, "\\b");
- }
+ obstack_sgrow (&table_obstack, "\\b");
else if (*p < 040 || *p >= 0177)
- {
- obstack_fgrow1 (&table_obstack, "\\%03o", *p);
- }
+ obstack_fgrow1 (&table_obstack, "\\%03o", *p);
else
- {
- obstack_1grow (&table_obstack, *p);
- }
+ obstack_1grow (&table_obstack, *p);
}
- obstack_grow_literal_string (&table_obstack, "\", ");
+ obstack_sgrow (&table_obstack, "\", ");
j += strsize;
}
/* add a NULL entry to list of tokens */
- obstack_grow_literal_string (&table_obstack, "NULL\n};\n");
+ obstack_sgrow (&table_obstack, "NULL\n};\n");
if (!token_table_flag && !no_parser_flag)
- obstack_grow_literal_string (&table_obstack, "#endif\n\n");
+ obstack_sgrow (&table_obstack, "#endif\n\n");
/* Output YYTOKNUM. */
if (token_table_flag)
output_check ();
}
-/* copy the parser code into the ftable file at the end. */
+/*------------------------------------------.
+| Copy the parser code into TABLE_OBSTACK. |
+`------------------------------------------*/
static void
output_parser (void)
{
int c;
- static int number_of_dollar_signs = 0;
-#ifdef DONTDEF
- FILE *fpars;
-#else
-#define fpars fparser
-#endif
+ FILE *fskel;
+ size_t line;
+ int actions_dumped = 0;
if (pure_parser)
- obstack_grow_literal_string (&table_obstack, "#define YYPURE 1\n\n");
-
-#ifdef DONTDEF
- /* JF no longer needed 'cuz open_extra_files changes the currently
- open parser from bison.simple to bison.hairy */
- if (semantic_parser)
- fpars = fparser;
- else
- fpars = fparser1;
-#endif
+ obstack_sgrow (&table_obstack, "#define YYPURE 1\n\n");
/* Loop over lines in the standard parser file. */
+ if (!skeleton)
+ {
+ if (semantic_parser)
+ skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
+ else
+ skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
+ }
+ fskel = xfopen (skeleton, "r");
+
+ /* Set LINE to 2, not 1: `#line LINENUM' -- Here LINENUM is a
+ decimal integer constant. This specifies that the line number of
+ the *following* line of input, in its original source file, was
+ LINENUM. */
+ line = 2;
while (1)
{
- int write_line = 1;
+ enum line_type_e
+ {
+ regular_line,
+ sync_line, /* #line. */
+ actions_line /* %% actions. */
+ };
+ enum line_type_e line_type = regular_line;
- c = getc (fpars);
+ c = getc (fskel);
- /* See if the line starts with `#line.
- If so, set write_line to 0. */
- if (no_lines_flag)
- if (c == '#')
- {
- c = getc (fpars);
- if (c == 'l')
- {
- c = getc (fpars);
- if (c == 'i')
- {
- c = getc (fpars);
- if (c == 'n')
- {
- c = getc (fpars);
- if (c == 'e')
- write_line = 0;
+ /* Is this line special? */
+ if (c == '#')
+ {
+ /* See if it's a `#line' line. */
+ if ((c = getc (fskel)) == 'l')
+ if ((c = getc (fskel)) == 'i')
+ if ((c = getc (fskel)) == 'n')
+ if ((c = getc (fskel)) == 'e')
+ line_type = sync_line;
+ else
+ obstack_sgrow (&table_obstack, "#lin");
+ else
+ obstack_sgrow (&table_obstack, "#li");
+ else
+ obstack_sgrow (&table_obstack, "#l");
+ else
+ obstack_sgrow (&table_obstack, "#");
+ }
+ else if (c == '%')
+ {
+ /* See if it's a `%% actions' line. */
+ if ((c = getc (fskel)) == '%')
+ if ((c = getc (fskel)) == ' ')
+ if ((c = getc (fskel)) == 'a')
+ if ((c = getc (fskel)) == 'c')
+ if ((c = getc (fskel)) == 't')
+ if ((c = getc (fskel)) == 'i')
+ if ((c = getc (fskel)) == 'o')
+ if ((c = getc (fskel)) == 'n')
+ if ((c = getc (fskel)) == 's')
+ line_type = actions_line;
+ else
+ obstack_sgrow (&table_obstack, "%% action");
else
- obstack_grow_literal_string (&table_obstack, "#lin");
- }
+ obstack_sgrow (&table_obstack, "%% actio");
+ else
+ obstack_sgrow (&table_obstack, "%% acti");
else
- obstack_grow_literal_string (&table_obstack, "#li");
- }
+ obstack_sgrow (&table_obstack, "%% act");
+ else
+ obstack_sgrow (&table_obstack, "%% ac");
else
- obstack_grow_literal_string (&table_obstack, "#l");
- }
+ obstack_sgrow (&table_obstack, "%% a");
+ else
+ obstack_sgrow (&table_obstack, "%% ");
else
- obstack_grow_literal_string (&table_obstack, "#");
- }
+ obstack_sgrow (&table_obstack, "%%");
+ else
+ obstack_sgrow (&table_obstack, "%");
+ }
+
+ switch (line_type)
+ {
+ case sync_line:
+ if (!no_lines_flag)
+ obstack_fgrow2 (&table_obstack, "#line %d %s\n",
+ line, quotearg_style (c_quoting_style, skeleton));
- /* now write out the line... */
- for (; c != '\n' && c != EOF; c = getc (fpars))
- if (write_line)
+ /* Skip the end of line. */
+ for (; c != '\n' && c != EOF; c = getc (fskel))
+ /* nothing */;
+ break;
+
+ case actions_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);
- obstack_grow (&table_obstack,
- obstack_finish (&action_obstack),
- size);
-
- /* Skip the end of the line containing `$'. */
- write_line = 0;
- }
- else
- obstack_1grow (&table_obstack, c);
+ size_t size = obstack_object_size (&action_obstack);
+
+ actions_dumped++;
+ assert (actions_dumped == 1);
+ obstack_grow (&table_obstack,
+ obstack_finish (&action_obstack),
+ size);
}
+
+ /* Skip the end of line. */
+ for (; c != '\n' && c != EOF; c = getc (fskel))
+ /* nothing */;
+ break;
+
+ case regular_line:
+ for (; c != '\n' && c != EOF; c = getc (fskel))
+ obstack_1grow (&table_obstack, c);
+ }
+
if (c == EOF)
break;
obstack_1grow (&table_obstack, c);
+ line++;
}
- assert (number_of_dollar_signs == 1);
+ assert (actions_dumped == 1);
+ xfclose (fskel);
}
static void
int c;
if (!no_lines_flag)
- obstack_fgrow2 (&table_obstack, "#line %d \"%s\"\n", lineno, infile);
+ obstack_fgrow2 (&table_obstack, "#line %d %s\n",
+ lineno, quotearg_style (c_quoting_style, infile));
- c = getc (finput);
- while (c != EOF)
- {
- obstack_1grow (&table_obstack, c);
- c = getc (finput);
- }
+ while ((c = getc (finput)) != EOF)
+ obstack_1grow (&table_obstack, c);
}
void
output (void)
{
- int c;
-
/* output_token_defines(ftable); / * JF put out token defines FIRST */
/* If using a simple parser the definition of YYSTYPE are put into
}
reader_output_yylsp (&table_obstack);
if (debug_flag)
- obstack_grow_literal_string (&table_obstack, "\
+ obstack_sgrow (&table_obstack, "\
#ifndef YYDEBUG\n\
# define YYDEBUG 1\n\
#endif\n\
\n");
if (semantic_parser)
- obstack_fgrow1 (&table_obstack, "#include \"%s\"\n", attrsfile);
+ obstack_fgrow1 (&table_obstack, "#include %s\n",
+ quotearg_style (c_quoting_style, attrsfile));
if (!no_parser_flag)
- obstack_grow_literal_string (&table_obstack, "#include <stdio.h>\n\n");
+ obstack_sgrow (&table_obstack, "#include <stdio.h>\n\n");
/* Make "const" do nothing if not in ANSI C. */
- obstack_grow_literal_string (&table_obstack, "\
+ obstack_sgrow (&table_obstack, "\
#ifndef __cplusplus\n\
# ifndef __STDC__\n\
# define const\n\
projects / bison.git / blobdiff