X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3953ed882a03f0de8cbcc5543ac3cdf1bf5e3093..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/output.c?ds=sidebyside diff --git a/src/output.c b/src/output.c index 2593ecc9..ef7683ec 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 - Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -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" @@ -43,9 +45,6 @@ static struct obstack format_obstack; -bool error_verbose = false; - - /*-------------------------------------------------------------------. | Create a function NAME which associates to the muscle NAME the | @@ -178,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); @@ -239,8 +236,7 @@ prepare_rules (void) /* Merger-function index (GLR). */ merger[r] = rules[r].merger; } - if (i != nritems) - abort (); + aver (i == nritems); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems); muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules); @@ -293,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); } /*--------------------------------------. @@ -351,8 +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. */ - if (number == USER_NUMBER_ALIAS) - abort (); + aver (number != USER_NUMBER_ALIAS); /* Skip error token. */ if (sym == errtoken) @@ -382,68 +373,41 @@ token_definitions_output (FILE *out) } -/*---------------------------------------. -| Output the symbol destructors to OUT. | -`---------------------------------------*/ +/*---------------------------------------------------. +| Output the symbol destructors or printers to OUT. | +`---------------------------------------------------*/ static void -symbol_destructors_output (FILE *out) +symbol_code_props_output (FILE *out, char const *what, + code_props const *(*get)(symbol const *)) { int i; char const *sep = ""; - fputs ("m4_define([b4_symbol_destructors], \n[", out); + fputs ("m4_define([b4_symbol_", out); + fputs (what, out); + fputs ("], \n[", out); for (i = 0; i < nsyms; ++i) - if (symbols[i]->destructor) - { - symbol *sym = symbols[i]; - - /* Filename, lineno, - Symbol-name, Symbol-number, - 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, sym->tag); - fprintf (out, ", %d, [[%s]]", sym->number, sym->destructor); - if (sym->type_name) - fprintf (out, ", [[%s]]", sym->type_name); - fputc (']', out); - } - fputs ("])\n\n", out); -} - - -/*------------------------------------. -| Output the symbol printers to OUT. | -`------------------------------------*/ - -static void -symbol_printers_output (FILE *out) -{ - int i; - char const *sep = ""; - - fputs ("m4_define([b4_symbol_printers], \n[", out); - for (i = 0; i < nsyms; ++i) - if (symbols[i]->printer) - { - symbol *sym = symbols[i]; - - /* Filename, lineno, - Symbol-name, Symbol-number, - 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, sym->tag); - fprintf (out, ", %d, [[%s]]", sym->number, sym->printer); - if (sym->type_name) - fprintf (out, ", [[%s]]", sym->type_name); - fputc (']', out); - } + { + symbol *sym = symbols[i]; + char const *code = (*get) (sym)->code; + if (code) + { + location loc = (*get) (sym)->location; + /* Filename, lineno, + Symbol-name, Symbol-number, + code, optional typename. */ + fprintf (out, "%s[", sep); + sep = ",\n"; + escaped_output (out, loc.start.file); + fprintf (out, ", %d, ", loc.start.line); + escaped_output (out, sym->tag); + fprintf (out, ", %d, [[%s]]", sym->number, code); + if (sym->type_name) + fprintf (out, ", [[%s]]", sym->type_name); + fputc (']', out); + } + } fputs ("])\n\n", out); } @@ -452,7 +416,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); @@ -506,7 +470,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. @@ -514,7 +478,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; @@ -526,27 +492,35 @@ output_skeleton (void) full_skeleton = xmalloc (pkgdatadirlen + 1 + (skeleton_size < sizeof m4sugar ? sizeof m4sugar : skeleton_size)); - strcpy (full_skeleton, pkgdatadir); + strncpy (full_skeleton, pkgdatadir, pkgdatadirlen); full_skeleton[pkgdatadirlen] = '/'; strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar); full_m4sugar = xstrdup (full_skeleton); - strcpy (full_skeleton + pkgdatadirlen + 1, skeleton); + strcpy (full_skeleton + pkgdatadirlen + 1, m4bison); + full_m4bison = xstrdup (full_skeleton); + if (strchr (skeleton, '/')) + strcpy (full_skeleton, skeleton); + else + 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); @@ -561,13 +535,10 @@ output_skeleton (void) user_actions_output (out); merger_output (out); token_definitions_output (out); - symbol_destructors_output (out); - symbol_printers_output (out); + symbol_code_props_output (out, "destructors", &symbol_destructor_get); + symbol_code_props_output (out, "printers", &symbol_printer_get); muscles_m4_output (out); - - fputs ("m4_wrap([m4_divert_pop(0)])\n", out); - fputs ("m4_divert_push(0)dnl\n", out); xfclose (out); /* Read and process m4's output. */ @@ -586,16 +557,36 @@ output_skeleton (void) static void prepare (void) { + /* BISON_USE_PUSH_FOR_PULL is for the test suite and should not be documented + for the user. */ + char const *use_push_for_pull_env = getenv ("BISON_USE_PUSH_FOR_PULL"); + bool use_push_for_pull_flag = false; + if (use_push_for_pull_env != NULL + && use_push_for_pull_env[0] != '\0' + && 0 != strcmp (use_push_for_pull_env, "0")) + use_push_for_pull_flag = true; + /* 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 ("pull_flag", pull_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 ("use_push_for_pull_flag", use_push_for_pull_flag); + 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); + + MUSCLE_INSERT_STRING ("file_name_all_but_ext", all_but_ext); + #define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "") DEFINE (dir_prefix); DEFINE (parser_file_name); @@ -607,26 +598,20 @@ prepare (void) DEFINE (spec_verbose_file); #undef DEFINE - /* User Code. */ - obstack_1grow (&pre_prologue_obstack, 0); - obstack_1grow (&post_prologue_obstack, 0); - muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack)); - muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack)); - - /* Find the right skeleton file. */ - if (!skeleton) - { - if (glr_parser || nondeterministic_parser) - skeleton = "glr.c"; - else - skeleton = "yacc.c"; - } + /* Find the right skeleton file, and add muscles about the skeletons. */ + if (skeleton) + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + else + skeleton = language->skeleton; - /* About the skeletons. */ + /* About the skeletons. */ { char const *pkgdatadir = getenv ("BISON_PKGDATADIR"); - MUSCLE_INSERT_STRING ("pkgdatadir", pkgdatadir ? pkgdatadir : PKGDATADIR); - MUSCLE_INSERT_C_STRING ("skeleton", skeleton); + /* 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); } } @@ -651,6 +636,4 @@ output (void) output_skeleton (); obstack_free (&format_obstack, NULL); - obstack_free (&pre_prologue_obstack, NULL); - obstack_free (&post_prologue_obstack, NULL); }