X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/560757768c92e7364f8f084c9dac29e17fee9597..e89a22bfab22e4d2ee73be49dcb66b51f8d0e892:/src/nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index c207924d..000b8b1b 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -28,6 +28,7 @@
 #include "reader.h"
 #include "types.h"
 #include "gram.h"
+#include "reduce.h"
 #include "nullable.h"
 
 char *nullable = NULL;
@@ -45,87 +46,75 @@ nullable_print (FILE *out)
 void
 set_nullable (void)
 {
-  short *r;
+  int ruleno;
   short *s1;
   short *s2;
   shorts *p;
 
-  short *squeue;
-  short *rcount;
-  shorts **rsets;
-  shorts *relts;
+  short *squeue = XCALLOC (short, nvars);
+  short *rcount = XCALLOC (short, nrules + 1);
+  /* RITEM contains all the rules, including useless productions.
+     Hence we must allocate room for useless nonterminals too.  */
+  shorts **rsets = XCALLOC (shorts *, nvars) - ntokens;
+  /* This is said to be more elements than we actually use.
+     Supposedly nitems - nrules is enough.  But why take the risk?  */
+  shorts *relts = XCALLOC (shorts, nitems + nvars + 1);
 
   if (trace_flag)
     fprintf (stderr, "Entering set_nullable\n");
 
   nullable = XCALLOC (char, nvars) - ntokens;
 
-  squeue = XCALLOC (short, nvars);
   s1 = s2 = squeue;
-
-  rcount = XCALLOC (short, nrules + 1);
-  rsets = XCALLOC (shorts *, nvars) - ntokens;
-  /* This is said to be more elements than we actually use.
-     Supposedly nitems - nrules is enough.
-     But why take the risk?  */
-  relts = XCALLOC (shorts, nitems + nvars + 1);
   p = relts;
 
-  r = ritem;
-  while (*r)
-    {
-      if (*r < 0)
-	{
-	  int symbol = rule_table[-(*r++)].lhs;
-	  if (symbol >= 0 && !nullable[symbol])
-	    {
-	      nullable[symbol] = 1;
-	      *s2++ = symbol;
-	    }
-	}
-      else
-	{
-	  int any_tokens = 0;
-	  int symbol;
-	  short *r1 = r;
-	  for (symbol = *r++; symbol > 0; symbol = *r++)
-	    if (ISTOKEN (symbol))
-	      any_tokens = 1;
-
-	  if (!any_tokens)
-	    {
-	      int ruleno = -symbol;
-	      r = r1;
-	      for (symbol = *r++; symbol > 0; symbol = *r++)
+  for (ruleno = 1; ruleno < nrules + 1; ++ruleno)
+    if (rule_table[ruleno].useful)
+      {
+	if (ritem[rule_table[ruleno].rhs] > 0)
+	  {
+	    /* This rule has a non empty RHS. */
+	    short *r;
+	    int any_tokens = 0;
+	    for (r = ritem + rule_table[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)
+	      for (r = ritem + rule_table[ruleno].rhs; *r > 0; ++r)
 		{
 		  rcount[ruleno]++;
-		  p->next = rsets[symbol];
+		  p->next = rsets[*r];
 		  p->value = ruleno;
-		  rsets[symbol] = p;
+		  rsets[*r] = p;
 		  p++;
 		}
-	    }
-	}
-    }
+	  }
+	else
+	  {
+	    /* This rule has an empty RHS. */
+	    assert (ritem[rule_table[ruleno].rhs] == -ruleno);
+	    if (rule_table[ruleno].useful && !nullable[rule_table[ruleno].lhs])
+	      {
+		nullable[rule_table[ruleno].lhs] = 1;
+		*s2++ = rule_table[ruleno].lhs;
+	      }
+	  }
+      }
 
   while (s1 < s2)
-    {
-      p = rsets[*s1++];
-      while (p)
-	{
-	  int ruleno = p->value;
-	  p = p->next;
-	  if (--rcount[ruleno] == 0)
+    for (p = rsets[*s1++]; p; p = p->next)
+      {
+	ruleno = p->value;
+	if (--rcount[ruleno] == 0)
+	  if (rule_table[ruleno].useful && !nullable[rule_table[ruleno].lhs])
 	    {
-	      int symbol = rule_table[ruleno].lhs;
-	      if (symbol >= 0 && !nullable[symbol])
-		{
-		  nullable[symbol] = 1;
-		  *s2++ = symbol;
-		}
+	      nullable[rule_table[ruleno].lhs] = 1;
+	      *s2++ = rule_table[ruleno].lhs;
 	    }
-	}
-    }
+      }
 
   XFREE (squeue);
   XFREE (rcount);