From d9b739c32f87cdcc0de4b09a1736e293ecd201ff Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 7 Apr 2002 15:29:56 +0000 Subject: [PATCH] * src/output.c, src/reader.c, src/symtab.c, src/symtab.h: Rename bucket.value as bucket.number. --- ChangeLog | 6 ++++++ src/output.c | 4 ++-- src/reader.c | 40 ++++++++++++++++++++-------------------- src/symtab.c | 4 ++-- src/symtab.h | 2 +- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 713c5fc7..69e68eb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-04-07 Akim Demaille + + * src/output.c, src/reader.c, src/symtab.c, src/symtab.h: Rename + bucket.value as bucket.number. + + 2002-04-07 Akim Demaille * src/closure.c, src/derives.c, src/gram.h, src/lalr.c, diff --git a/src/output.c b/src/output.c index 2194dda7..910eae4a 100644 --- a/src/output.c +++ b/src/output.c @@ -577,7 +577,7 @@ token_definitions_output (FILE *out) if (number == SALIAS) continue; /* Skip error token. */ - if (symbol->value == error_token_number) + if (symbol->number == error_token_number) continue; if (symbol->tag[0] == '\'') continue; /* skip literal character */ @@ -600,7 +600,7 @@ token_definitions_output (FILE *out) if (semantic_parser) /* FIXME: This is probably wrong, and should be just as above. --akim. */ - fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->value); + fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->number); first = 0; } } diff --git a/src/reader.c b/src/reader.c index a1b24652..705948d4 100644 --- a/src/reader.c +++ b/src/reader.c @@ -559,7 +559,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not) complain (_("symbol %s redefined"), symbol->tag); symbol->class = what_is; if (what_is == nterm_sym && oldclass != nterm_sym) - symbol->value = nvars++; + symbol->number = nvars++; if (typename) { @@ -1202,7 +1202,7 @@ gensym (void) token_buffer = buf; sym = getsym (token_buffer); sym->class = nterm_sym; - sym->value = nvars++; + sym->number = nvars++; return sym; } @@ -1294,7 +1294,7 @@ readgram (void) if (lhs->class == unknown_sym) { lhs->class = nterm_sym; - lhs->value = nvars; + lhs->number = nvars; nvars++; } else if (lhs->class == token_sym) @@ -1471,7 +1471,7 @@ readgram (void) ("symbol %s is used, but is not defined as a token and has no rules"), bp->tag); bp->class = nterm_sym; - bp->value = nvars++; + bp->number = nvars++; } /* Insert the initial rule, which line is that of the first rule @@ -1544,7 +1544,7 @@ token_translations_init (void) for (bp = firstsymbol; bp; bp = bp->next) { /* Non-terminal? */ - if (bp->value >= ntokens) + if (bp->number >= ntokens) continue; /* A token string alias? */ if (bp->user_token_number == SALIAS) @@ -1557,7 +1557,7 @@ token_translations_init (void) complain (_("tokens %s and %s both assigned number %d"), symbols[token_translations[bp->user_token_number]]->tag, bp->tag, bp->user_token_number); - token_translations[bp->user_token_number] = bp->value; + token_translations[bp->user_token_number] = bp->number; } } @@ -1583,20 +1583,20 @@ packsymbols (void) { if (bp->class == nterm_sym) { - bp->value += ntokens; + bp->number += ntokens; } else if (bp->alias) { /* This symbol and its alias are a single token defn. Allocate a tokno, and assign to both check agreement of prec and assoc fields and make both the same */ - if (bp->value == -1) + if (bp->number == -1) { if (bp == eoftoken || bp->alias == eoftoken) - bp->value = bp->alias->value = 0; + bp->number = bp->alias->number = 0; else { - bp->value = bp->alias->value = tokno++; + bp->number = bp->alias->number = tokno++; } } @@ -1632,9 +1632,9 @@ packsymbols (void) else /* bp->class == token_sym */ { if (bp == eoftoken) - bp->value = 0; + bp->number = 0; else - bp->value = tokno++; + bp->number = tokno++; } if (bp->class == token_sym) @@ -1645,25 +1645,25 @@ packsymbols (void) max_user_token_number = bp->user_token_number; } - symbols[bp->value] = bp; + symbols[bp->number] = bp; } token_translations_init (); - error_token_number = errtoken->value; + error_token_number = errtoken->number; 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; + start_symbol = startval->number; } /*---------------------------------------------------------------. | Convert the rules into the representation using RRHS, RLHS and | -| RITEMS. | +| RITEM. | `---------------------------------------------------------------*/ static void @@ -1687,7 +1687,7 @@ packgram (void) while (p) { bucket *ruleprec = p->ruleprec; - rules[ruleno].lhs = p->sym->value; + rules[ruleno].lhs = p->sym->number; rules[ruleno].rhs = ritem + itemno; rules[ruleno].line = p->line; rules[ruleno].useful = TRUE; @@ -1699,7 +1699,7 @@ packgram (void) p = p->next; while (p && p->sym) { - ritem[itemno++] = p->sym->value; + ritem[itemno++] = p->sym->number; /* A rule gets by default the precedence and associativity of the last token in it. */ if (p->sym->class == token_sym) @@ -1717,7 +1717,7 @@ packgram (void) { rules[ruleno].prec = ruleprec->prec; rules[ruleno].assoc = ruleprec->assoc; - rules[ruleno].precsym = ruleprec->value; + rules[ruleno].precsym = ruleprec->number; } ritem[itemno++] = -ruleno; @@ -1774,7 +1774,7 @@ reader (void) /* Construct the axiom symbol. */ axiom = getsym ("$axiom"); axiom->class = nterm_sym; - axiom->value = nvars++; + axiom->number = nvars++; /* Construct the error token */ errtoken = getsym ("error"); diff --git a/src/symtab.c b/src/symtab.c index 57ef636e..76ed52be 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -1,5 +1,5 @@ /* Symbol table manager for Bison, - Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc. + Copyright 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -55,7 +55,7 @@ bucket_new (const char *tag, int hashval) res->next = NULL; res->tag = xstrdup (tag); res->type_name = NULL; - res->value = -1; + res->number = -1; res->prec = 0; res->assoc = right_assoc; res->user_token_number = SUNDEF; diff --git a/src/symtab.h b/src/symtab.h index c64e4079..ccdfa0ee 100644 --- a/src/symtab.h +++ b/src/symtab.h @@ -46,7 +46,7 @@ typedef struct bucket char *tag; /* Its type. */ char *type_name; - short value; + short number; short prec; associativity assoc; short user_token_number; -- 2.47.2