* data/yacc.c: Guard the declaration of yytoknum also with

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index 6a70fa572be96a66dd3aa90c4b8dc6374234408f..c0b60f64d40235e653e2f9b7033030341d0d0580 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -30,14 +30,14 @@
 #include "reduce.h"
 #include "nullable.h"
 
 #include "reduce.h"
 #include "nullable.h"
 

-/* Linked list of rule numbers.  */
+/* Linked list of rules.  */

 typedef struct rule_list_s
 {
   struct rule_list_s *next;
 typedef struct rule_list_s
 {
   struct rule_list_s *next;

-  rule_number_t value;
+  rule_t *value;

 } rule_list_t;
 
 } rule_list_t;
 

-char *nullable = NULL;
+bool *nullable = NULL;

 
 static void
 nullable_print (FILE *out)
 
 static void
 nullable_print (FILE *out)


@@ -50,7 +50,7 @@ nullable_print (FILE *out)
 }
 
 void
 }
 
 void

-set_nullable (void)
+nullable_compute (void)

 {
   rule_number_t ruleno;
   symbol_number_t *s1;
 {
   rule_number_t ruleno;
   symbol_number_t *s1;


@@ -66,10 +66,7 @@ set_nullable (void)
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
   rule_list_t *relts = XCALLOC (rule_list_t, nritems + nvars + 1);
 
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
   rule_list_t *relts = XCALLOC (rule_list_t, nritems + nvars + 1);
 

-  if (trace_flag)
-    fprintf (stderr, "Entering set_nullable\n");
-
-  nullable = XCALLOC (char, nvars) - ntokens;
+  nullable = XCALLOC (bool, nvars) - ntokens;

 
   s1 = s2 = squeue;
   p = relts;
 
   s1 = s2 = squeue;
   p = relts;


@@ -94,7 +91,7 @@ set_nullable (void)
                {
                  rcount[ruleno]++;
                  p->next = rsets[*r];
                {
                  rcount[ruleno]++;
                  p->next = rsets[*r];

-                 p->value = ruleno;
+                 p->value = rule;

                  rsets[*r] = p;
                  p++;
                }
                  rsets[*r] = p;
                  p++;
                }


@@ -114,12 +111,12 @@ set_nullable (void)
   while (s1 < s2)
     for (p = rsets[*s1++]; p; p = p->next)
       {
   while (s1 < s2)
     for (p = rsets[*s1++]; p; p = p->next)
       {

-       ruleno = p->value;
-       if (--rcount[ruleno] == 0)
-         if (rules[ruleno].useful && !nullable[rules[ruleno].lhs->number])
+       rule_t *rule = p->value;
+       if (--rcount[rule->number] == 0)
+         if (rule->useful && !nullable[rule->lhs->number])

            {
            {

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

            }
       }
 
            }
       }
 


@@ -128,13 +125,13 @@ set_nullable (void)
   XFREE (rsets + ntokens);
   XFREE (relts);
 
   XFREE (rsets + ntokens);
   XFREE (relts);
 

-  if (trace_flag)
+  if (trace_flag & trace_sets)

     nullable_print (stderr);
 }
 
 
 void
     nullable_print (stderr);
 }
 
 
 void

-free_nullable (void)
+nullable_free (void)

 {
   XFREE (nullable + ntokens);
 }
 {
   XFREE (nullable + ntokens);
 }