X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4e83ea15f725cb1982f7ca3bedb919d5182434d4..c4bd5bf7c5b63334e8bb67af294800d4aec0fe06:/src/output.c?ds=sidebyside diff --git a/src/output.c b/src/output.c index 89bbdf60..6b62ccd6 100644 --- a/src/output.c +++ b/src/output.c @@ -23,6 +23,7 @@ #include #include "system.h" +#include #include #include #include @@ -36,6 +37,7 @@ #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" @@ -175,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); @@ -236,7 +236,7 @@ prepare_rules (void) /* Merger-function index (GLR). */ merger[r] = rules[r].merger; } - assert (i == nritems); + aver (i == nritems); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems); muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules); @@ -289,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); } /*--------------------------------------. @@ -347,7 +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. */ - assert (number != USER_NUMBER_ALIAS); + aver (number != USER_NUMBER_ALIAS); /* Skip error token. */ if (sym == errtoken) @@ -389,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]; @@ -398,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); @@ -422,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]; @@ -431,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); @@ -447,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); @@ -501,7 +499,7 @@ output_skeleton (void) FILE *in; FILE *out; int filter_fd[2]; - char const *argv[5]; + char const *argv[7]; pid_t pid; /* Compute the names of the package data dir and skeleton file. @@ -509,7 +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_m4bison; char *full_skeleton; char const *p; char const *m4 = (p = getenv ("M4")) ? p : M4; @@ -525,23 +525,28 @@ output_skeleton (void) full_skeleton[pkgdatadirlen] = '/'; strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar); full_m4sugar = 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")); /* Create an m4 subprocess connected to us via two pipes. */ if (trace_flag & trace_tools) - fprintf (stderr, "running: %s %s - %s\n", - m4, full_m4sugar, full_skeleton); + fprintf (stderr, "running: %s %s - %s %s\n", + m4, full_m4sugar, full_m4bison, full_skeleton); argv[0] = m4; argv[1] = full_m4sugar; argv[2] = "-"; - argv[3] = full_skeleton; - argv[4] = NULL; + argv[3] = full_m4bison; + argv[4] = full_skeleton; + 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_skeleton); @@ -582,15 +587,22 @@ 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); + #define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "") DEFINE (dir_prefix); DEFINE (parser_file_name);