X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1cfe6375ce4302e7252d4eb5910a400f292ad1f2..3204049e31e71c30d0dddf7cae8738c289dbd104:/src/output.c diff --git a/src/output.c b/src/output.c index 043298bb..31bfd12d 100644 --- a/src/output.c +++ b/src/output.c @@ -143,6 +143,7 @@ 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 ("symbols_number", nsyms); MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); @@ -282,6 +283,73 @@ prepare_states (void) } +/*-------------------------------------------------------. +| Compare two symbols by type-name, and then by number. | +`-------------------------------------------------------*/ + +int +symbol_type_name_cmp (const symbol **lhs, const symbol **rhs) +{ + int res = UNIQSTR_CMP((*lhs)->type_name, (*rhs)->type_name); + if (res) + return res; + return (*lhs)->number - (*rhs)->number; +} + + +/*----------------------------------------------------------------. +| Return a (malloc'ed) table of the symbols sorted by type-name. | +`----------------------------------------------------------------*/ + +static symbol ** +symbols_by_type_name () +{ + typedef int (*qcmp_type) (const void *, const void *); + symbol **res = xmemdup (symbols, nsyms * sizeof *res); + qsort (res, nsyms, sizeof *res, (qcmp_type) &symbol_type_name_cmp); + return res; +} + + +/*------------------------------------------------------------------. +| Define b4_type_names, which is a list of (lists of the numbers of | +| symbols with same type-name). | +`------------------------------------------------------------------*/ + +static void +type_names_output (FILE *out) +{ + int i; + symbol **syms = symbols_by_type_name (); + fputs ("m4_define([b4_type_names],\n[", out); + for (i = 0; i < nsyms; /* nothing */) + { + // The index of the first symbol of the current type-name. + int i0 = i; + fputs (i ? ",\n[" : "[", out); + for (; i < nsyms && syms[i]->type_name == syms[i0]->type_name; ++i) + fprintf (out, "%s%d", i != i0 ? ", " : "", syms[i]->number); + fputs ("]", out); + } + fputs ("])\n\n", out); + free (syms); +} + + +/*-------------------------------------. +| The list of all the symbol numbers. | +`-------------------------------------*/ + +static void +symbol_numbers_output (FILE *out) +{ + int i; + fputs ("m4_define([b4_symbol_numbers],\n[", out); + for (i = 0; i < nsyms; ++i) + fprintf (out, "%s[%d]", i ? ", " : "", i); + fputs ("])\n\n", out); +} + /*---------------------------------. | Output the user actions to OUT. | @@ -304,9 +372,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) @@ -327,6 +395,60 @@ merger_output (FILE *out) fputs ("]])\n\n", out); } + +/*---------------------------------------. +| Output the symbol definitions to OUT. | +`---------------------------------------*/ + +static void +symbol_definitions_output (FILE *out) +{ + int i; + for (i = 0; i < nsyms; ++i) + { + symbol *sym = symbols[i]; + const char *key; + const char *value; + +#define SET_KEY(Entry) \ + obstack_fgrow2 (&format_obstack, "symbol(%d, %s)", i, Entry); \ + obstack_1grow (&format_obstack, 0); \ + key = obstack_finish (&format_obstack); + + // Whether the symbol has an identifier. + value = symbol_id_get (sym); + SET_KEY("has_id"); + MUSCLE_INSERT_INT (key, !!value); + + // Its identifier. + SET_KEY("id"); + MUSCLE_INSERT_STRING (key, value ? value : ""); + + // Its tag. Typically for documentation purpose. + SET_KEY("tag"); + MUSCLE_INSERT_STRING (key, sym->tag); + + SET_KEY("user_number"); + MUSCLE_INSERT_INT (key, sym->user_token_number); + + SET_KEY("is_token"); + MUSCLE_INSERT_INT (key, + i < ntokens && sym != errtoken && sym != undeftoken); + + SET_KEY("number"); + MUSCLE_INSERT_INT (key, sym->number); + + SET_KEY("has_type"); + MUSCLE_INSERT_INT (key, !!sym->type_name); + + SET_KEY("type"); + MUSCLE_INSERT_STRING (key, sym->type_name ? sym->type_name : ""); + +#undef SET_KEY + } +} + + /*--------------------------------------. | Output the tokens definition to OUT. | `--------------------------------------*/ @@ -462,6 +584,26 @@ 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); + merger_output (out); + symbol_code_props_output (out, "destructors", &symbol_destructor_get); + symbol_code_props_output (out, "printers", &symbol_printer_get); + symbol_definitions_output (out); + symbol_numbers_output (out); + token_definitions_output (out); + type_names_output (out); + user_actions_output (out); + // Must be last. + muscles_m4_output (out); +} /*---------------------------. | Call the skeleton parser. | @@ -471,15 +613,11 @@ static void 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; @@ -505,44 +643,73 @@ 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); - xfclose (out); + if (trace_flag & trace_muscles) + muscles_output (stderr); + { + FILE *out = fdopen (filter_fd[0], "w"); + if (! out) + error (EXIT_FAILURE, get_errno (), + "fdopen"); + muscles_output (out); + xfclose (out); + } /* Read and process m4's output. */ timevar_push (TV_M4);