* data/m4sugar/m4sugar.m4: Update from CVS Autoconf.

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index 082f2b3211a383fb289ef438feb85585d2c8add9..ae02db757a725f06ad1cf9fd8f9bef9780cf8213 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -47,11 +47,11 @@ void
 set_nullable (void)
 {
   int ruleno;
 set_nullable (void)
 {
   int ruleno;

-  short *s1;
-  short *s2;
+  token_number_t *s1;
+  token_number_t *s2;

   shorts *p;
 
   shorts *p;
 

-  short *squeue = XCALLOC (short, nvars);
+  token_number_t *squeue = XCALLOC (token_number_t, nvars);

   short *rcount = XCALLOC (short, nrules + 1);
   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */
   short *rcount = XCALLOC (short, nrules + 1);
   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */


@@ -69,21 +69,21 @@ set_nullable (void)
   p = relts;
 
   for (ruleno = 1; ruleno < nrules + 1; ++ruleno)
   p = relts;
 
   for (ruleno = 1; ruleno < nrules + 1; ++ruleno)

-    if (rule_table[ruleno].useful)
+    if (rules[ruleno].useful)

       {
       {

-       if (ritem[rule_table[ruleno].rhs] >= 0)
+       if (rules[ruleno].rhs[0] >= 0)

          {
            /* This rule has a non empty RHS. */
          {
            /* This rule has a non empty RHS. */

-           short *r;
+           item_number_t *r;

            int any_tokens = 0;
            int any_tokens = 0;

-           for (r = &ritem[rule_table[ruleno].rhs]; *r >= 0; ++r)
+           for (r = rules[ruleno].rhs; *r >= 0; ++r)

              if (ISTOKEN (*r))
                any_tokens = 1;
 
            /* This rule has only nonterminals: schedule it for the second
               pass.  */
            if (!any_tokens)
              if (ISTOKEN (*r))
                any_tokens = 1;
 
            /* This rule has only nonterminals: schedule it for the second
               pass.  */
            if (!any_tokens)

-             for (r = &ritem[rule_table[ruleno].rhs]; *r >= 0; ++r)
+             for (r = rules[ruleno].rhs; *r >= 0; ++r)

                {
                  rcount[ruleno]++;
                  p->next = rsets[*r];
                {
                  rcount[ruleno]++;
                  p->next = rsets[*r];


@@ -95,11 +95,11 @@ set_nullable (void)
        else
          {
            /* This rule has an empty RHS. */
        else
          {
            /* This rule has an empty RHS. */

-           assert (ritem[rule_table[ruleno].rhs] == -ruleno);
-           if (rule_table[ruleno].useful && !nullable[rule_table[ruleno].lhs])
+           assert (rules[ruleno].rhs[0] == -ruleno);
+           if (rules[ruleno].useful && !nullable[rules[ruleno].lhs->number])

              {
              {

-               nullable[rule_table[ruleno].lhs] = 1;
-               *s2++ = rule_table[ruleno].lhs;
+               nullable[rules[ruleno].lhs->number] = 1;
+               *s2++ = rules[ruleno].lhs->number;

              }
          }
       }
              }
          }
       }


@@ -109,10 +109,10 @@ set_nullable (void)
       {
        ruleno = p->value;
        if (--rcount[ruleno] == 0)
       {
        ruleno = p->value;
        if (--rcount[ruleno] == 0)

-         if (rule_table[ruleno].useful && !nullable[rule_table[ruleno].lhs])
+         if (rules[ruleno].useful && !nullable[rules[ruleno].lhs->number])

            {
            {

-             nullable[rule_table[ruleno].lhs] = 1;
-             *s2++ = rule_table[ruleno].lhs;
+             nullable[rules[ruleno].lhs->number] = 1;
+             *s2++ = rules[ruleno].lhs->number;

            }
       }
 
            }
       }