X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d782395d52519fabb2cac3bd479246cc6de7efa8..1266b636740f0c6719d8cc11a5d569084fa37009:/src/output.c diff --git a/src/output.c b/src/output.c index 6cdc17bc..759848f7 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-2009 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -21,6 +21,7 @@ #include #include "system.h" +#include #include #include #include @@ -40,6 +41,7 @@ #include "symtab.h" #include "tables.h" +# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) static struct obstack format_obstack; @@ -156,9 +158,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 +177,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. */ @@ -468,13 +475,10 @@ output_skeleton (void) FILE *in; FILE *out; int filter_fd[2]; - char const *argv[7]; + char const *argv[10]; 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; @@ -482,7 +486,7 @@ output_skeleton (void) char *full_skeleton; char const *p; char const *m4 = (p = getenv ("M4")) ? p : M4; - char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR; + char const *pkgdatadir = compute_pkgdatadir (); size_t skeleton_size = strlen (skeleton) + 1; size_t pkgdatadirlen = strlen (pkgdatadir); while (pkgdatadirlen && pkgdatadir[pkgdatadirlen - 1] == '/') @@ -500,26 +504,57 @@ 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; + + /* When POSIXLY_CORRECT is set, GNU M4 1.6 and later disable GNU + extensions, which Bison's skeletons depend on. With older M4, + it has no effect. M4 1.4.12 added a -g/--gnu command-line + option to make it explicit that a program wants GNU M4 + extensions even when POSIXLY_CORRECT is set. + + See the thread starting at + + for details. */ + if (*M4_GNU_OPTION) + argv[i++] = M4_GNU_OPTION; + + 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; + assert (i <= ARRAY_CARDINALITY (argv)); + } 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"); @@ -571,7 +606,6 @@ prepare (void) MUSCLE_INSERT_BOOL ("glr_flag", glr_parser); MUSCLE_INSERT_BOOL ("locations_flag", locations_flag); MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser); - MUSCLE_INSERT_BOOL ("pure_flag", pure_parser); MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag); MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen); MUSCLE_INSERT_BOOL ("use_push_for_pull_flag", use_push_for_pull_flag); @@ -602,12 +636,10 @@ prepare (void) /* 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); + MUSCLE_INSERT_STRING_RAW ("pkgdatadir", compute_pkgdatadir ()); } } @@ -633,3 +665,10 @@ output (void) obstack_free (&format_obstack, NULL); } + +char const * +compute_pkgdatadir (void) +{ + char const *pkgdatadir = getenv ("BISON_PKGDATADIR"); + return pkgdatadir ? pkgdatadir : PKGDATADIR; +}