X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/342b8b6e2156e923797745af2da2596e3086ccd5..e3f1699f5554776a9211b410f3ebdaa6120e62df:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 69619358..03c0d311 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; - } } @@ -748,6 +747,8 @@ parse_union_decl (void) typed = 1; + /* FIXME: I'm worried: are you sure attrs_obstack is properly + filled? */ if (no_lines_flag) obstack_1grow (&attrs_obstack, '\n'); @@ -763,7 +764,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); } @@ -850,7 +851,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 +882,6 @@ parse_thong_decl (void) usrtoknum = numval; token = lex (); /* okay, did number, now get literal */ } - else - usrtoknum = 0; /* process literal string token */ @@ -963,16 +962,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 +1030,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 ('%'); @@ -1697,6 +1700,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 +1751,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 +1816,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 +1828,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); + + start_symbol = startval->value; +} - error_token_number = errtoken->value; +/*-----------------------------------. +| Output definition of token names. | +`-----------------------------------*/ + +static void +symbols_output (void) +{ { struct obstack tokendefs; obstack_init (&tokendefs); @@ -1821,13 +1862,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 +1877,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 + } } } @@ -1991,6 +2029,7 @@ 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 (); }