X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..0e021770cc023c6a2e7ae132a3aab55bc7cbc058:/src/output.c?ds=sidebyside diff --git a/src/output.c b/src/output.c index 2a45c39a..4608a2fa 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, 2005 - 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. @@ -20,9 +20,10 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#include #include "system.h" +#include #include #include #include @@ -36,18 +37,14 @@ #include "muscle_tab.h" #include "output.h" #include "reader.h" +#include "scan-code.h" /* max_left_semantic_context */ +#include "scan-skel.h" #include "symtab.h" #include "tables.h" -/* From src/scan-skel.l. */ -void scan_skel (FILE *); - static struct obstack format_obstack; -bool error_verbose = false; - - /*-------------------------------------------------------------------. | Create a function NAME which associates to the muscle NAME the | @@ -60,7 +57,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, \ @@ -145,6 +142,7 @@ escaped_output (FILE *out, char const *string) 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); @@ -162,10 +160,7 @@ prepare_symbols (void) int j = 2; for (i = 0; i < nsyms; i++) { - char const *tag = symbols[i]->tag; - char const *cp = (*tag == '"' - ? tag - : quotearg_style (c_quoting_style, 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; @@ -182,9 +177,7 @@ prepare_symbols (void) obstack_1grow (&format_obstack, ','); j += width; } - /* Add a NULL entry to list of tokens (well, 0, as NULL might not be - defined). */ - obstack_sgrow (&format_obstack, " 0"); + obstack_sgrow (&format_obstack, " ]b4_null["); /* Finish table and store. */ obstack_1grow (&format_obstack, 0); @@ -243,8 +236,7 @@ prepare_rules (void) /* Merger-function index (GLR). */ merger[r] = rules[r].merger; } - if (i != nritems) - abort (); + aver (i == nritems); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems); muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules); @@ -297,20 +289,16 @@ user_actions_output (FILE *out) { rule_number r; - fputs ("m4_define([b4_actions], \n[[", out); + fputs ("m4_define([b4_actions], \n[", out); for (r = 0; r < nrules; ++r) if (rules[r].action) { - fprintf (out, " case %d:\n", r + 1); - - fprintf (out, "]b4_syncline(%d, ", + fprintf (out, "b4_case(%d, [b4_syncline(%d, ", r + 1, rules[r].action_location.start.line); escaped_output (out, rules[r].action_location.start.file); - fprintf (out, ")[\n"); - fprintf (out, " %s\n break;\n\n", - rules[r].action); + fprintf (out, ")\n[ %s]])\n\n", rules[r].action); } - fputs ("]])\n\n", out); + fputs ("])\n\n", out); } /*--------------------------------------. @@ -355,8 +343,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 (); + aver (number != USER_NUMBER_ALIAS); /* Skip error token. */ if (sym == errtoken) @@ -398,7 +385,7 @@ symbol_destructors_output (FILE *out) fputs ("m4_define([b4_symbol_destructors], \n[", out); for (i = 0; i < nsyms; ++i) - if (symbols[i]->destructor) + if (symbol_destructor_get (symbols[i])) { symbol *sym = symbols[i]; @@ -407,10 +394,12 @@ symbol_destructors_output (FILE *out) destructor, optional typename. */ fprintf (out, "%s[", sep); sep = ",\n"; - escaped_output (out, sym->destructor_location.start.file); - fprintf (out, ", %d, ", sym->destructor_location.start.line); + escaped_output (out, symbol_destructor_location_get (sym).start.file); + fprintf (out, ", %d, ", + symbol_destructor_location_get (sym).start.line); escaped_output (out, sym->tag); - fprintf (out, ", %d, [[%s]]", sym->number, sym->destructor); + fprintf (out, ", %d, [[%s]]", sym->number, + symbol_destructor_get (sym)); if (sym->type_name) fprintf (out, ", [[%s]]", sym->type_name); fputc (']', out); @@ -431,7 +420,7 @@ symbol_printers_output (FILE *out) fputs ("m4_define([b4_symbol_printers], \n[", out); for (i = 0; i < nsyms; ++i) - if (symbols[i]->printer) + if (symbol_printer_get (symbols[i])) { symbol *sym = symbols[i]; @@ -440,10 +429,10 @@ symbol_printers_output (FILE *out) printer, optional typename. */ fprintf (out, "%s[", sep); sep = ",\n"; - escaped_output (out, sym->printer_location.start.file); - fprintf (out, ", %d, ", sym->printer_location.start.line); + escaped_output (out, symbol_printer_location_get (sym).start.file); + fprintf (out, ", %d, ", symbol_printer_location_get (sym).start.line); escaped_output (out, sym->tag); - fprintf (out, ", %d, [[%s]]", sym->number, sym->printer); + fprintf (out, ", %d, [[%s]]", sym->number, symbol_printer_get (sym)); if (sym->type_name) fprintf (out, ", [[%s]]", sym->type_name); fputc (']', out); @@ -456,7 +445,7 @@ static void prepare_actions (void) { /* Figure out the actions for the specified state, indexed by - look-ahead token type. */ + lookahead token type. */ muscle_insert_rule_number_table ("defact", yydefact, yydefact[0], 1, nstates); @@ -510,7 +499,7 @@ output_skeleton (void) FILE *in; FILE *out; int filter_fd[2]; - char const *argv[6]; + char const *argv[7]; pid_t pid; /* Compute the names of the package data dir and skeleton file. @@ -518,8 +507,9 @@ output_skeleton (void) installation. A faulty installation can cause deadlock, so a cheap sanity check is worthwhile. */ char const m4sugar[] = "m4sugar/m4sugar.m4"; + char const m4bison[] = "bison.m4"; char *full_m4sugar; - char *full_cm4; + char *full_m4bison; char *full_skeleton; char const *p; char const *m4 = (p = getenv ("M4")) ? p : M4; @@ -535,8 +525,8 @@ 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, m4bison); + full_m4bison = xstrdup (full_skeleton); strcpy (full_skeleton + pkgdatadirlen + 1, skeleton); xfclose (xfopen (full_m4sugar, "r")); @@ -544,24 +534,26 @@ output_skeleton (void) if (trace_flag & trace_tools) fprintf (stderr, "running: %s %s - %s %s\n", - m4, full_m4sugar, full_cm4, full_skeleton); + m4, full_m4sugar, full_m4bison, full_skeleton); argv[0] = m4; argv[1] = full_m4sugar; argv[2] = "-"; - argv[3] = full_cm4; + argv[3] = full_m4bison; argv[4] = full_skeleton; - argv[5] = NULL; + argv[5] = trace_flag & trace_m4 ? "-dV" : NULL; + argv[6] = NULL; init_subpipe (); pid = create_subpipe (argv, filter_fd); + free (full_m4bison); 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); @@ -580,9 +572,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); @@ -593,15 +587,34 @@ static void prepare (void) { /* Flags. */ - MUSCLE_INSERT_BOOL ("debug", debug_flag); + MUSCLE_INSERT_BOOL ("debug_flag", debug_flag); MUSCLE_INSERT_BOOL ("defines_flag", defines_flag); - MUSCLE_INSERT_BOOL ("error_verbose", error_verbose); + MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose); + MUSCLE_INSERT_BOOL ("glr_flag", glr_parser); MUSCLE_INSERT_BOOL ("locations_flag", locations_flag); - MUSCLE_INSERT_BOOL ("pure", pure_parser); + MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser); + MUSCLE_INSERT_BOOL ("pure_flag", pure_parser); + MUSCLE_INSERT_BOOL ("push_flag", push_parser); MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag); + MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen); + MUSCLE_INSERT_BOOL ("yacc_flag", yacc_flag); /* File names. */ - MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); + if (spec_name_prefix) + MUSCLE_INSERT_STRING ("prefix", spec_name_prefix); + + MUSCLE_INSERT_STRING ("file_name_all_but_ext", all_but_ext); + +#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); @@ -609,17 +622,21 @@ prepare (void) muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack)); muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack)); - /* Find the right skeleton file. */ - if (!skeleton) - { - if (glr_parser || nondeterministic_parser) - skeleton = "glr.c"; - else - skeleton = "yacc.c"; - } + /* Find the right skeleton file, and add muscles about the skeletons. */ + if (skeleton) + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + else + skeleton = language->skeleton; - /* Parse the skeleton file and output the needed parsers. */ - MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + /* About the skeletons. */ + { + char const *pkgdatadir = getenv ("BISON_PKGDATADIR"); + /* b4_pkgdatadir is used inside m4_include in the skeletons, so digraphs + would never be expanded. Hopefully no one has M4-special characters in + his Bison installation path. */ + MUSCLE_INSERT_STRING_RAW ("pkgdatadir", + pkgdatadir ? pkgdatadir : PKGDATADIR); + } }