X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/14d3eb9bf4e5d1adac65dfc07420f5bc5805e801..4134cae3c5ff2fc3346ebc5b10d5c25c72c72cfe:/src/output.c?ds=inline diff --git a/src/output.c b/src/output.c index 27fcae4f..eecb8c68 100644 --- a/src/output.c +++ b/src/output.c @@ -1,5 +1,5 @@ /* Output the generated parsing program for bison, - Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc. + Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -103,11 +103,10 @@ #include "lalr.h" #include "reader.h" #include "conflicts.h" +#include "macrotab.h" extern void berror PARAMS((const char *)); - - static int nvectors; static int nentries; static short **froms; @@ -124,208 +123,54 @@ static short *check; static int lowzero; static int high; +struct obstack macro_obstack; +struct obstack output_obstack; +/* FIXME. */ static inline void -output_short_or_char_table (struct obstack *oout, - const char *comment, - const char *type, - const char *table_name, - short *short_table, - short first_value, - short begin, short end) +output_table_data (struct obstack *oout, + short *table_data, + short first, + short begin, + short end) { - int i, j; - - if (comment) - obstack_fgrow1 (oout, "/* %s. */\n", comment); - - obstack_fgrow3 (oout, "static const %s %s[] =\n{\n %6d", - type, table_name, first_value); - - j = 1; - for (i = begin; i < end; i++) + int i; + int j = 1; + + obstack_fgrow1 (oout, "%6d", first); + for (i = begin; i < end; ++i) { obstack_1grow (oout, ','); - if (j >= 10) { - obstack_grow_literal_string (oout, "\n "); + obstack_sgrow (oout, "\n "); j = 1; } else - { - j++; - } - - obstack_fgrow1 (oout, "%6d", short_table[i]); - } - - obstack_grow_literal_string (oout, "\n};\n"); -} - - -static inline void -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 (oout, comment, "short", table_name, short_table, - first_value, begin, end); -} - - -/*--------------------------------------------------------------. -| output_headers -- Output constant strings to the beginning of | -| certain files. | -`--------------------------------------------------------------*/ - -/* Don't put the `%s' insides quotes, since it quotearg puts them. */ - -#define GUARDSTR \ -"\n\ -#include %s\n\ -extern int yyerror;\n\ -extern int yycost;\n\ -extern char * yymsg;\n\ -extern YYSTYPE yyval;\n\ -\n\ -yyguard(n, yyvsp, yylsp)\n\ -register int n;\n\ -register YYSTYPE *yyvsp;\n\ -register YYLTYPE *yylsp;\n\ -{\n\ - yyerror = 0;\n\ - yycost = 0;\n\ - yymsg = 0;\n\ - switch (n)\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_SIMPLE "\n switch (yyn) {\n" - -void -output_headers (void) -{ - char *attrsfile_quoted = quotearg_style (c_quoting_style, attrsfile); - - if (semantic_parser) - fprintf (fguard, GUARDSTR, attrsfile_quoted); - - if (no_parser_flag) - return; - - if (semantic_parser) - 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 \n\n"); -*/ - - /* Rename certain symbols if -p was specified. */ - if (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); + ++j; + obstack_fgrow1 (oout, "%6d", table_data[i]); } + obstack_1grow (oout, 0); } -/*-------------------------------------------------------. -| Output constant strings to the ends of certain files. | -`-------------------------------------------------------*/ - -void -output_trailers (void) -{ - if (semantic_parser) - fprintf (fguard, "\n }\n}\n"); - - obstack_1grow (&action_obstack, '\n'); - - if (no_parser_flag) - return; - - if (semantic_parser) - obstack_grow_literal_string (&action_obstack, " }\n"); - - obstack_grow_literal_string (&action_obstack, "}\n"); -} - - - static void output_token_translations (void) { - obstack_grow_literal_string (&table_obstack, "\ -\n\ -/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n"); - - if (translations) - { - 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 (&table_obstack, - "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX", - ntokens < 127 ? "char" : "short", - "yytranslate", token_translations, - 0, 1, max_user_token_number + 1); - } - else - { - obstack_grow_literal_string (&table_obstack, - "\n#define YYTRANSLATE(x) (x)\n"); - } + output_table_data (&output_obstack, token_translations, + 0, 1, max_user_token_number + 1); + macro_insert ("translate", obstack_finish (&output_obstack)); } static void output_gram (void) { - /* With the ordinary parser, - 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"); - - output_short_table (&table_obstack, NULL, "yyprhs", rrhs, - 0, 1, nrules + 1); - + output_table_data (&output_obstack, rrhs, + 0, 1, nrules + 1); + macro_insert ("prhs", obstack_finish (&output_obstack)); + { size_t yyrhs_size = 1; short *yyrhs, *sp; @@ -338,21 +183,26 @@ output_gram (void) for (sp = ritem + 1, i = 1; *sp; ++sp, ++i) yyrhs[i] = *sp > 0 ? *sp : 0; - output_short_table (&table_obstack, NULL, "yyrhs", yyrhs, - ritem[0], 1, yyrhs_size); + output_table_data (&output_obstack, yyrhs, + ritem[0], 1, yyrhs_size); + macro_insert ("rhs", obstack_finish (&output_obstack)); + XFREE (yyrhs); } +#if 0 if (!semantic_parser && !no_parser_flag) - obstack_grow_literal_string (&table_obstack, "\n#endif\n"); + obstack_sgrow (&table_obstack, "\n#endif\n"); +#endif } static void output_stos (void) { - output_short_table (&table_obstack, NULL, "yystos", accessing_symbol, - 0, 1, nstates); + output_table_data (&output_obstack, accessing_symbol, + 0, 1, nstates); + macro_insert ("stos", obstack_finish (&output_obstack)); } @@ -363,34 +213,9 @@ output_rule_data (void) int j; short *short_tab = NULL; - obstack_grow_literal_string (&table_obstack, "\n\ -#if YYDEBUG != 0\n"); - - output_short_table (&table_obstack, - "YYRLINE[YYN] -- source line where rule number YYN was defined", - "yyrline", rline, - 0, 1, nrules + 1); - - obstack_grow_literal_string (&table_obstack, "#endif\n\n"); - - if (token_table_flag || no_parser_flag) - { - 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) - 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 "); + output_table_data (&output_obstack, rline, + 0, 1, nrules + 1); + macro_insert ("rline", obstack_finish (&output_obstack)); j = 0; for (i = 0; i < nsyms; i++) @@ -413,92 +238,61 @@ output_rule_data (void) if (j + strsize > 75) { - obstack_grow_literal_string (&table_obstack, "\n "); + obstack_sgrow (&output_obstack, "\n "); j = 2; } - obstack_1grow (&table_obstack, '\"'); + obstack_1grow (&output_obstack, '\"'); for (p = tags[i]; p && *p; p++) { if (*p == '"' || *p == '\\') - { - obstack_fgrow1 (&table_obstack, "\\%c", *p); - } + obstack_fgrow1 (&output_obstack, "\\%c", *p); else if (*p == '\n') - { - obstack_grow_literal_string (&table_obstack, "\\n"); - } + obstack_sgrow (&output_obstack, "\\n"); else if (*p == '\t') - { - obstack_grow_literal_string (&table_obstack, "\\t"); - } + obstack_sgrow (&output_obstack, "\\t"); else if (*p == '\b') - { - obstack_grow_literal_string (&table_obstack, "\\b"); - } + obstack_sgrow (&output_obstack, "\\b"); else if (*p < 040 || *p >= 0177) - { - obstack_fgrow1 (&table_obstack, "\\%03o", *p); - } + obstack_fgrow1 (&output_obstack, "\\%03o", *p); else - { - obstack_1grow (&table_obstack, *p); - } + obstack_1grow (&output_obstack, *p); } - obstack_grow_literal_string (&table_obstack, "\", "); + obstack_sgrow (&output_obstack, "\", "); j += strsize; } /* add a NULL entry to list of tokens */ - obstack_grow_literal_string (&table_obstack, "NULL\n};\n"); + obstack_sgrow (&output_obstack, "NULL"); - if (!token_table_flag && !no_parser_flag) - obstack_grow_literal_string (&table_obstack, "#endif\n\n"); + /* Finish table and store. */ + obstack_1grow (&output_obstack, 0); + macro_insert ("tname", obstack_finish (&output_obstack)); /* Output YYTOKNUM. */ - if (token_table_flag) - { - output_short_table (&table_obstack, - "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX", - "yytoknum", user_toknums, - 0, 1, ntokens + 1); - } + output_table_data (&output_obstack, user_toknums, + 0, 1, ntokens + 1); + macro_insert ("toknum", obstack_finish (&output_obstack)); /* Output YYR1. */ - output_short_table (&table_obstack, - "YYR1[YYN] -- Symbol number of symbol that rule YYN derives", - "yyr1", rlhs, - 0, 1, nrules + 1); + output_table_data (&output_obstack, rlhs, + 0, 1, nrules + 1); + macro_insert ("r1", obstack_finish (&output_obstack)); XFREE (rlhs + 1); - 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 (&table_obstack, - "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN", - "yyr2", short_tab, - 0, 1, nrules + 1); - obstack_1grow (&table_obstack, '\n'); - + output_table_data (&output_obstack, short_tab, + 0, 1, nrules + 1); + macro_insert ("r2", obstack_finish (&output_obstack)); XFREE (short_tab); XFREE (rrhs + 1); } - -static void -output_defines (void) -{ - 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); -} - - /*------------------------------------------------------------------. | Decide what to do for each type of token if seen as the lookahead | | token in specified state. The value returned is used as the | @@ -739,15 +533,12 @@ token_actions (void) yydefact[i] = action_row (i); save_row (i); } - XFREE (actrow); - 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); - obstack_1grow (&table_obstack, '\n'); + output_table_data (&output_obstack, yydefact, + yydefact[0], 1, nstates); + macro_insert ("defact", obstack_finish (&output_obstack)); + + XFREE (actrow); XFREE (yydefact); } @@ -874,10 +665,9 @@ static void goto_actions (void) { int i; - short *yydefgoto = XMALLOC (short, nsyms - ntokens); - state_count = XCALLOC (short, nstates); + state_count = XCALLOC (short, nstates); for (i = ntokens; i < nsyms; ++i) { int default_state = default_goto (i); @@ -885,8 +675,9 @@ goto_actions (void) yydefgoto[i - ntokens] = default_state; } - output_short_table (&table_obstack, NULL, "yydefgoto", yydefgoto, - yydefgoto[0], 1, nsyms - ntokens); + output_table_data (&output_obstack, yydefgoto, + yydefgoto[0], 1, nsyms - ntokens); + macro_insert ("defgoto", obstack_finish (&output_obstack)); XFREE (state_count); XFREE (yydefgoto); @@ -1088,13 +879,15 @@ pack_table (void) static void output_base (void) { - output_short_table (&table_obstack, NULL, "yypact", base, - base[0], 1, nstates); - - obstack_1grow (&table_obstack, '\n'); + /* Output pact. */ + output_table_data (&output_obstack, base, + base[0], 1, nstates); + macro_insert ("pact", obstack_finish (&output_obstack)); - output_short_table (&table_obstack, NULL, "yypgoto", base, - base[nstates], nstates + 1, nvectors); + /* Output pgoto. */ + output_table_data (&output_obstack, base, + base[nstates], nstates + 1, nvectors); + macro_insert ("pgoto", obstack_finish (&output_obstack)); XFREE (base); } @@ -1103,9 +896,9 @@ output_base (void) static void output_table (void) { - 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); + output_table_data (&output_obstack, table, + table[0], 1, high + 1); + macro_insert ("table", obstack_finish (&output_obstack)); XFREE (table); } @@ -1113,8 +906,9 @@ output_table (void) static void output_check (void) { - output_short_table (&table_obstack, NULL, "yycheck", check, - check[0], 1, high + 1); + output_table_data (&output_obstack, check, + check[0], 1, high + 1); + macro_insert ("check", obstack_finish (&output_obstack)); XFREE (check); } @@ -1146,119 +940,83 @@ output_actions (void) sort_actions (); pack_table (); - obstack_1grow (&table_obstack, '\n'); + output_base (); output_table (); - obstack_1grow (&table_obstack, '\n'); + 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 - - 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 + FILE *fskel; + size_t line; + int actions_dumped = 0; /* Loop over lines in the standard parser file. */ - - while (1) + if (!skeleton) { - int write_line = 1; - - c = getc (fpars); - - /* 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; - else - obstack_grow_literal_string (&table_obstack, "#lin"); - } - else - obstack_grow_literal_string (&table_obstack, "#li"); - } - else - obstack_grow_literal_string (&table_obstack, "#l"); - } - else - obstack_grow_literal_string (&table_obstack, "#"); - } - - /* now write out the line... */ - 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); - 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); - } - if (c == EOF) - break; - obstack_1grow (&table_obstack, c); + if (semantic_parser) + skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY); + else + skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE); } - assert (number_of_dollar_signs == 1); -} + fskel = xfopen (skeleton, "r"); -static void -output_program (void) -{ - int c; - - if (!no_lines_flag) - obstack_fgrow2 (&table_obstack, "#line %d %s\n", - lineno, quotearg_style (c_quoting_style, infile)); + /* New output code. */ + line = 1; + c = getc (fskel); + while (c != EOF) + { + if (c != '%') + { + if (c == '\n') + ++line; + obstack_1grow (&table_obstack, c); + c = getc (fskel); + } + else if ((c = getc (fskel)) == '%') + { + /* Read the macro. */ + const char *macro_key = 0; + const char *macro_value = 0; + while (isalnum (c = getc (fskel)) || c == '_') + obstack_1grow (¯o_obstack, c); + obstack_1grow (¯o_obstack, 0); + + /* Output the right value, or see if it's something special. */ + macro_key = obstack_finish (¯o_obstack); + macro_value = macro_find (macro_key); + if (macro_value) + obstack_sgrow (&table_obstack, macro_value); + else if (!strcmp (macro_key, "line")) + obstack_fgrow1 (&table_obstack, "%d", line + 1); + else if (!strcmp (macro_key, "action")) + { + size_t size = obstack_object_size (&action_obstack); + obstack_grow (&table_obstack, + obstack_finish (&action_obstack), size); + } + else + { + obstack_sgrow (&table_obstack, "%%"); + obstack_sgrow (&table_obstack, macro_key); + } + } + else + obstack_1grow (&table_obstack, '%'); + } - while ((c = getc (finput)) != EOF) - obstack_1grow (&table_obstack, c); + /* End. */ + xfclose (fskel); } - static void free_itemsets (void) { @@ -1273,6 +1031,52 @@ free_itemsets (void) } } +/* FIXME. */ + +#define MACRO_INSERT_INT(Key, Value) \ +{ \ + obstack_fgrow1 (¯o_obstack, "%d", Value); \ + obstack_1grow (¯o_obstack, 0); \ + macro_insert (Key, obstack_finish (¯o_obstack)); \ +} + +#define MACRO_INSERT_STRING(Key, Value) \ +{ \ + obstack_sgrow (¯o_obstack, Value); \ + obstack_1grow (¯o_obstack, 0); \ + macro_insert (Key, obstack_finish (¯o_obstack)); \ +} + +#define MACRO_INSERT_PREFIX(Key, Value) \ +{ \ + obstack_fgrow2 (¯o_obstack, "%s%s", spec_name_prefix, Value); \ + obstack_1grow (¯o_obstack, 0); \ + macro_insert (Key, obstack_finish (¯o_obstack)); \ +} + +static void +prepare (void) +{ + MACRO_INSERT_INT ("last", high); + MACRO_INSERT_INT ("flag", MINSHORT); + MACRO_INSERT_INT ("pure", pure_parser); + MACRO_INSERT_INT ("nsym", nsyms); + MACRO_INSERT_INT ("debug", debug_flag); + MACRO_INSERT_INT ("final", final_state); + MACRO_INSERT_INT ("maxtok", max_user_token_number); + MACRO_INSERT_INT ("ntbase", ntokens); + MACRO_INSERT_INT ("verbose", 0); + + MACRO_INSERT_INT ("nnts", nvars); + MACRO_INSERT_INT ("nrules", nrules); + MACRO_INSERT_INT ("nstates", nstates); + MACRO_INSERT_INT ("ntokens", ntokens); + + MACRO_INSERT_INT ("locations_flag", locations_flag); + + if (spec_name_prefix) + MACRO_INSERT_STRING ("prefix", spec_name_prefix); +} /*----------------------------------------------------------. | Output the parsing tables and the parser code to ftable. | @@ -1281,51 +1085,30 @@ free_itemsets (void) void output (void) { - /* output_token_defines(ftable); / * JF put out token defines FIRST */ - - /* If using a simple parser the definition of YYSTYPE are put into - TABLE_OBSTACK. */ - if (!semantic_parser) - { - size_t size = obstack_object_size (&attrs_obstack); - obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size); - } - reader_output_yylsp (&table_obstack); - if (debug_flag) - obstack_grow_literal_string (&table_obstack, "\ -#ifndef YYDEBUG\n\ -# define YYDEBUG 1\n\ -#endif\n\ -\n"); - - if (semantic_parser) - obstack_fgrow1 (&table_obstack, "#include %s\n", - quotearg_style (c_quoting_style, attrsfile)); - - if (!no_parser_flag) - obstack_grow_literal_string (&table_obstack, "#include \n\n"); - - /* Make "const" do nothing if not in ANSI C. */ - obstack_grow_literal_string (&table_obstack, "\ -#ifndef __cplusplus\n\ -# ifndef __STDC__\n\ -# define const\n\ -# endif\n\ -#endif\n\ -\n"); + obstack_init (&output_obstack); +#if 0 + reader_output_yylsp (&table_obstack); */ +#endif free_itemsets (); - output_defines (); + output_token_translations (); -/* if (semantic_parser) */ - /* This is now unconditional because debugging printouts can use it. */ output_gram (); + XFREE (ritem); if (semantic_parser) output_stos (); output_rule_data (); output_actions (); - if (!no_parser_flag) - output_parser (); - output_program (); + +#if 0 + if (!no_parser_flag) */ +#endif + prepare (); + /* Copy definitions in directive. */ + macro_insert ("prologue", obstack_finish (&attrs_obstack)); + output_parser (); + + obstack_free (¯o_obstack, 0); + obstack_free (&output_obstack, 0); }