X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b4afb6bbe51c7355a2e3efb19c16f72cc36a23d3..2073702c3762a8e61ec1b7401ef422ec3fa8b7ff:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 928a5408..52808c03 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1,4 +1,4 @@ -/* Input parser for bison +/* Input parser for Bison Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -22,7 +22,6 @@ #include "system.h" #include "quotearg.h" -#include "quote.h" #include "getargs.h" #include "files.h" #include "symtab.h" @@ -70,13 +69,11 @@ prologue_augment (const char *prologue, location_t location) struct obstack *oout = !typed ? &pre_prologue_obstack : &post_prologue_obstack; - if (!no_lines_flag) - { - obstack_fgrow2 (oout, muscle_find ("linef"), - location.first_line, - quotearg_style (c_quoting_style, - muscle_find ("filename"))); - } + obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", + location.start.line); + MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, + location.start.file)); + obstack_sgrow (oout, "]])[\n"); obstack_sgrow (oout, prologue); } @@ -88,32 +85,32 @@ prologue_augment (const char *prologue, location_t location) `----------------------*/ void -epilogue_set (const char *epilogue, location_t location) +epilogue_augment (const char *epilogue, location_t location) { - if (!no_lines_flag) - { - obstack_fgrow2 (&muscle_obstack, muscle_find ("linef"), - location.first_line, - quotearg_style (c_quoting_style, - muscle_find ("filename"))); - } + char *extension = NULL; + obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", + location.start.line); + MUSCLE_OBSTACK_SGROW (&muscle_obstack, + quotearg_style (c_quoting_style, location.start.file)); + obstack_sgrow (&muscle_obstack, "]])[\n"); obstack_sgrow (&muscle_obstack, epilogue); obstack_1grow (&muscle_obstack, 0); - muscle_insert ("epilogue", obstack_finish (&muscle_obstack)); + extension = obstack_finish (&muscle_obstack); + muscle_grow ("epilogue", extension, ""); + obstack_free (&muscle_obstack, extension); } - /*-------------------------------------------------------------------. +/*-------------------------------------------------------------------. | Return the merger index for a merging function named NAME, whose | | arguments have type TYPE. Records the function, if new, in | -| merger_list. | +| MERGER_LIST. | `-------------------------------------------------------------------*/ static int -get_merge_function (const char* name, const char* type, - location_t loc) +get_merge_function (struniq_t name, struniq_t type, location_t loc) { merger_list *syms; merger_list head; @@ -123,22 +120,22 @@ get_merge_function (const char* name, const char* type, return 0; if (type == NULL) - type = ""; + type = struniq_new (""); head.next = merge_functions; for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1) - if (strcmp (name, syms->next->name) == 0) + if (STRUNIQ_EQ (name, syms->next->name)) break; if (syms->next == NULL) { syms->next = XMALLOC (merger_list, 1); - syms->next->name = xstrdup (name); - syms->next->type = xstrdup (type); + syms->next->name = struniq_new (name); + syms->next->type = struniq_new (type); syms->next->next = NULL; merge_functions = head.next; } - else if (strcmp (type, syms->next->type) != 0) - warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"), + else if (!STRUNIQ_EQ (type, syms->next->type)) + warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"), name, type, syms->next->type); return n; } @@ -263,15 +260,15 @@ grammar_current_rule_check (void) if (first_rhs) { const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : ""; - if (strcmp (lhs_type, rhs_type)) - complain_at (current_rule->location, - _("type clash (`%s' `%s') on default action"), - lhs_type, rhs_type); + if (!STRUNIQ_EQ (lhs_type, rhs_type)) + warn_at (current_rule->location, + _("type clash on default action: <%s> != <%s>"), + lhs_type, rhs_type); } /* Warn if there is no default for $$ but we need one. */ else - complain_at (current_rule->location, - _("empty rule for typed nonterminal, and no action")); + warn_at (current_rule->location, + _("empty rule for typed nonterminal, and no action")); } @@ -364,7 +361,7 @@ grammar_current_rule_dprec_set (int dprec, location_t location) rule. */ void -grammar_current_rule_merge_set (const char* name, location_t location) +grammar_current_rule_merge_set (struniq_t name, location_t location) { if (! glr_parser) warn_at (location, _("%s affects only GLR parsers"), "%merge"); @@ -456,7 +453,8 @@ packgram (void) p = p->next; } - assert (itemno == nritems); + if (itemno != nritems) + abort (); if (trace_flag & trace_sets) ritem_print (stderr); @@ -472,8 +470,6 @@ packgram (void) void reader (void) { - gram_control_t gram_control; - /* Initialize the symbol table. */ symbols_new (); @@ -497,18 +493,18 @@ reader (void) obstack_init (&pre_prologue_obstack); obstack_init (&post_prologue_obstack); - finput = xfopen (infile, "r"); + finput = xfopen (grammar_file, "r"); gram_in = finput; gram__flex_debug = trace_flag & trace_scan; gram_debug = trace_flag & trace_parse; scanner_initialize (); - gram_parse (&gram_control); + gram_parse (); /* If something went wrong during the parsing, don't try to continue. */ if (complaint_issued) - exit (EXIT_FAILURE); + return; /* Grammar has been read. Do some checking */ if (nrules == 0) @@ -543,11 +539,8 @@ reader (void) grammar = p; } - if (SYMBOL_NUMBER_MAX < nsyms) - fatal (_("too many symbols (tokens plus nonterminals); maximum %d"), - SYMBOL_NUMBER_MAX); - - assert (nsyms == ntokens + nvars); + if (! (nsyms <= SYMBOL_NUMBER_MAX && nsyms == ntokens + nvars)) + abort (); xfclose (finput);