X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/340ef489223a5d1f9c40674ea2973435cb8ecc1b..f1320c03a45fa90929d750b2d0b472633f4f3cda:/src/output.c diff --git a/src/output.c b/src/output.c index 0da18d00..b23ffe8e 100644 --- a/src/output.c +++ b/src/output.c @@ -92,7 +92,7 @@ #include "system.h" #include "getargs.h" -#include "alloc.h" +#include "xalloc.h" #include "files.h" #include "gram.h" #include "LR0.h" @@ -125,24 +125,30 @@ static int high; static inline void -output_short_table (FILE *out, - const char *table_name, - short *short_table, - short first_value, - short begin, short end) +output_short_or_char_table (FILE *out, + const char *comment, + const char *type, + const char *table_name, + short *short_table, + short first_value, + short begin, short end) { int i, j; - fprintf (out, "static const short %s[] = {%6d", table_name, first_value); + if (comment) + fprintf (out, "/* %s. */\n", comment); + + fprintf (out, "static const %s %s[] =\n{\n %6d", + type, table_name, first_value); - j = 10; + j = 1; for (i = begin; i < end; i++) { putc (',', out); if (j >= 10) { - putc ('\n', out); + fputs ("\n ", out); j = 1; } else @@ -157,6 +163,19 @@ output_short_table (FILE *out, } +static inline void +output_short_table (FILE *out, + 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, + first_value, begin, end); +} + + /*--------------------------------------------------------------. | output_headers -- Output constant strings to the beginning of | | certain files. | @@ -203,7 +222,7 @@ output_headers (void) if (semantic_parser) fprintf (fguard, GUARDSTR, attrsfile); - if (noparserflag) + if (no_parser_flag) return; fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile); @@ -238,7 +257,7 @@ output_trailers (void) fprintf (faction, "\n"); - if (noparserflag) + if (no_parser_flag) return; if (semantic_parser) @@ -251,39 +270,23 @@ output_trailers (void) static void output_token_translations (void) { - int i, j; -/* short *sp; JF unused */ - + fputs ("\ +\n\ +/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n", + ftable); if (translations) { fprintf (ftable, - "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n", + "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\ +\n\ +\n", max_user_token_number, nsyms); - if (ntokens < 127) /* play it very safe; check maximum element value. */ - fprintf (ftable, "\nstatic const char yytranslate[] = { 0"); - else - fprintf (ftable, "\nstatic const short yytranslate[] = { 0"); - - j = 10; - for (i = 1; i <= max_user_token_number; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", token_translations[i]); - } - - fprintf (ftable, "\n};\n"); + output_short_or_char_table (ftable, + "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX", + ntokens < 127 ? "char" : "short", + "yytranslate", token_translations, + 0, 1, max_user_token_number + 1); } else { @@ -295,44 +298,33 @@ output_token_translations (void) static void output_gram (void) { - int j; - short *sp; - /* With the ordinary parser, yyprhs and yyrhs are needed only for yydebug. */ - /* With the noparser option, all tables are generated */ - if (!semantic_parser && !noparserflag) + /* With the no_parser option, all tables are generated */ + if (!semantic_parser && !no_parser_flag) fprintf (ftable, "\n#if YYDEBUG != 0\n"); - output_short_table (ftable, "yyprhs", rrhs, + output_short_table (ftable, NULL, "yyprhs", rrhs, 0, 1, nrules + 1); - fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]); + { + size_t yyrhs_size = 1; + short *yyrhs, *sp; + int i; - j = 10; - for (sp = ritem + 1; *sp; sp++) - { - putc (',', ftable); + for (sp = ritem + 1; *sp; sp++) + ++yyrhs_size; + yyrhs = XMALLOC (short, yyrhs_size); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + for (sp = ritem + 1, i = 1; *sp; ++sp, ++i) + yyrhs[i] = *sp > 0 ? *sp : 0; - if (*sp > 0) - fprintf (ftable, "%6d", *sp); - else - fprintf (ftable, " 0"); - } + output_short_table (ftable, NULL, "yyrhs", yyrhs, + ritem[0], 1, yyrhs_size); + XFREE (yyrhs); + } - fprintf (ftable, "\n};\n"); - - if (!semantic_parser && !noparserflag) + if (!semantic_parser && !no_parser_flag) fprintf (ftable, "\n#endif\n"); } @@ -340,7 +332,7 @@ output_gram (void) static void output_stos (void) { - output_short_table (ftable, "yystos", accessing_symbol, + output_short_table (ftable, NULL, "yystos", accessing_symbol, 0, 1, nstates); } @@ -350,18 +342,20 @@ output_rule_data (void) { int i; int j; + short *short_tab = NULL; fputs ("\n\ -#if YYDEBUG != 0\n\ -/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n", +#if YYDEBUG != 0\n", ftable); - output_short_table (ftable, "yyrline", rline, + output_short_table (ftable, + "YYRLINE[YYN] -- source line where rule number YYN was defined", + "yyrline", rline, 0, 1, nrules + 1); fputs ("#endif\n\n", ftable); - if (toknumflag || noparserflag) + if (token_table_flag || no_parser_flag) { fprintf (ftable, "#define YYNTOKENS %d\n", ntokens); fprintf (ftable, "#define YYNNTS %d\n", nvars); @@ -370,120 +364,110 @@ output_rule_data (void) fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number); } - if (!toknumflag && !noparserflag) - fprintf (ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n"); - /* 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, - "static const char * const yytname[] = { \"%s\"", tags[0]); + "static const char *const yytname[] =\n{\n "); - j = strlen (tags[0]) + 44; - for (i = 1; i < nsyms; i++) + j = 0; + for (i = 0; i < nsyms; i++) /* this used to be i<=nsyms, but that output a final "" symbol almost by accident */ { + /* Width of the next token, including the two quotes, the coma + and the space. */ + int strsize = 4; char *p; - putc (',', ftable); - j++; - if (j > 75) + for (p = tags[i]; p && *p; p++) + if (*p == '"' || *p == '\\' || *p == '\n' || *p == '\t' + || *p == '\b') + strsize += 2; + else if (*p < 040 || *p >= 0177) + strsize += 4; + else + strsize++; + + if (j + strsize > 75) { - putc ('\n', ftable); - j = 0; + fputs ("\n ", ftable); + j = 2; } putc ('\"', ftable); - j++; - for (p = tags[i]; p && *p; p++) { if (*p == '"' || *p == '\\') { fprintf (ftable, "\\%c", *p); - j += 2; } else if (*p == '\n') { fprintf (ftable, "\\n"); - j += 2; } else if (*p == '\t') { fprintf (ftable, "\\t"); - j += 2; } else if (*p == '\b') { fprintf (ftable, "\\b"); - j += 2; } else if (*p < 040 || *p >= 0177) { fprintf (ftable, "\\%03o", *p); - j += 4; } else { putc (*p, ftable); - j++; } } - putc ('\"', ftable); - j++; + fputs ("\", ", ftable); + j += strsize; } /* add a NULL entry to list of tokens */ - fprintf (ftable, ", NULL\n};\n"); + fprintf (ftable, "NULL\n};\n"); - if (!toknumflag && !noparserflag) + if (!token_table_flag && !no_parser_flag) fprintf (ftable, "#endif\n\n"); /* Output YYTOKNUM. */ - if (toknumflag) + if (token_table_flag) { - output_short_table (ftable, "yytoknum", user_toknums, + output_short_table (ftable, + "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX", + "yytoknum", user_toknums, 0, 1, ntokens + 1); } /* Output YYR1. */ - fputs ("\ -/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n", ftable); - - output_short_table (ftable, "yyr1", rlhs, + output_short_table (ftable, + "YYR1[YYN] -- Symbol number of symbol that rule YYN derives", + "yyr1", rlhs, 0, 1, nrules + 1); - FREE (rlhs + 1); + XFREE (rlhs + 1); putc ('\n', ftable); /* Output YYR2. */ - fputs ("\ -/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\ -static const short yyr2[] = { 0", ftable); - j = 10; + short_tab = XMALLOC (short, nrules + 1); for (i = 1; i < nrules; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1); - } + short_tab[i] = rrhs[i + 1] - rrhs[i] - 1; + short_tab[nrules] = nitems - rrhs[nrules] - 1; + output_short_table (ftable, + "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN", + "yyr2", short_tab, + 0, 1, nrules + 1); + putc ('\n', ftable); - putc (',', ftable); - if (j >= 10) - putc ('\n', ftable); + XFREE (short_tab); - fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1); - FREE (rrhs + 1); + XFREE (rrhs + 1); } @@ -699,8 +683,8 @@ save_row (int state) if (count == 0) return; - froms[state] = sp1 = sp = NEW2 (count, short); - tos[state] = sp2 = NEW2 (count, short); + froms[state] = sp1 = sp = XCALLOC (short, count); + tos[state] = sp2 = XCALLOC (short, count); for (i = 0; i < ntokens; i++) { @@ -728,19 +712,24 @@ static void token_actions (void) { int i; - short *yydefact = NEW2 (nstates, short); + short *yydefact = XCALLOC (short, nstates); - actrow = NEW2 (ntokens, short); + actrow = XCALLOC (short, ntokens); for (i = 0; i < nstates; ++i) { yydefact[i] = action_row (i); save_row (i); } - FREE (actrow); + XFREE (actrow); - output_short_table (ftable, "yydefact", yydefact, + output_short_table (ftable, + "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); - FREE (yydefact); + putc ('\n', ftable); + XFREE (yydefact); } @@ -749,12 +738,12 @@ free_shifts (void) { shifts *sp, *sptmp; /* JF derefrenced freed ptr */ - FREE (shift_table); + XFREE (shift_table); for (sp = first_shift; sp; sp = sptmp) { sptmp = sp->next; - FREE (sp); + XFREE (sp); } } @@ -764,12 +753,12 @@ free_reductions (void) { reductions *rp, *rptmp; /* JF fixed freed ptr */ - FREE (reduction_table); + XFREE (reduction_table); for (rp = first_reduction; rp; rp = rptmp) { rptmp = rp->next; - FREE (rp); + XFREE (rp); } } @@ -779,19 +768,17 @@ static void save_column (int symbol, int default_state) { int i; - int m; - int n; short *sp; short *sp1; short *sp2; int count; int symno; - m = goto_map[symbol]; - n = goto_map[symbol + 1]; + short begin = goto_map[symbol]; + short end = goto_map[symbol + 1]; count = 0; - for (i = m; i < n; i++) + for (i = begin; i < end; i++) { if (to_state[i] != default_state) count++; @@ -802,10 +789,10 @@ save_column (int symbol, int default_state) symno = symbol - ntokens + nstates; - froms[symno] = sp1 = sp = NEW2 (count, short); - tos[symno] = sp2 = NEW2 (count, short); + froms[symno] = sp1 = sp = XCALLOC (short, count); + tos[symno] = sp2 = XCALLOC (short, count); - for (i = m; i < n; i++) + for (i = begin; i < end; i++) { if (to_state[i] != default_state) { @@ -867,36 +854,23 @@ default_goto (int symbol) static void goto_actions (void) { - int i, j, k; - - state_count = NEW2 (nstates, short); + int i; - k = default_goto (ntokens); - fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k); - save_column (ntokens, k); + short *yydefgoto = XMALLOC (short, nsyms - ntokens); + state_count = XCALLOC (short, nstates); - j = 10; - for (i = ntokens + 1; i < nsyms; i++) + for (i = ntokens; i < nsyms; ++i) { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - k = default_goto (i); - fprintf (ftable, "%6d", k); - save_column (i, k); + int default_state = default_goto (i); + save_column (i, default_state); + yydefgoto[i - ntokens] = default_state; } - fprintf (ftable, "\n};\n"); - FREE (state_count); + output_short_table (ftable, NULL, "yydefgoto", yydefgoto, + yydefgoto[0], 1, nsyms - ntokens); + + XFREE (state_count); + XFREE (yydefgoto); } @@ -912,7 +886,7 @@ sort_actions (void) int t; int w; - order = NEW2 (nvectors, short); + order = XCALLOC (short, nvectors); nentries = 0; for (i = 0; i < nvectors; i++) @@ -1049,10 +1023,10 @@ pack_table (void) int place; int state; - base = NEW2 (nvectors, short); - pos = NEW2 (nentries, short); - table = NEW2 (MAXTABLE, short); - check = NEW2 (MAXTABLE, short); + base = XCALLOC (short, nvectors); + pos = XCALLOC (short, nentries); + table = XCALLOC (short, MAXTABLE); + check = XCALLOC (short, MAXTABLE); lowzero = 0; high = 0; @@ -1079,14 +1053,14 @@ pack_table (void) for (i = 0; i < nvectors; i++) { if (froms[i]) - FREE (froms[i]); + XFREE (froms[i]); if (tos[i]) - FREE (tos[i]); + XFREE (tos[i]); } - FREE (froms); - FREE (tos); - FREE (pos); + XFREE (froms); + XFREE (tos); + XFREE (pos); } /* the following functions output yytable, yycheck @@ -1095,15 +1069,15 @@ pack_table (void) static void output_base (void) { - output_short_table (ftable, "yypact", base, + output_short_table (ftable, NULL, "yypact", base, base[0], 1, nstates); putc ('\n', ftable); - output_short_table (ftable, "yypgoto", base, + output_short_table (ftable, NULL, "yypgoto", base, base[nstates], nstates + 1, nvectors); - FREE (base); + XFREE (base); } @@ -1111,18 +1085,18 @@ static void output_table (void) { fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high); - output_short_table (ftable, "yytable", table, + output_short_table (ftable, NULL, "yytable", table, table[0], 1, high + 1); - FREE (table); + XFREE (table); } static void output_check (void) { - output_short_table (ftable, "yycheck", check, + output_short_table (ftable, NULL, "yycheck", check, check[0], 1, high + 1); - FREE (check); + XFREE (check); } /* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable @@ -1133,23 +1107,23 @@ output_actions (void) { nvectors = nstates + nvars; - froms = NEW2 (nvectors, short *); - tos = NEW2 (nvectors, short *); - tally = NEW2 (nvectors, short); - width = NEW2 (nvectors, short); + froms = XCALLOC (short *, nvectors); + tos = XCALLOC (short *, nvectors); + tally = XCALLOC (short, nvectors); + width = XCALLOC (short, nvectors); token_actions (); free_shifts (); free_reductions (); - FREE (lookaheads); - FREE (LA); - FREE (LAruleno); - FREE (accessing_symbol); + XFREE (lookaheads); + XFREE (LA); + XFREE (LAruleno); + XFREE (accessing_symbol); goto_actions (); - FREE (goto_map + ntokens); - FREE (from_state); - FREE (to_state); + XFREE (goto_map + ntokens); + XFREE (from_state); + XFREE (to_state); sort_actions (); pack_table (); @@ -1166,6 +1140,7 @@ static void output_parser (void) { int c; + static int number_of_dollar_signs = 0; #ifdef DONTDEF FILE *fpars; #else @@ -1175,8 +1150,9 @@ output_parser (void) if (pure_parser) fprintf (ftable, "#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 */ +#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 @@ -1193,7 +1169,7 @@ output_parser (void) /* See if the line starts with `#line. If so, set write_line to 0. */ - if (nolinesflag) + if (no_lines_flag) if (c == '#') { c = getc (fpars); @@ -1227,11 +1203,15 @@ output_parser (void) { if (c == '$') { + 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); + /* Skip the end of the line containing `$'. */ + write_line = 0; } else putc (c, ftable); @@ -1240,6 +1220,7 @@ output_parser (void) break; putc (c, ftable); } + assert (number_of_dollar_signs == 1); } static void @@ -1247,7 +1228,7 @@ output_program (void) { int c; - if (!nolinesflag) + if (!no_lines_flag) fprintf (ftable, "#line %d \"%s\"\n", lineno, infile); c = getc (finput); @@ -1264,12 +1245,12 @@ free_itemsets (void) { core *cp, *cptmp; - FREE (state_table); + XFREE (state_table); for (cp = first_state; cp; cp = cptmp) { cptmp = cp->next; - FREE (cp); + XFREE (cp); } } @@ -1291,10 +1272,10 @@ output (void) putc (c, ftable); } reader_output_yylsp (ftable); - if (debugflag) + if (debug_flag) fputs ("\ #ifndef YYDEBUG\n\ -#define YYDEBUG 1\n\ +# define YYDEBUG 1\n\ #endif\n\ \n", ftable); @@ -1302,7 +1283,7 @@ output (void) if (semantic_parser) fprintf (ftable, "#include \"%s\"\n", attrsfile); - if (!noparserflag) + if (!no_parser_flag) fprintf (ftable, "#include \n\n"); /* Make "const" do nothing if not in ANSI C. */ @@ -1321,12 +1302,12 @@ output (void) /* if (semantic_parser) */ /* This is now unconditional because debugging printouts can use it. */ output_gram (); - FREE (ritem); + XFREE (ritem); if (semantic_parser) output_stos (); output_rule_data (); output_actions (); - if (!noparserflag) + if (!no_parser_flag) output_parser (); output_program (); }