X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/20c1e2ad9841d06212465ce0b81c771d08c9ec51..5b7f88c7f24c3ca04bbb00860f5c429096ee8ce7:/src/output.c diff --git a/src/output.c b/src/output.c index 41961a5d..63d02027 100644 --- a/src/output.c +++ b/src/output.c @@ -107,19 +107,49 @@ GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number_t) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number_t) -/*-----------------------------------------------------------------. -| Prepare the muscles related to the tokens: translate, tname, and | -| toknum. | -`-----------------------------------------------------------------*/ +/*----------------------------------------------------------------------. +| Print to OUT a representation of FILENAME escaped both for C and M4. | +`----------------------------------------------------------------------*/ static void -prepare_tokens (void) +escaped_file_name_output (FILE *out, char const *filename) { + char const *p; + fprintf (out, "[["); + + for (p = quotearg_style (c_quoting_style, filename); *p; p++) + switch (*p) + { + case '$': fputs ("$][", out); break; + case '@': fputs ("@@", out); break; + case '[': fputs ("@{", out); break; + case ']': fputs ("@}", out); break; + default: fputc (*p, out); break; + } + + fprintf (out, "]]"); +} + + +/*------------------------------------------------------------------. +| Prepare the muscles related to the symbols: translate, tname, and | +| toknum. | +`------------------------------------------------------------------*/ + +static void +prepare_symbols (void) +{ + MUSCLE_INSERT_INT ("tokens_number", ntokens); + MUSCLE_INSERT_INT ("nterms_number", nvars); + MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); + MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); + muscle_insert_symbol_number_table ("translate", token_translations, token_translations[0], 1, max_user_token_number + 1); + /* tname -- token names. */ { int i; int j = 0; @@ -130,7 +160,7 @@ prepare_tokens (void) const char *cp = quotearg_n_style (1, c_quoting_style, symbols[i]->tag); - /* Width of the next token, including the two quotes, the coma + /* Width of the next token, including the two quotes, the comma and the space. */ int strsize = strlen (cp) + 2; @@ -140,7 +170,7 @@ prepare_tokens (void) j = 2; } - obstack_sgrow (&format_obstack, cp); + MUSCLE_OBSTACK_SGROW (&format_obstack, cp); obstack_sgrow (&format_obstack, ", "); j += strsize; } @@ -215,6 +245,8 @@ prepare_rules (void) muscle_insert_short_table ("dprec", dprec, 0, 0, nrules); muscle_insert_short_table ("merger", merger, 0, 0, nrules); + MUSCLE_INSERT_INT ("rules_number", nrules); + free (rhs); free (prhs); free (rline); @@ -238,6 +270,10 @@ prepare_states (void) values[i] = states[i]->accessing_symbol; muscle_insert_symbol_number_table ("stos", values, 0, 1, nstates); + + MUSCLE_INSERT_INT ("last", high); + MUSCLE_INSERT_INT ("final_state_number", final_state->number); + MUSCLE_INSERT_INT ("states_number", nstates); } @@ -257,11 +293,10 @@ user_actions_output (FILE *out) { fprintf (out, " case %d:\n", r + 1); - if (!no_lines_flag) - fprintf (out, muscle_find ("linef"), - rules[r].action_location.first_line, - quotearg_style (c_quoting_style, - muscle_find ("filename"))); + fprintf (out, "]b4_syncline([[%d]], ", + rules[r].action_location.first_line); + escaped_file_name_output (out, rules[r].action_location.file); + fprintf (out, ")[\n"); fprintf (out, " %s\n break;\n\n", rules[r].action); } @@ -360,9 +395,11 @@ symbol_destructors_output (FILE *out) /* Filename, lineno, Symbol-name, Symbol-number, destructor, typename. */ - fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - first ? "" : ",\n", - infile, symbol->destructor_location.first_line, + fprintf (out, "%s[", + first ? "" : ",\n"); + escaped_file_name_output (out, symbol->destructor_location.file); + fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", + symbol->destructor_location.first_line, symbol->tag, symbol->number, symbol->destructor, @@ -393,9 +430,11 @@ symbol_printers_output (FILE *out) /* Filename, lineno, Symbol-name, Symbol-number, printer, typename. */ - fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - first ? "" : ",\n", - infile, symbol->printer_location.first_line, + fprintf (out, "%s[", + first ? "" : ",\n"); + escaped_file_name_output (out, symbol->printer_location.file); + fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", + symbol->printer_location.first_line, symbol->tag, symbol->number, symbol->printer, @@ -449,7 +488,7 @@ prepare_actions (void) that case. Nevertheless, it seems even better to be able to use the GLR skeletons even without the non-deterministic tables. */ muscle_insert_unsigned_int_table ("conflict_list_heads", conflict_table, - conflict_table[0], 1, high+1); + conflict_table[0], 1, high + 1); muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list, conflict_list[0], 1, conflict_list_cnt); } @@ -488,8 +527,9 @@ output_skeleton (void) full_path[pkgdatadirlen] = '/'; strcpy (full_path + pkgdatadirlen + 1, m4sugar); in = fopen (full_path, "r"); - if (! in || fclose (in) != 0) + if (! in) error (EXIT_FAILURE, errno, "%s", full_path); + xfclose (in); strcpy (full_path + pkgdatadirlen + 1, skeleton); /* Create an m4 subprocess connected to us via two pipes. */ @@ -515,10 +555,6 @@ output_skeleton (void) error (EXIT_FAILURE, errno, "fdopen"); /* Output the definitions of all the muscles. */ - - /* There are no comments, especially not `#': we do want M4 expansion - after `#': think of CPP macros! */ - fputs ("m4_changecom()\n", out); fputs ("m4_init()\n", out); user_actions_output (out); @@ -531,8 +567,6 @@ output_skeleton (void) fputs ("m4_wrap([m4_divert_pop(0)])\n", out); fputs ("m4_divert_push(0)dnl\n", out); - if (ferror (out)) - error (EXIT_FAILURE, 0, "pipe output error"); xfclose (out); /* Read and process m4's output. */ @@ -541,8 +575,6 @@ output_skeleton (void) if (! in) error (EXIT_FAILURE, errno, "fdopen"); scan_skel (in); - if (ferror (in)) - error (EXIT_FAILURE, 0, "pipe input error"); xfclose (in); reap_subpipe (pid, m4); timevar_pop (TV_M4); @@ -552,33 +584,16 @@ static void prepare (void) { /* Flags. */ - MUSCLE_INSERT_INT ("locations_flag", locations_flag); + MUSCLE_INSERT_INT ("debug", debug_flag); MUSCLE_INSERT_INT ("defines_flag", defines_flag); MUSCLE_INSERT_INT ("error_verbose", error_verbose); + MUSCLE_INSERT_INT ("locations_flag", locations_flag); MUSCLE_INSERT_INT ("pure", pure_parser); - MUSCLE_INSERT_INT ("debug", debug_flag); + MUSCLE_INSERT_INT ("synclines_flag", !no_lines_flag); /* FIXME: This is wrong: the muscles should decide whether they hold a copy or not, but the situation is too obscure currently. */ MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); - MUSCLE_INSERT_STRING ("output_infix", output_infix ? output_infix : ""); - MUSCLE_INSERT_STRING ("output_prefix", short_base_name); - MUSCLE_INSERT_STRING ("output_parser_name", parser_file_name); - MUSCLE_INSERT_STRING ("output_header_name", spec_defines_file); - - /* Symbols. */ - MUSCLE_INSERT_INT ("tokens_number", ntokens); - MUSCLE_INSERT_INT ("nterms_number", nvars); - MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); - MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); - - /* Rules. */ - MUSCLE_INSERT_INT ("rules_number", nrules); - - /* States. */ - MUSCLE_INSERT_INT ("last", high); - MUSCLE_INSERT_INT ("final_state_number", final_state->number); - MUSCLE_INSERT_INT ("states_number", nstates); /* User Code. */ obstack_1grow (&pre_prologue_obstack, 0); @@ -596,7 +611,7 @@ prepare (void) } /* Parse the skeleton file and output the needed parsers. */ - MUSCLE_INSERT_STRING ("skeleton", skeleton); + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); } @@ -609,7 +624,7 @@ output (void) { obstack_init (&format_obstack); - prepare_tokens (); + prepare_symbols (); prepare_rules (); prepare_states (); prepare_actions ();