X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/573312acb69f2981a19275cf885d5bf52a46ddb5..5b7f88c7f24c3ca04bbb00860f5c429096ee8ce7:/src/output.c?ds=inline diff --git a/src/output.c b/src/output.c index a3680250..63d02027 100644 --- a/src/output.c +++ b/src/output.c @@ -20,71 +20,6 @@ 02111-1307, USA. */ -/* The parser tables consist of these tables. - - YYTRANSLATE = vector mapping yylex's token numbers into bison's - token numbers. - - YYTNAME = vector of string-names indexed by bison token number. - - YYTOKNUM = vector of yylex token numbers corresponding to entries - in YYTNAME. - - YYRLINE = vector of line-numbers of all rules. For yydebug - printouts. - - YYRHS = vector of items of all rules. This is exactly what RITEMS - contains. For yydebug and for semantic parser. - - YYPRHS[R] = index in YYRHS of first item for rule R. - - YYR1[R] = symbol number of symbol that rule R derives. - - YYR2[R] = number of symbols composing right hand side of rule R. - - YYSTOS[S] = the symbol number of the symbol that leads to state S. - - YYDEFACT[S] = default rule to reduce with in state s, when YYTABLE - doesn't specify something else to do. Zero means the default is an - error. - - YYDEFGOTO[I] = default state to go to after a reduction of a rule - that generates variable NTOKENS + I, except when YYTABLE specifies - something else to do. - - YYPACT[S] = index in YYTABLE of the portion describing state S. - The lookahead token's type is used to index that portion to find - out what to do. - - If the value in YYTABLE is positive, we shift the token and go to - that state. - - If the value is negative, it is minus a rule number to reduce by. - - If the value is zero, the default action from YYDEFACT[S] is used. - - YYPGOTO[I] = the index in YYTABLE of the portion describing what to - do after reducing a rule that derives variable I + NTOKENS. This - portion is indexed by the parser state number, S, as of before the - text for this nonterminal was read. The value from YYTABLE is the - state to go to if the corresponding value in YYCHECK is S. - - YYTABLE = a vector filled with portions for different uses, found - via YYPACT and YYPGOTO. - - YYCHECK = a vector indexed in parallel with YYTABLE. It indicates, - in a roundabout way, the bounds of the portion you are trying to - examine. - - Suppose that the portion of YYTABLE starts at index P and the index - to be examined within the portion is I. Then if YYCHECK[P+I] != I, - I is outside the bounds of what is actually allocated, and the - default (from YYDEFACT or YYDEFGOTO) should be used. Otherwise, - YYTABLE[P+I] should be used. - - YYFINAL = the state number of the termination state. YYFLAG = most - negative short int. Used to flag ?? */ - #include "system.h" #include "quotearg.h" #include "error.h" @@ -172,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; @@ -195,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; @@ -205,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; } @@ -280,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); @@ -303,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); } @@ -322,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); } @@ -425,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, @@ -458,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, @@ -514,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); } @@ -553,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. */ @@ -580,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); @@ -596,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. */ @@ -606,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); @@ -617,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); @@ -661,7 +611,7 @@ prepare (void) } /* Parse the skeleton file and output the needed parsers. */ - muscle_insert ("skeleton", xstrdup (skeleton)); + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); } @@ -674,7 +624,7 @@ output (void) { obstack_init (&format_obstack); - prepare_tokens (); + prepare_symbols (); prepare_rules (); prepare_states (); prepare_actions ();