X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/35f61cb998a30de542f554cd8c47a445af0ef886..e89a22bfab22e4d2ee73be49dcb66b51f8d0e892:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 35e838a7..529cebe9 100644 --- a/src/reader.c +++ b/src/reader.c @@ -34,13 +34,11 @@ #include "reader.h" #include "conflicts.h" -/* Number of slots allocated (but not necessarily used yet) in `rline' */ -static int rline_allocated; - typedef struct symbol_list { struct symbol_list *next; bucket *sym; + int line; bucket *ruleprec; } symbol_list; @@ -64,6 +62,19 @@ static int lastprec; static bucket *errtoken; static bucket *undeftoken; + + +static symbol_list * +symbol_list_new (bucket *sym) +{ + symbol_list *res = XMALLOC (symbol_list, 1); + res->next = NULL; + res->sym = sym; + res->line = lineno; + res->ruleprec = NULL; + return res; +} + /*===================\ @@ -121,7 +132,7 @@ read_signed_integer (FILE *stream) `--------------------------------------------------------------*/ static char * -get_type_name (int n, symbol_list * rule) +get_type_name (int n, symbol_list *rule) { int i; symbol_list *rp; @@ -293,13 +304,15 @@ copy_comment (FILE *fin, struct obstack *oout) /*-----------------------------------------------------------------. | FIN is pointing to a location (i.e., a `@'). Output to OOUT a | | reference to this location. STACK_OFFSET is the number of values | -| in the current rule so far, which says where to find `$0' with | +| in the current rule so far, which says where to find `@0' with | | respect to the top of the stack. | `-----------------------------------------------------------------*/ static inline void -copy_at (FILE *fin, struct obstack *oout, int stack_offset) +copy_at (FILE *fin, struct obstack *oout, + struct symbol_list *rule, int stack_offset) { + symbol_list *rp; int c; c = getc (fin); @@ -310,11 +323,25 @@ copy_at (FILE *fin, struct obstack *oout, int stack_offset) } else if (isdigit (c) || c == '-') { - int n; + int n, i; ungetc (c, fin); n = read_signed_integer (fin); + rp = rule; + i = 0; + + while (i < n) + { + rp = rp->next; + if (rp == NULL) + { + complain (_("invalid @ value")); + return; + } + i++; + } + obstack_fgrow1 (oout, "yylsp[%d]", n - stack_offset); locations_flag = 1; } @@ -539,7 +566,8 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not) else { complain (_("`%s' is invalid in %s"), - token_buffer, (what_is == token_sym) ? "%token" : "%nterm"); + token_buffer, + (what_is == token_sym) ? "%token" : "%nterm"); skip_to_char ('%'); } } @@ -1006,10 +1034,10 @@ read_declarations (void) case tok_stropt: case tok_intopt: case tok_obsolete: - case tok_illegal: abort (); break; + case tok_illegal: default: complain (_("unrecognized: %s"), token_buffer); skip_to_char ('%'); @@ -1091,7 +1119,7 @@ copy_action (symbol_list *rule, int stack_offset) case '@': copy_at (finput, &action_obstack, - stack_offset); + rule, stack_offset); break; case EOF: @@ -1113,7 +1141,13 @@ copy_action (symbol_list *rule, int stack_offset) } } - obstack_sgrow (&action_obstack, ";\n break;}"); + /* As a Bison extension, add the ending semicolon. Since some Yacc + don't do that, help people using bison as a Yacc finding their + missing semicolons. */ + if (yacc_flag) + obstack_sgrow (&action_obstack, "}\n break;"); + else + obstack_sgrow (&action_obstack, ";\n break;}"); } /*-------------------------------------------------------------------. @@ -1185,7 +1219,7 @@ copy_guard (symbol_list *rule, int stack_offset) break; case '@': - copy_at (finput, &guard_obstack, stack_offset); + copy_at (finput, &guard_obstack, rule, stack_offset); break; case EOF: @@ -1357,8 +1391,7 @@ readgram (void) nrules++; nitems++; - p = XCALLOC (symbol_list, 1); - p->sym = lhs; + p = symbol_list_new (lhs); crule1 = p1; if (p1) @@ -1420,27 +1453,27 @@ readgram (void) non-terminal. */ if (action_flag) { - bucket *sdummy; - /* Since the action was written out with this rule's number, we must give the new rule this number by inserting the new rule before it. */ /* Make a dummy nonterminal, a gensym. */ - sdummy = gensym (); + bucket *sdummy = gensym (); - /* Make a new rule, whose body is empty, - before the current one, so that the action - just read can belong to it. */ + /* Make a new rule, whose body is empty, before the + current one, so that the action just read can + belong to it. */ nrules++; nitems++; - p = XCALLOC (symbol_list, 1); + p = symbol_list_new (sdummy); + /* Attach its lineno to that of the host rule. */ + p->line = crule->line; if (crule1) crule1->next = p; else grammar = p; - p->sym = sdummy; - crule1 = XCALLOC (symbol_list, 1); + /* End of the rule. */ + crule1 = symbol_list_new (NULL); crule1->next = crule; p->next = crule1; @@ -1448,8 +1481,7 @@ readgram (void) /* Insert the dummy generated by that rule into this rule. */ nitems++; - p = XCALLOC (symbol_list, 1); - p->sym = sdummy; + p = symbol_list_new (sdummy); p1->next = p; p1 = p; @@ -1459,8 +1491,7 @@ readgram (void) if (t == tok_identifier) { nitems++; - p = XCALLOC (symbol_list, 1); - p->sym = symval; + p = symbol_list_new (symval); p1->next = p; p1 = p; } @@ -1474,7 +1505,7 @@ readgram (void) } /* end of read rhs of rule */ /* Put an empty link in the list to mark the end of this rule */ - p = XCALLOC (symbol_list, 1); + p = symbol_list_new (NULL); p1->next = p; p1 = p; @@ -1855,8 +1886,6 @@ packgram (void) int ruleno; symbol_list *p; - bucket *ruleprec; - ritem = XCALLOC (short, nitems + 1); rule_table = XCALLOC (rule_t, nrules) - 1; @@ -1866,10 +1895,11 @@ packgram (void) p = grammar; while (p) { + bucket *ruleprec = p->ruleprec; rule_table[ruleno].lhs = p->sym->value; rule_table[ruleno].rhs = itemno; - rule_table[ruleno].line = p->sym->line; - ruleprec = p->ruleprec; + rule_table[ruleno].line = p->line; + rule_table[ruleno].useful = TRUE; p = p->next; while (p && p->sym) @@ -1903,6 +1933,9 @@ packgram (void) } ritem[itemno] = 0; + + if (trace_flag) + ritem_print (stderr); } /*-------------------------------------------------------------------.