X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a5d5099417229a48aa18477073266e9aa3b77a8e..3e6656f9ab66ae7e629f8e5d5b41810bf070f09d:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 86f3adf4..64601e34 100644 --- a/src/reader.c +++ b/src/reader.c @@ -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,10 @@ 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.first_line); + MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, location.file)); + obstack_sgrow (oout, "]])[\n"); obstack_sgrow (oout, prologue); } @@ -90,13 +86,11 @@ prologue_augment (const char *prologue, location_t location) void epilogue_set (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"))); - } + obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", + location.first_line); + MUSCLE_OBSTACK_SGROW (&muscle_obstack, + quotearg_style (c_quoting_style, location.file)); + obstack_sgrow (&muscle_obstack, "]])[\n"); obstack_sgrow (&muscle_obstack, epilogue); obstack_1grow (&muscle_obstack, 0); muscle_insert ("epilogue", obstack_finish (&muscle_obstack)); @@ -105,7 +99,7 @@ epilogue_set (const char *epilogue, location_t location) - /*-------------------------------------------------------------------. +/*-------------------------------------------------------------------. | Return the merger index for a merging function named NAME, whose | | arguments have type TYPE. Records the function, if new, in | | merger_list. | @@ -132,13 +126,13 @@ get_merge_function (const char* name, const char* type, if (syms->next == NULL) { syms->next = XMALLOC (merger_list, 1); - syms->next->name = strdup (name); - syms->next->type = strdup (type); + syms->next->name = xstrdup (name); + syms->next->type = xstrdup (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'"), + warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"), name, type, syms->next->type); return n; } @@ -246,31 +240,32 @@ static void grammar_current_rule_check (void) { symbol_t *lhs = current_rule->sym; + char const *lhs_type = lhs->type_name; symbol_t *first_rhs = current_rule->next->sym; /* If there is an action, then there is nothing we can do: the user - is allowed to shoot in her foot. */ + is allowed to shoot herself in the foot. */ if (current_rule->action) return; - /* If $$ is being set in default way, report if any type mismatch. - */ + /* Don't worry about the default action if $$ is untyped, since $$'s + value can't be used. */ + if (! lhs_type) + return; + + /* If $$ is being set in default way, report if any type mismatch. */ if (first_rhs) { - const char *lhs_type = lhs->type_name ? lhs->type_name : ""; 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"), + _("type clash on default action: <%s> != <%s>"), lhs_type, rhs_type); } /* Warn if there is no default for $$ but we need one. */ else - { - if (lhs->type_name) - complain_at (current_rule->location, - _("empty rule for typed nonterminal, and no action")); - } + complain_at (current_rule->location, + _("empty rule for typed nonterminal, and no action")); } @@ -340,7 +335,7 @@ void grammar_current_rule_prec_set (symbol_t *precsym, location_t location) { if (current_rule->ruleprec) - complain_at (location, _("two @prec's in a row")); + complain_at (location, _("only one %s allowed per rule"), "%prec"); current_rule->ruleprec = precsym; } @@ -350,11 +345,12 @@ void grammar_current_rule_dprec_set (int dprec, location_t location) { if (! glr_parser) - warn_at (location, _("%%dprec affects only GLR parsers")); + warn_at (location, _("%s affects only GLR parsers"), "%dprec"); if (dprec <= 0) - complain_at (location, _("%%dprec must be followed by positive number")); + complain_at (location, + _("%s must be followed by positive number"), "%dprec"); else if (current_rule->dprec != 0) - complain_at (location, _("only one %%dprec allowed per rule")); + complain_at (location, _("only one %s allowed per rule"), "%dprec"); current_rule->dprec = dprec; } @@ -365,9 +361,9 @@ void grammar_current_rule_merge_set (const char* name, location_t location) { if (! glr_parser) - warn_at (location, _("%%merge affects only GLR parsers")); + warn_at (location, _("%s affects only GLR parsers"), "%merge"); if (current_rule->merger != 0) - complain_at (location, _("only one %%merge allowed per rule")); + complain_at (location, _("only one %s allowed per rule"), "%merge"); current_rule->merger = get_merge_function (name, current_rule->sym->type_name, location); } @@ -406,11 +402,11 @@ static void packgram (void) { unsigned int itemno = 0; - rule_number_t ruleno = 1; + rule_number_t ruleno = 0; symbol_list_t *p = grammar; ritem = XCALLOC (item_number_t, nritems); - rules = XCALLOC (rule_t, nrules) - 1; + rules = XCALLOC (rule_t, nrules); while (p) { @@ -420,7 +416,7 @@ packgram (void) rules[ruleno].lhs = p->sym; rules[ruleno].rhs = ritem + itemno; rules[ruleno].location = p->location; - rules[ruleno].useful = TRUE; + rules[ruleno].useful = true; rules[ruleno].action = p->action; rules[ruleno].action_location = p->action_location; rules[ruleno].dprec = p->dprec; @@ -447,7 +443,7 @@ packgram (void) rules[ruleno].precsym = ruleprec; rules[ruleno].prec = ruleprec; } - ritem[itemno++] = -ruleno; + ritem[itemno++] = rule_number_as_item_number (ruleno); ++ruleno; if (p) @@ -456,7 +452,7 @@ packgram (void) assert (itemno == nritems); - if (trace_flag) + if (trace_flag & trace_sets) ritem_print (stderr); } @@ -475,10 +471,10 @@ reader (void) /* Initialize the symbol table. */ symbols_new (); - /* Construct the axiom symbol. */ - axiom = symbol_get ("$axiom", empty_location); - axiom->class = nterm_sym; - axiom->number = nvars++; + /* Construct the accept symbol. */ + accept = symbol_get ("$accept", empty_location); + accept->class = nterm_sym; + accept->number = nvars++; /* Construct the error token */ errtoken = symbol_get ("error", empty_location); @@ -487,7 +483,7 @@ reader (void) /* Construct a token that represents all undefined literal tokens. It is always token number 2. */ - undeftoken = symbol_get ("$undefined.", empty_location); + undeftoken = symbol_get ("$undefined", empty_location); undeftoken->class = token_sym; undeftoken->number = ntokens++; @@ -498,15 +494,15 @@ reader (void) finput = xfopen (infile, "r"); gram_in = finput; - gram_debug = !!getenv ("parse"); - gram__flex_debug = !!getenv ("scan"); + gram__flex_debug = trace_flag & trace_scan; + gram_debug = trace_flag & trace_parse; scanner_initialize (); gram_parse (&gram_control); /* If something went wrong during the parsing, don't try to continue. */ - if (complain_message_count) - exit (1); + if (complaint_issued) + return; /* Grammar has been read. Do some checking */ if (nrules == 0) @@ -515,25 +511,25 @@ reader (void) /* Report any undefined symbols and consider them nonterminals. */ symbols_check_defined (); - /* If the user did not define her EOFTOKEN, do it now. */ - if (!eoftoken) + /* If the user did not define her ENDTOKEN, do it now. */ + if (!endtoken) { - eoftoken = symbol_get ("$", empty_location); - eoftoken->class = token_sym; - eoftoken->number = 0; + endtoken = symbol_get ("$end", empty_location); + endtoken->class = token_sym; + endtoken->number = 0; /* Value specified by POSIX. */ - eoftoken->user_token_number = 0; + endtoken->user_token_number = 0; } /* Insert the initial rule, which line is that of the first rule (not that of the start symbol): - axiom: %start EOF. */ + accept: %start EOF. */ { - symbol_list_t *p = symbol_list_new (axiom, empty_location); + symbol_list_t *p = symbol_list_new (accept, empty_location); p->location = grammar->location; p->next = symbol_list_new (startsymbol, empty_location); - p->next->next = symbol_list_new (eoftoken, empty_location); + p->next->next = symbol_list_new (endtoken, empty_location); p->next->next->next = symbol_list_new (NULL, empty_location); p->next->next->next->next = grammar; nrules += 1; @@ -541,9 +537,9 @@ reader (void) grammar = p; } - if (nsyms > SHRT_MAX) + if (SYMBOL_NUMBER_MAX < nsyms) fatal (_("too many symbols (tokens plus nonterminals); maximum %d"), - SHRT_MAX); + SYMBOL_NUMBER_MAX); assert (nsyms == ntokens + nvars);