Update.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 93024ea1b6abba0be6d8002e9667dbbd34ebf059..5abb46edaeb3b7f3fb8bcf819766edc3b1164fe8 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1251,20 +1251,6 @@ copy_guard (symbol_list *rule, int stack_offset)
 }
 \f
 
 }
 \f
 

-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.                                             |
 /*-------------------------------------------------------------------.
 | Generate a dummy symbol, a nonterminal, whose name cannot conflict |
 | with the user's names.                                             |


@@ -1407,8 +1393,6 @@ readgram (void)
          nrules++;
          nitems++;
 
          nrules++;
          nitems++;
 

-         record_rule_line ();
-

          p = XCALLOC (symbol_list, 1);
          p->sym = lhs;
 
          p = XCALLOC (symbol_list, 1);
          p->sym = lhs;
 


@@ -1486,7 +1470,6 @@ readgram (void)
                     just read can belong to it.  */
                  nrules++;
                  nitems++;
                     just read can belong to it.  */
                  nrules++;
                  nitems++;

-                 record_rule_line ();

                  p = XCALLOC (symbol_list, 1);
                  if (crule1)
                    crule1->next = p;
                  p = XCALLOC (symbol_list, 1);
                  if (crule1)
                    crule1->next = p;


@@ -1494,9 +1477,10 @@ readgram (void)
                    grammar = p;
                  p->sym = sdummy;
                  crule1 = XCALLOC (symbol_list, 1);
                    grammar = p;
                  p->sym = sdummy;
                  crule1 = XCALLOC (symbol_list, 1);

-                 p->next = crule1;

                  crule1->next = crule;
 
                  crule1->next = crule;
 

+                 p->next = crule1;
+

                  /* Insert the dummy generated by that rule into this
                     rule.  */
                  nitems++;
                  /* Insert the dummy generated by that rule into this
                     rule.  */
                  nitems++;


@@ -1923,9 +1907,6 @@ packgram (void)
 
   ritem = XCALLOC (short, nitems + 1);
   rule_table = XCALLOC (rule_t, nrules) - 1;
 
   ritem = XCALLOC (short, nitems + 1);
   rule_table = XCALLOC (rule_t, nrules) - 1;

-  rprec = XCALLOC (short, nrules) - 1;
-  rprecsym = XCALLOC (short, nrules) - 1;
-  rassoc = XCALLOC (short, nrules) - 1;

 
   itemno = 0;
   ruleno = 1;
 
   itemno = 0;
   ruleno = 1;


@@ -1935,6 +1916,7 @@ packgram (void)
     {
       rule_table[ruleno].lhs = p->sym->value;
       rule_table[ruleno].rhs = 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;
       ruleprec = p->ruleprec;
 
       p = p->next;


@@ -1945,8 +1927,8 @@ packgram (void)
             of the last token in it.  */
          if (p->sym->class == token_sym)
            {
             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;
            }
          if (p)
            p = p->next;


@@ -1956,9 +1938,9 @@ packgram (void)
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)
        {
          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;
        }
 
       ritem[itemno++] = -ruleno;


@@ -1989,8 +1971,6 @@ reader (void)
   nvars = 0;
   nrules = 0;
   nitems = 0;
   nvars = 0;
   nrules = 0;
   nitems = 0;

-  rline_allocated = 10;
-  rline = XCALLOC (short, rline_allocated);

 
   typed = 0;
   lastprec = 0;
 
   typed = 0;
   lastprec = 0;