X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f693ad146e6e4951662d60903b8512d518cb09da..64d15509b6b63eb620a6f8ab5c4c9cc4ffaaa304:/src/output.c diff --git a/src/output.c b/src/output.c index 4a4f8bd3..841ebe4f 100644 --- a/src/output.c +++ b/src/output.c @@ -91,7 +91,6 @@ */ #include "system.h" -#include "obstack.h" #include "quotearg.h" #include "getargs.h" #include "files.h" @@ -126,6 +125,23 @@ struct obstack output_obstack; int error_verbose = 0; +/* Returns the number of lines of S. */ +static size_t +get_lines_number (const char *s) +{ + size_t lines = 0; + + size_t i; + for (i = 0; s[i]; ++i) + { + if (s[i] == '\n') + ++lines; + } + + return lines; +} + + /* FIXME. */ static inline void @@ -198,9 +214,9 @@ output_gram (void) XFREE (yyrhs); } - + #if 0 - if (!semantic_parser && !no_parser_flag) + if (!semantic_parser) obstack_sgrow (&table_obstack, "\n#endif\n"); #endif } @@ -239,22 +255,14 @@ output_rule_data (void) j = 0; for (i = 0; i < nsyms; i++) - /* this used to be i<=nsyms, but that output a final "" symbol - almost by accident */ { + /* Be sure not to use twice the same quotearg slot. */ + const char *cp = + quotearg_n_style (1, c_quoting_style, + quotearg_style (escape_quoting_style, tags[i])); /* Width of the next token, including the two quotes, the coma and the space. */ - int strsize = 4; - char *p; - - 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++; + int strsize = strlen (cp) + 2; if (j + strsize > 75) { @@ -262,24 +270,8 @@ output_rule_data (void) j = 2; } - obstack_1grow (&output_obstack, '\"'); - for (p = tags[i]; p && *p; p++) - { - if (*p == '"' || *p == '\\') - obstack_fgrow1 (&output_obstack, "\\%c", *p); - else if (*p == '\n') - obstack_sgrow (&output_obstack, "\\n"); - else if (*p == '\t') - obstack_sgrow (&output_obstack, "\\t"); - else if (*p == '\b') - obstack_sgrow (&output_obstack, "\\b"); - else if (*p < 040 || *p >= 0177) - obstack_fgrow1 (&output_obstack, "\\%03o", *p); - else - obstack_1grow (&output_obstack, *p); - } - - obstack_sgrow (&output_obstack, "\", "); + obstack_sgrow (&output_obstack, cp); + obstack_sgrow (&output_obstack, ", "); j += strsize; } /* add a NULL entry to list of tokens */ @@ -314,8 +306,6 @@ output_rule_data (void) 0, 1, nrules + 1); muscle_insert ("r2", obstack_finish (&output_obstack)); XFREE (short_tab); - - XFREE (rule_table + 1); } /*------------------------------------------------------------------. @@ -541,6 +531,42 @@ token_actions (void) } +/*-----------------------------. +| Output the actions to OOUT. | +`-----------------------------*/ + +static void +actions_output (FILE *out, size_t *line) +{ + int rule; + for (rule = 1; rule < nrules + 1; ++rule) + if (rule_table[rule].action) + { + fprintf (out, " case %d:\n", rule); + + if (!no_lines_flag) + fprintf (out, muscle_find ("linef"), + rule_table[rule].action_line, + quotearg_style (c_quoting_style, + muscle_find ("filename"))); + /* As a Bison extension, add the ending semicolon. Since some + Yacc don't do that, help people using bison as a Yacc + finding their missing semicolons. */ + fprintf (out, "{ %s%s }\n break;\n\n", + rule_table[rule].action, + yacc_flag ? ";" : ""); + + /* We always output 4 '\n' per action. */ + *line += 4; + /* Plus one if !no_lines_flag. */ + if (!no_lines_flag) + ++*line; + /* Get the number of lines written by the user. */ + *line += get_lines_number (rule_table[rule].action); + } +} + + static void save_column (int symbol, int default_state) { @@ -885,6 +911,7 @@ output_check (void) static void output_actions (void) { + int i; nvectors = nstates + nvars; froms = XCALLOC (short *, nvectors); @@ -893,8 +920,6 @@ output_actions (void) width = XCALLOC (short, nvectors); token_actions (); - LIST_FREE (shifts, first_shift); - LIST_FREE (reductions, first_reduction); XFREE (LA); XFREE (LAruleno); @@ -910,7 +935,14 @@ output_actions (void) output_table (); output_check (); - LIST_FREE (state_t, first_state); + + for (i = 0; i < nstates; ++i) + { + XFREE (state_table[i]->shifts); + XFREE (state_table[i]->reductions); + XFREE (state_table[i]->errs); + free (state_table[i]); + } XFREE (state_table); } @@ -921,7 +953,7 @@ output_actions (void) `------------------------------------------------------------*/ static void -output_parser (const char *skel_filename, struct obstack *oout) +output_parser (const char *skel_filename, FILE *out) { int c; FILE *fskel; @@ -938,7 +970,7 @@ output_parser (const char *skel_filename, struct obstack *oout) { if (c == '\n') ++line; - obstack_1grow (oout, c); + putc (c, out); c = getc (fskel); } else if ((c = getc (fskel)) == '%') @@ -954,20 +986,23 @@ output_parser (const char *skel_filename, struct obstack *oout) /* Output the right value, or see if it's something special. */ muscle_key = obstack_finish (&muscle_obstack); muscle_value = muscle_find (muscle_key); - if (muscle_value) - obstack_sgrow (oout, muscle_value); + if (!strcmp (muscle_key, "actions")) + actions_output (out, &line); else if (!strcmp (muscle_key, "line")) - obstack_fgrow1 (oout, "%d", line + 1); - else if (!strcmp (muscle_key, "input-line")) - obstack_fgrow1 (oout, "%d", lineno); + fprintf (out, "%d", line); + else if (muscle_value) + { + fputs (muscle_value, out); + line += get_lines_number (muscle_value); + } else { - obstack_sgrow (oout, "%%"); - obstack_sgrow (oout, muscle_key); + fputs ("%%", out); + fputs (muscle_key, out); } } else - obstack_1grow (oout, '%'); + putc ('%', out); } /* End. */ @@ -981,6 +1016,7 @@ output_parser (const char *skel_filename, struct obstack *oout) static void output_master_parser (void) { + FILE *parser = xfopen (parser_file_name, "w"); if (!skeleton) { if (semantic_parser) @@ -989,7 +1025,10 @@ output_master_parser (void) skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE); } muscle_insert ("skeleton", skeleton); - output_parser (skeleton, &table_obstack); + muscle_insert ("parser-file-name", parser_file_name); + + output_parser (skeleton, parser); + xfclose (parser); } @@ -1028,6 +1067,7 @@ prepare (void) MUSCLE_INSERT_INT ("maxtok", max_user_token_number); MUSCLE_INSERT_INT ("ntbase", ntokens); MUSCLE_INSERT_INT ("error-verbose", error_verbose); + MUSCLE_INSERT_STRING ("prefix", spec_name_prefix); MUSCLE_INSERT_INT ("nnts", nvars); MUSCLE_INSERT_INT ("nrules", nrules); @@ -1035,14 +1075,50 @@ prepare (void) MUSCLE_INSERT_INT ("ntokens", ntokens); MUSCLE_INSERT_INT ("locations-flag", locations_flag); +} - /* We need to save the actions in the muscle %%action. */ - muscle_insert ("action", obstack_finish (&action_obstack)); - if (spec_name_prefix) - MUSCLE_INSERT_STRING ("prefix", spec_name_prefix); +/*-------------------------. +| Output the header file. | +`-------------------------*/ + +static void +header_output (void) +{ + FILE *out = xfopen (spec_defines_file, "w"); + char *macro_name = compute_header_macro (); + + fprintf (out, "#ifndef %s\n", macro_name); + fprintf (out, "# define %s\n\n", macro_name); + + fputs (muscle_find ("tokendef"), out); + fprintf (out, "\ +#ifndef YYSTYPE\n\ +typedef %s +yystype;\n\ +# define YYSTYPE yystype\n\ +#endif\n", + muscle_find ("stype")); + + if (!pure_parser) + fprintf (out, "\nextern YYSTYPE %slval;\n", + spec_name_prefix); + if (semantic_parser) + { + int i; + + for (i = ntokens; i < nsyms; i++) + /* don't make these for dummy nonterminals made by gensym. */ + if (*tags[i] != '@') + fprintf (out, "# define\tNT%s\t%d\n", tags[i], i); + } + + fprintf (out, "\n#endif /* not %s */\n", macro_name); + free (macro_name); + xfclose (out); } + /*----------------------------------------------------------. | Output the parsing tables and the parser code to ftable. | `----------------------------------------------------------*/ @@ -1062,15 +1138,18 @@ output (void) XFREE (user_toknums); output_actions (); -#if 0 - if (!no_parser_flag) */ -#endif prepare (); /* Copy definitions in directive. */ + obstack_1grow (&attrs_obstack, 0); muscle_insert ("prologue", obstack_finish (&attrs_obstack)); + /* Output the parser. */ output_master_parser (); + /* Output the header if needed. */ + if (defines_flag) + header_output (); + free (rule_table + 1); obstack_free (&muscle_obstack, 0); obstack_free (&output_obstack, 0); obstack_free (&action_obstack, 0);