X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0ce615753edfd7d1f8f1fe8670d4354b3d59d049..06cb07d517e067fced1e6ca1ea8d432bc5a4d728:/src/output.c diff --git a/src/output.c b/src/output.c index a06698ce..86d9728b 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, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000-2010 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -24,15 +24,16 @@ #include #include #include +#include #include -#include #include +#include #include "complain.h" #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" #include "output.h" #include "reader.h" #include "scan-code.h" /* max_left_semantic_context */ @@ -40,6 +41,7 @@ #include "symtab.h" #include "tables.h" +# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) static struct obstack format_obstack; @@ -469,35 +471,20 @@ token_definitions_output (FILE *out) { symbol *sym = symbols[i]; int number = sym->user_token_number; - - /* At this stage, if there are literal aliases, they are part of - SYMBOLS, so we should not find symbols which are the aliases - here. */ - aver (number != USER_NUMBER_ALIAS); - - /* Skip error token. */ - if (sym == errtoken) - continue; - - /* If this string has an alias, then it is necessarily the alias - which is to be output. */ - if (sym->alias) - sym = sym->alias; - - /* Don't output literal chars or strings (when defined only as a - string). Note that must be done after the alias resolution: - think about `%token 'f' "f"'. */ - if (sym->tag[0] == '\'' || sym->tag[0] == '\"') - continue; - - /* Don't #define nonliteral tokens whose names contain periods - or '$' (as does the default value of the EOF token). */ - if (strchr (sym->tag, '.') || strchr (sym->tag, '$')) - continue; - - fprintf (out, "%s[[[%s]], %d]", - sep, sym->tag, number); - sep = ",\n"; + uniqstr id = symbol_id_get (sym); + + /* At this stage, if there are literal string aliases, they are + part of SYMBOLS, so we should not find their aliased symbols + here. */ + aver (number != USER_NUMBER_HAS_STRING_ALIAS); + + /* Skip error token and tokens without identifier. */ + if (sym != errtoken && id) + { + fprintf (out, "%s[[[%s]], %d]", + sep, id, number); + sep = ",\n"; + } } fputs ("])\n\n", out); } @@ -577,7 +564,7 @@ output_skeleton (void) { FILE *in; int filter_fd[2]; - char const *argv[9]; + char const *argv[10]; pid_t pid; /* Compute the names of the package data dir and skeleton files. */ @@ -628,6 +615,19 @@ output_skeleton (void) { 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) @@ -637,28 +637,12 @@ output_skeleton (void) argv[i++] = full_m4bison; argv[i++] = full_skeleton; argv[i++] = NULL; + aver (i <= ARRAY_CARDINALITY (argv)); } - /* 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); + /* The ugly cast is because gnulib gets the const-ness wrong. */ + pid = create_pipe_bidi ("m4", m4, (char **)(void*)argv, false, true, + true, filter_fd); free (full_m4sugar); free (full_m4bison); free (full_skeleton); @@ -666,7 +650,7 @@ output_skeleton (void) if (trace_flag & trace_muscles) muscles_output (stderr); { - FILE *out = fdopen (filter_fd[0], "w"); + FILE *out = fdopen (filter_fd[1], "w"); if (! out) error (EXIT_FAILURE, get_errno (), "fdopen"); @@ -676,14 +660,17 @@ 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"); + in = fdopen (filter_fd[0], "r"); if (! in) error (EXIT_FAILURE, get_errno (), "fdopen"); scan_skel (in); + /* scan_skel should have read all of M4's output. Otherwise, when we + close the pipe, we risk letting M4 report a broken-pipe to the + Bison user. */ + aver (feof (in)); xfclose (in); - reap_subpipe (pid, m4); + wait_subprocess (pid, "m4", false, false, true, true, NULL); timevar_pop (TV_M4); } @@ -702,7 +689,6 @@ prepare (void) /* Flags. */ MUSCLE_INSERT_BOOL ("defines_flag", defines_flag); MUSCLE_INSERT_BOOL ("glr_flag", glr_parser); - MUSCLE_INSERT_BOOL ("locations_flag", locations_flag); MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser); MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag); MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen);