X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/779e7ceb9395424c2cf90d43c75302ababc8ee72..927b425baae16fc1d50e092b78b944e281b521f6:/src/output.c?ds=inline diff --git a/src/output.c b/src/output.c index 68dd2dff..07978ed9 100644 --- a/src/output.c +++ b/src/output.c @@ -1,7 +1,7 @@ /* Output the generated parsing program for Bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ +#include #include "system.h" #include @@ -36,12 +36,10 @@ #include "muscle_tab.h" #include "output.h" #include "reader.h" +#include "scan-skel.h" #include "symtab.h" #include "tables.h" -/* From src/scan-skel.l. */ -void scan_skel (FILE *); - static struct obstack format_obstack; @@ -60,7 +58,7 @@ bool error_verbose = false; #define GENERATE_MUSCLE_INSERT_TABLE(Name, Type) \ \ static void \ -Name (const char *name, \ +Name (char const *name, \ Type *table_data, \ Type first, \ int begin, \ @@ -106,7 +104,6 @@ Name (const char *name, \ GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_int_table, int) -GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_short_int_table, short int) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_base_table, base_number) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_rule_number_table, rule_number) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_symbol_number_table, symbol_number) @@ -114,17 +111,17 @@ GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number) -/*----------------------------------------------------------------------. -| Print to OUT a representation of FILENAME escaped both for C and M4. | -`----------------------------------------------------------------------*/ +/*--------------------------------------------------------------------. +| Print to OUT a representation of STRING escaped both for C and M4. | +`--------------------------------------------------------------------*/ static void -escaped_file_name_output (FILE *out, char const *filename) +escaped_output (FILE *out, char const *string) { char const *p; fprintf (out, "[["); - for (p = quotearg_style (c_quoting_style, filename); *p; p++) + for (p = quotearg_style (c_quoting_style, string); *p; p++) switch (*p) { case '$': fputs ("$][", out); break; @@ -146,6 +143,7 @@ escaped_file_name_output (FILE *out, char const *filename) static void prepare_symbols (void) { + MUSCLE_INSERT_BOOL ("token_table", token_table_flag); MUSCLE_INSERT_INT ("tokens_number", ntokens); MUSCLE_INSERT_INT ("nterms_number", nvars); MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); @@ -163,7 +161,7 @@ prepare_symbols (void) int j = 2; for (i = 0; i < nsyms; i++) { - const char *cp = quotearg_style (c_quoting_style, symbols[i]->tag); + char const *cp = quotearg_style (c_quoting_style, symbols[i]->tag); /* Width of the next token, including the two quotes, the comma and the space. */ int width = strlen (cp) + 2; @@ -192,7 +190,7 @@ prepare_symbols (void) /* Output YYTOKNUM. */ { int i; - int *values = MALLOC (values, ntokens); + int *values = xnmalloc (ntokens, sizeof *values); for (i = 0; i < ntokens; ++i) values[i] = symbols[i]->user_token_number; muscle_insert_int_table ("toknum", values, @@ -212,13 +210,13 @@ prepare_rules (void) { rule_number r; unsigned int i = 0; - item_number *rhs = MALLOC (rhs, nritems); - unsigned int *prhs = MALLOC (prhs, nrules); - unsigned int *rline = MALLOC (rline, nrules); - symbol_number *r1 = MALLOC (r1, nrules); - unsigned int *r2 = MALLOC (r2, nrules); - short int *dprec = MALLOC (dprec, nrules); - short int *merger = MALLOC (merger, nrules); + item_number *rhs = xnmalloc (nritems, sizeof *rhs); + unsigned int *prhs = xnmalloc (nrules, sizeof *prhs); + unsigned int *rline = xnmalloc (nrules, sizeof *rline); + symbol_number *r1 = xnmalloc (nrules, sizeof *r1); + unsigned int *r2 = xnmalloc (nrules, sizeof *r2); + int *dprec = xnmalloc (nrules, sizeof *dprec); + int *merger = xnmalloc (nrules, sizeof *merger); for (r = 0; r < nrules; ++r) { @@ -241,16 +239,15 @@ prepare_rules (void) /* Merger-function index (GLR). */ merger[r] = rules[r].merger; } - if (i != nritems) - abort (); + assert (i == nritems); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems); muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules); muscle_insert_unsigned_int_table ("rline", rline, 0, 0, nrules); muscle_insert_symbol_number_table ("r1", r1, 0, 0, nrules); muscle_insert_unsigned_int_table ("r2", r2, 0, 0, nrules); - muscle_insert_short_int_table ("dprec", dprec, 0, 0, nrules); - muscle_insert_short_int_table ("merger", merger, 0, 0, nrules); + muscle_insert_int_table ("dprec", dprec, 0, 0, nrules); + muscle_insert_int_table ("merger", merger, 0, 0, nrules); MUSCLE_INSERT_INT ("rules_number", nrules); MUSCLE_INSERT_INT ("max_left_semantic_context", max_left_semantic_context); @@ -272,7 +269,7 @@ static void prepare_states (void) { state_number i; - symbol_number *values = MALLOC (values, nstates); + symbol_number *values = xnmalloc (nstates, sizeof *values); for (i = 0; i < nstates; ++i) values[i] = states[i]->accessing_symbol; muscle_insert_symbol_number_table ("stos", values, @@ -301,9 +298,9 @@ user_actions_output (FILE *out) { fprintf (out, " case %d:\n", r + 1); - fprintf (out, "]b4_syncline([[%d]], ", + fprintf (out, "]b4_syncline(%d, ", rules[r].action_location.start.line); - escaped_file_name_output (out, rules[r].action_location.start.file); + escaped_output (out, rules[r].action_location.start.file); fprintf (out, ")[\n"); fprintf (out, " %s\n break;\n\n", rules[r].action); @@ -353,8 +350,7 @@ token_definitions_output (FILE *out) /* At this stage, if there are literal aliases, they are part of SYMBOLS, so we should not find symbols which are the aliases here. */ - if (number == USER_NUMBER_ALIAS) - abort (); + assert (number != USER_NUMBER_ALIAS); /* Skip error token. */ if (sym == errtoken) @@ -376,7 +372,7 @@ token_definitions_output (FILE *out) if (strchr (sym->tag, '.') || strchr (sym->tag, '$')) continue; - fprintf (out, "%s[[[%s]], [%d]]", + fprintf (out, "%s[[[%s]], %d]", sep, sym->tag, number); sep = ",\n"; } @@ -402,16 +398,16 @@ symbol_destructors_output (FILE *out) /* Filename, lineno, Symbol-name, Symbol-number, - destructor, typename. */ + destructor, optional typename. */ fprintf (out, "%s[", sep); sep = ",\n"; - escaped_file_name_output (out, sym->destructor_location.start.file); - fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - sym->destructor_location.start.line, - sym->tag, - sym->number, - sym->destructor, - sym->type_name); + escaped_output (out, sym->destructor_location.start.file); + fprintf (out, ", %d, ", sym->destructor_location.start.line); + escaped_output (out, sym->tag); + fprintf (out, ", %d, [[%s]]", sym->number, sym->destructor); + if (sym->type_name) + fprintf (out, ", [[%s]]", sym->type_name); + fputc (']', out); } fputs ("])\n\n", out); } @@ -435,16 +431,16 @@ symbol_printers_output (FILE *out) /* Filename, lineno, Symbol-name, Symbol-number, - printer, typename. */ + printer, optional typename. */ fprintf (out, "%s[", sep); sep = ",\n"; - escaped_file_name_output (out, sym->printer_location.start.file); - fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - sym->printer_location.start.line, - sym->tag, - sym->number, - sym->printer, - sym->type_name); + escaped_output (out, sym->printer_location.start.file); + fprintf (out, ", %d, ", sym->printer_location.start.line); + escaped_output (out, sym->tag); + fprintf (out, ", %d, [[%s]]", sym->number, sym->printer); + if (sym->type_name) + fprintf (out, ", [[%s]]", sym->type_name); + fputc (']', out); } fputs ("])\n\n", out); } @@ -454,7 +450,7 @@ static void prepare_actions (void) { /* Figure out the actions for the specified state, indexed by - lookahead token type. */ + look-ahead token type. */ muscle_insert_rule_number_table ("defact", yydefact, yydefact[0], 1, nstates); @@ -494,7 +490,7 @@ prepare_actions (void) muscle_insert_unsigned_int_table ("conflict_list_heads", conflict_table, conflict_table[0], 1, high + 1); muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list, - conflict_list[0], 1, conflict_list_cnt); + 0, 1, conflict_list_cnt); } @@ -508,7 +504,7 @@ output_skeleton (void) FILE *in; FILE *out; int filter_fd[2]; - char const *argv[6]; + char const *argv[5]; pid_t pid; /* Compute the names of the package data dir and skeleton file. @@ -517,7 +513,6 @@ output_skeleton (void) cheap sanity check is worthwhile. */ char const m4sugar[] = "m4sugar/m4sugar.m4"; char *full_m4sugar; - char *full_cm4; char *full_skeleton; char const *p; char const *m4 = (p = getenv ("M4")) ? p : M4; @@ -533,33 +528,30 @@ output_skeleton (void) full_skeleton[pkgdatadirlen] = '/'; strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar); full_m4sugar = xstrdup (full_skeleton); - strcpy (full_skeleton + pkgdatadirlen + 1, "c.m4"); - full_cm4 = xstrdup (full_skeleton); strcpy (full_skeleton + pkgdatadirlen + 1, skeleton); xfclose (xfopen (full_m4sugar, "r")); /* Create an m4 subprocess connected to us via two pipes. */ if (trace_flag & trace_tools) - fprintf (stderr, "running: %s %s - %s %s\n", - m4, full_m4sugar, full_cm4, full_skeleton); + fprintf (stderr, "running: %s %s - %s\n", + m4, full_m4sugar, full_skeleton); argv[0] = m4; argv[1] = full_m4sugar; argv[2] = "-"; - argv[3] = full_cm4; - argv[4] = full_skeleton; - argv[5] = NULL; + argv[3] = full_skeleton; + argv[4] = NULL; init_subpipe (); pid = create_subpipe (argv, filter_fd); free (full_m4sugar); - free (full_cm4); free (full_skeleton); out = fdopen (filter_fd[0], "w"); if (! out) - error (EXIT_FAILURE, get_errno (), "fdopen"); + error (EXIT_FAILURE, get_errno (), + "fdopen"); /* Output the definitions of all the muscles. */ fputs ("m4_init()\n", out); @@ -578,9 +570,11 @@ output_skeleton (void) /* Read and process m4's output. */ timevar_push (TV_M4); + end_of_output_subpipe (pid, filter_fd); in = fdopen (filter_fd[1], "r"); if (! in) - error (EXIT_FAILURE, get_errno (), "fdopen"); + error (EXIT_FAILURE, get_errno (), + "fdopen"); scan_skel (in); xfclose (in); reap_subpipe (pid, m4); @@ -600,6 +594,16 @@ prepare (void) /* File names. */ MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); +#define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "") + DEFINE (dir_prefix); + DEFINE (parser_file_name); + DEFINE (spec_defines_file); + DEFINE (spec_file_prefix); + DEFINE (spec_graph_file); + DEFINE (spec_name_prefix); + DEFINE (spec_outfile); + DEFINE (spec_verbose_file); +#undef DEFINE /* User Code. */ obstack_1grow (&pre_prologue_obstack, 0); @@ -616,8 +620,12 @@ prepare (void) skeleton = "yacc.c"; } - /* Parse the skeleton file and output the needed parsers. */ - MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + /* About the skeletons. */ + { + char const *pkgdatadir = getenv ("BISON_PKGDATADIR"); + MUSCLE_INSERT_STRING ("pkgdatadir", pkgdatadir ? pkgdatadir : PKGDATADIR); + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + } }