X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d9df47b656fd1757f1f36c8f3d823ca9ca5bfe91..4175f6bba2da4050e268523d396ee446dc4d7655:/src/output.c diff --git a/src/output.c b/src/output.c index 1a1d7b3a..6e6da2e6 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, 2006, 2007 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -156,9 +156,12 @@ prepare_symbols (void) int i; /* We assume that the table will be output starting at column 2. */ int j = 2; + struct quoting_options *qo = clone_quoting_options (0); + set_quoting_style (qo, c_quoting_style); + set_quoting_flags (qo, QA_SPLIT_TRIGRAPHS); for (i = 0; i < nsyms; i++) { - char const *cp = quotearg_style (c_quoting_style, symbols[i]->tag); + char *cp = quotearg_alloc (symbols[i]->tag, -1, qo); /* Width of the next token, including the two quotes, the comma and the space. */ int width = strlen (cp) + 2; @@ -172,9 +175,11 @@ prepare_symbols (void) if (i) obstack_1grow (&format_obstack, ' '); MUSCLE_OBSTACK_SGROW (&format_obstack, cp); + free (cp); obstack_1grow (&format_obstack, ','); j += width; } + free (qo); obstack_sgrow (&format_obstack, " ]b4_null["); /* Finish table and store. */ @@ -278,6 +283,30 @@ prepare_states (void) +/*-----------------------------------------------. +| For each symbol type, its tags and type name. | +`-----------------------------------------------*/ + +static void +type_names_output (FILE *out) +{ + int i; + + fputs ("m4_define([b4_type_names],\n[", out); + for (i = 0; i < nsyms; ++i) + { + symbol *sym = symbols[i]; + /* Symbol-name, Symbol-number, optional typename. */ + fprintf (out, "%s[", i ? ",\n" : ""); + escaped_output (out, sym->tag); + fprintf (out, ", %d, [[%s]]]", + sym->number, + sym->type_name ? sym->type_name : ""); + } + fputs ("])\n\n", out); +} + + /*---------------------------------. | Output the user actions to OUT. | `---------------------------------*/ @@ -299,9 +328,9 @@ user_actions_output (FILE *out) fputs ("])\n\n", out); } -/*--------------------------------------. -| Output the merge functions to OUT. | -`--------------------------------------*/ +/*------------------------------------. +| Output the merge functions to OUT. | +`------------------------------------*/ static void merger_output (FILE *out) @@ -457,6 +486,25 @@ prepare_actions (void) 0, 1, conflict_list_cnt); } + +/*--------------------------------------------. +| Output the definitions of all the muscles. | +`--------------------------------------------*/ + +static void +muscles_output (FILE *out) +{ + fputs ("m4_init()\n", out); + + type_names_output (out); + user_actions_output (out); + merger_output (out); + token_definitions_output (out); + symbol_code_props_output (out, "destructors", &symbol_destructor_get); + symbol_code_props_output (out, "printers", &symbol_printer_get); + + muscles_m4_output (out); +} /*---------------------------. | Call the skeleton parser. | @@ -468,13 +516,10 @@ output_skeleton (void) FILE *in; FILE *out; int filter_fd[2]; - char const *argv[7]; + char const *argv[9]; pid_t pid; - /* Compute the names of the package data dir and skeleton file. - Test whether m4sugar.m4 is readable, to check for proper - installation. A faulty installation can cause deadlock, so a - cheap sanity check is worthwhile. */ + /* Compute the names of the package data dir and skeleton files. */ char const m4sugar[] = "m4sugar/m4sugar.m4"; char const m4bison[] = "bison.m4"; char *full_m4sugar; @@ -500,43 +545,68 @@ output_skeleton (void) strcpy (full_skeleton, skeleton); else strcpy (full_skeleton + pkgdatadirlen + 1, skeleton); + + /* Test whether m4sugar.m4 is readable, to check for proper + installation. A faulty installation can cause deadlock, so a + cheap sanity check is worthwhile. */ 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_m4bison, full_skeleton); + m4, full_m4sugar, full_m4bison, full_skeleton); - argv[0] = m4; - argv[1] = full_m4sugar; - argv[2] = "-"; - argv[3] = full_m4bison; - argv[4] = full_skeleton; - argv[5] = trace_flag & trace_m4 ? "-dV" : NULL; - argv[6] = NULL; + /* Some future version of GNU M4 (most likely 1.6) may treat the -dV in a + position-dependent manner. Keep it as the first argument so that all + files are traced. + See the thread starting at + + for details. */ + { + int i = 0; + argv[i++] = m4; + argv[i++] = "-I"; + argv[i++] = pkgdatadir; + if (trace_flag & trace_m4) + argv[i++] = "-dV"; + argv[i++] = full_m4sugar; + argv[i++] = "-"; + argv[i++] = full_m4bison; + argv[i++] = full_skeleton; + argv[i++] = NULL; + } + /* When POSIXLY_CORRECT is set, some future versions of GNU M4 (most likely + 2.0) may drop some of the GNU extensions that Bison's skeletons depend + upon. So that the next release of Bison is forward compatible with those + future versions of GNU M4, we unset POSIXLY_CORRECT here. + + FIXME: A user might set POSIXLY_CORRECT to affect processes run from + macros like m4_syscmd in a custom skeleton. For now, Bison makes no + promises about the behavior of custom skeletons, so this scenario is not a + concern. However, we eventually want to eliminate this shortcoming. The + next release of GNU M4 (1.4.12 or 1.6) will accept the -g command-line + option as a no-op, and later releases will accept it to indicate that + POSIXLY_CORRECT should be ignored. Once the GNU M4 versions that accept + -g are pervasive, Bison should use -g instead of unsetting + POSIXLY_CORRECT. + + See the thread starting at + + for details. */ + unsetenv ("POSIXLY_CORRECT"); init_subpipe (); pid = create_subpipe (argv, filter_fd); - free (full_m4bison); free (full_m4sugar); + free (full_m4bison); free (full_skeleton); out = fdopen (filter_fd[0], "w"); if (! out) error (EXIT_FAILURE, get_errno (), "fdopen"); - - /* Output the definitions of all the muscles. */ - fputs ("m4_init()\n", out); - - user_actions_output (out); - merger_output (out); - token_definitions_output (out); - symbol_code_props_output (out, "destructors", &symbol_destructor_get); - symbol_code_props_output (out, "printers", &symbol_printer_get); - - muscles_m4_output (out); + muscles_output (out); xfclose (out); /* Read and process m4's output. */