02-fyi-bucket-num.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * src/output.c, src/reader.c, src/symtab.c, src/symtab.h: Rename
        bucket.value as bucket.number.
        
        
Index: src/output.c
--- src/output.c Sat, 23 Mar 2002 12:44:36 +0100 akim
+++ src/output.c Sat, 23 Mar 2002 12:53:38 +0100 akim
@@ -577,7 +577,7 @@
       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 @@
       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;
     }
 }
Index: src/reader.c
--- src/reader.c Sat, 23 Mar 2002 12:44:36 +0100 akim
+++ src/reader.c Sat, 23 Mar 2002 12:53:38 +0100 akim
@@ -559,7 +559,7 @@
            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 @@
   token_buffer = buf;
   sym = getsym (token_buffer);
   sym->class = nterm_sym;
-  sym->value = nvars++;
+  sym->number = nvars++;
   return sym;
 }
 
@@ -1294,7 +1294,7 @@
        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 @@
                  ("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 @@
   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 @@
        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 @@
     {
       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 @@
       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 @@
            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 @@
   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 @@
       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 @@
        {
          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 @@
   /* Construct the axiom symbol. */
   axiom = getsym ("$axiom");
   axiom->class = nterm_sym;
-  axiom->value = nvars++;
+  axiom->number = nvars++;
 
   /* Construct the error token */
   errtoken = getsym ("error");
Index: src/symtab.c
--- src/symtab.c Thu, 27 Dec 2001 14:58:13 +0100 akim
+++ src/symtab.c Sat, 23 Mar 2002 12:54:30 +0100 akim
@@ -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 @@
   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;
Index: src/symtab.h
--- src/symtab.h Sun, 16 Dec 2001 11:40:41 +0100 akim
+++ src/symtab.h Sat, 23 Mar 2002 12:54:02 +0100 akim
@@ -46,7 +46,7 @@
   char *tag;
   /* Its type. */
   char *type_name;
-  short value;
+  short number;
   short prec;
   associativity assoc;
   short user_token_number;