X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/342b8b6e2156e923797745af2da2596e3086ccd5..e41dc70020f5101795c601729594de8661d616e2:/src/reader.c?ds=sidebyside diff --git a/src/reader.c b/src/reader.c index 69619358..5abb46ed 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1,5 +1,5 @@ /* Input parser for bison - Copyright 1984, 1986, 1989, 1992, 1998, 2000 + Copyright 1984, 1986, 1989, 1992, 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -724,7 +724,6 @@ token_buffer); } prev = t; - } } @@ -742,19 +741,30 @@ parse_union_decl (void) int c; int count = 0; struct obstack union_obstack; + const char *prologue = "\ +#ifndef YYSTYPE\n\ +typedef union"; + const char *epilogue = "\ + yystype;\n\ +# define YYSTYPE yystype\n\ +#endif\n"; if (typed) complain (_("multiple %s declarations"), "%union"); typed = 1; + /* FIXME: I'm worried: are you sure attrs_obstack is properly + filled? */ + /* I don't see any reasons to keep this line, because we should + create a special skeleton for this option. */ if (no_lines_flag) obstack_1grow (&attrs_obstack, '\n'); obstack_init (&union_obstack); obstack_sgrow (&union_obstack, "union"); if (defines_flag) - obstack_sgrow (&defines_obstack, "typedef union"); + obstack_sgrow (&defines_obstack, prologue); c = getc (finput); @@ -763,7 +773,7 @@ parse_union_decl (void) /* If C contains '/', it is output by copy_comment (). */ if (c != '/') { - obstack_1grow (&attrs_obstack, c); + obstack_1grow (&union_obstack, c); if (defines_flag) obstack_1grow (&defines_obstack, c); } @@ -789,7 +799,7 @@ parse_union_decl (void) if (count <= 0) { if (defines_flag) - obstack_sgrow (&defines_obstack, " YYSTYPE;\n"); + obstack_sgrow (&defines_obstack, epilogue); /* JF don't choke on trailing semi */ c = skip_white_space (); if (c != ';') @@ -850,7 +860,7 @@ parse_thong_decl (void) token_t token; struct bucket *symbol; char *typename = 0; - int usrtoknum; + int usrtoknum = SUNDEF; token = lex (); /* fetch typename or first token */ if (token == tok_typename) @@ -881,8 +891,6 @@ parse_thong_decl (void) usrtoknum = numval; token = lex (); /* okay, did number, now get literal */ } - else - usrtoknum = 0; /* process literal string token */ @@ -963,16 +971,13 @@ parse_skel_decl (void) static void read_declarations (void) { - int c; - int tok; - for (;;) { - c = skip_white_space (); + int c = skip_white_space (); if (c == '%') { - tok = parse_percent_token (); + token_t tok = parse_percent_token (); switch (tok) { @@ -1034,6 +1039,13 @@ read_declarations (void) case tok_noop: break; + case tok_stropt: + case tok_intopt: + case tok_obsolete: + case tok_illegal: + abort (); + break; + default: complain (_("unrecognized: %s"), token_buffer); skip_to_char ('%'); @@ -1239,20 +1251,6 @@ copy_guard (symbol_list *rule, int stack_offset) } -static void -record_rule_line (void) -{ - /* Record each rule's source line number in rline table. */ - - if (nrules >= rline_allocated) - { - rline_allocated = nrules * 2; - rline = XREALLOC (rline, short, rline_allocated); - } - rline[nrules] = lineno; -} - - /*-------------------------------------------------------------------. | Generate a dummy symbol, a nonterminal, whose name cannot conflict | | with the user's names. | @@ -1395,8 +1393,6 @@ readgram (void) nrules++; nitems++; - record_rule_line (); - p = XCALLOC (symbol_list, 1); p->sym = lhs; @@ -1474,7 +1470,6 @@ readgram (void) just read can belong to it. */ nrules++; nitems++; - record_rule_line (); p = XCALLOC (symbol_list, 1); if (crule1) crule1->next = p; @@ -1482,9 +1477,10 @@ readgram (void) grammar = p; p->sym = sdummy; crule1 = XCALLOC (symbol_list, 1); - p->next = crule1; crule1->next = crule; + p->next = crule1; + /* Insert the dummy generated by that rule into this rule. */ nitems++; @@ -1697,6 +1693,46 @@ output_token_defines (struct obstack *oout) } +/*------------------------------------------------------------------. +| Set TOKEN_TRANSLATIONS. Check that no two symbols share the same | +| number. | +`------------------------------------------------------------------*/ + +static void +token_translations_init (void) +{ + bucket *bp = NULL; + int i; + + token_translations = XCALLOC (short, max_user_token_number + 1); + + /* Initialize all entries for literal tokens to 2, the internal + token number for $undefined., which represents all invalid + inputs. */ + for (i = 0; i <= max_user_token_number; i++) + token_translations[i] = 2; + + for (bp = firstsymbol; bp; bp = bp->next) + { + /* Non-terminal? */ + if (bp->value >= ntokens) + continue; + /* A token string alias? */ + if (bp->user_token_number == SALIAS) + continue; + + assert (bp->user_token_number != SUNDEF); + + /* A token which translation has already been set? */ + if (token_translations[bp->user_token_number] != 2) + complain (_("tokens %s and %s both assigned number %d"), + tags[token_translations[bp->user_token_number]], + bp->tag, bp->user_token_number); + token_translations[bp->user_token_number] = bp->value; + } +} + + /*------------------------------------------------------------------. | Assign symbol numbers, and write definition of token names into | | FDEFINES. Set up vectors TAGS and SPREC of names and precedences | @@ -1708,18 +1744,19 @@ packsymbols (void) { bucket *bp = NULL; int tokno = 1; - int i, j; int last_user_token_number; static char DOLLAR[] = "$"; tags = XCALLOC (char *, nsyms + 1); - tags[0] = DOLLAR; user_toknums = XCALLOC (short, nsyms + 1); - user_toknums[0] = 0; sprec = XCALLOC (short, nsyms); sassoc = XCALLOC (short, nsyms); + /* The EOF token. */ + tags[0] = DOLLAR; + user_toknums[0] = 0; + max_user_token_number = 256; last_user_token_number = 256; @@ -1772,7 +1809,7 @@ packsymbols (void) if (bp->class == token_sym) { - if (!bp->user_token_number) + if (bp->user_token_number == SUNDEF) bp->user_token_number = ++last_user_token_number; if (bp->user_token_number > max_user_token_number) max_user_token_number = bp->user_token_number; @@ -1784,29 +1821,26 @@ packsymbols (void) sassoc[bp->value] = bp->assoc; } - token_translations = XCALLOC (short, max_user_token_number + 1); + token_translations_init (); - /* initialize all entries for literal tokens to 2, the internal - token number for $undefined., which represents all invalid - inputs. */ - for (j = 0; j <= max_user_token_number; j++) - token_translations[j] = 2; + error_token_number = errtoken->value; - for (bp = firstsymbol; bp; bp = bp->next) - { - if (bp->value >= ntokens) - continue; /* non-terminal */ - if (bp->user_token_number == SALIAS) - continue; - if (token_translations[bp->user_token_number] != 2) - complain (_("tokens %s and %s both assigned number %d"), - tags[token_translations[bp->user_token_number]], - bp->tag, bp->user_token_number); - token_translations[bp->user_token_number] = bp->value; - } + if (startval->class == unknown_sym) + fatal (_("the start symbol %s is undefined"), startval->tag); + else if (startval->class == token_sym) + fatal (_("the start symbol %s is a token"), startval->tag); - error_token_number = errtoken->value; + start_symbol = startval->value; +} + + +/*-----------------------------------. +| Output definition of token names. | +`-----------------------------------*/ +static void +symbols_output (void) +{ { struct obstack tokendefs; obstack_init (&tokendefs); @@ -1821,13 +1855,6 @@ packsymbols (void) output_token_defines (&table_obstack); #endif - if (startval->class == unknown_sym) - fatal (_("the start symbol %s is undefined"), startval->tag); - else if (startval->class == token_sym) - fatal (_("the start symbol %s is a token"), startval->tag); - - start_symbol = startval->value; - if (defines_flag) { output_token_defines (&defines_obstack); @@ -1843,19 +1870,23 @@ packsymbols (void) } if (semantic_parser) - for (i = ntokens; i < nsyms; i++) - { - /* don't make these for dummy nonterminals made by gensym. */ - if (*tags[i] != '@') - obstack_fgrow2 (&defines_obstack, - "# define\tNT%s\t%d\n", tags[i], i); - } + { + int i; + + for (i = ntokens; i < nsyms; i++) + { + /* don't make these for dummy nonterminals made by gensym. */ + if (*tags[i] != '@') + obstack_fgrow2 (&defines_obstack, + "# define\tNT%s\t%d\n", tags[i], i); + } #if 0 - /* `fdefines' is now a temporary file, so we need to copy its - contents in `done', so we can't close it here. */ - fclose (fdefines); - fdefines = NULL; + /* `fdefines' is now a temporary file, so we need to copy its + contents in `done', so we can't close it here. */ + fclose (fdefines); + fdefines = NULL; #endif + } } } @@ -1875,11 +1906,7 @@ packgram (void) bucket *ruleprec; ritem = XCALLOC (short, nitems + 1); - rlhs = XCALLOC (short, nrules) - 1; - rrhs = XCALLOC (short, nrules) - 1; - rprec = XCALLOC (short, nrules) - 1; - rprecsym = XCALLOC (short, nrules) - 1; - rassoc = XCALLOC (short, nrules) - 1; + rule_table = XCALLOC (rule_t, nrules) - 1; itemno = 0; ruleno = 1; @@ -1887,8 +1914,9 @@ packgram (void) p = grammar; while (p) { - rlhs[ruleno] = p->sym->value; - rrhs[ruleno] = itemno; + rule_table[ruleno].lhs = p->sym->value; + rule_table[ruleno].rhs = itemno; + rule_table[ruleno].line = p->sym->line; ruleprec = p->ruleprec; p = p->next; @@ -1899,8 +1927,8 @@ packgram (void) of the last token in it. */ if (p->sym->class == token_sym) { - rprec[ruleno] = p->sym->prec; - rassoc[ruleno] = p->sym->assoc; + rule_table[ruleno].prec = p->sym->prec; + rule_table[ruleno].assoc = p->sym->assoc; } if (p) p = p->next; @@ -1910,9 +1938,9 @@ packgram (void) the specified symbol's precedence replaces the default. */ if (ruleprec) { - rprec[ruleno] = ruleprec->prec; - rassoc[ruleno] = ruleprec->assoc; - rprecsym[ruleno] = ruleprec->value; + rule_table[ruleno].prec = ruleprec->prec; + rule_table[ruleno].assoc = ruleprec->assoc; + rule_table[ruleno].precsym = ruleprec->value; } ritem[itemno++] = -ruleno; @@ -1943,8 +1971,6 @@ reader (void) nvars = 0; nrules = 0; nitems = 0; - rline_allocated = 10; - rline = XCALLOC (short, rline_allocated); typed = 0; lastprec = 0; @@ -1991,6 +2017,9 @@ reader (void) /* Assign the symbols their symbol numbers. Write #defines for the token symbols into FDEFINES if requested. */ packsymbols (); + symbols_output (); /* Convert the grammar into the format described in gram.h. */ packgram (); + /* Output the headers. */ + symbols_output (); }