X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1a2b5d37e1d44b47cd51220945f4ba29c228a419..f7aed660541ed7b05c4d892334dfe64ba200a4a2:/src/nullable.c?ds=sidebyside

diff --git a/src/nullable.c b/src/nullable.c
index f8c9b32e..c0b60f64 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,5 +1,5 @@
 /* Part of the bison parser generator,
-   Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -26,12 +26,18 @@
 #include "system.h"
 #include "getargs.h"
 #include "symtab.h"
-#include "types.h"
 #include "gram.h"
 #include "reduce.h"
 #include "nullable.h"
 
-char *nullable = NULL;
+/* Linked list of rules.  */
+typedef struct rule_list_s
+{
+  struct rule_list_s *next;
+  rule_t *value;
+} rule_list_t;
+
+bool *nullable = NULL;
 
 static void
 nullable_print (FILE *out)
@@ -44,50 +50,48 @@ nullable_print (FILE *out)
 }
 
 void
-set_nullable (void)
+nullable_compute (void)
 {
-  int ruleno;
-  short *s1;
-  short *s2;
-  shorts *p;
+  rule_number_t ruleno;
+  symbol_number_t *s1;
+  symbol_number_t *s2;
+  rule_list_t *p;
 
-  short *squeue = XCALLOC (short, nvars);
-  short *rcount = XCALLOC (short, nrules + 1);
+  symbol_number_t *squeue = XCALLOC (symbol_number_t, nvars);
+  short *rcount = XCALLOC (short, nrules);
   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */
-  shorts **rsets = XCALLOC (shorts *, nvars) - ntokens;
+  rule_list_t **rsets = XCALLOC (rule_list_t *, nvars) - ntokens;
   /* This is said to be more elements than we actually use.
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
-  shorts *relts = XCALLOC (shorts, nritems + nvars + 1);
-
-  if (trace_flag)
-    fprintf (stderr, "Entering set_nullable\n");
+  rule_list_t *relts = XCALLOC (rule_list_t, nritems + nvars + 1);
 
-  nullable = XCALLOC (char, nvars) - ntokens;
+  nullable = XCALLOC (bool, nvars) - ntokens;
 
   s1 = s2 = squeue;
   p = relts;
 
-  for (ruleno = 1; ruleno < nrules + 1; ++ruleno)
+  for (ruleno = 0; ruleno < nrules; ++ruleno)
     if (rules[ruleno].useful)
       {
-	if (ritem[rules[ruleno].rhs] >= 0)
+	rule_t *rule = &rules[ruleno];
+	if (rule->rhs[0] >= 0)
 	  {
 	    /* This rule has a non empty RHS. */
-	    short *r;
+	    item_number_t *r = NULL;
 	    int any_tokens = 0;
-	    for (r = &ritem[rules[ruleno].rhs]; *r >= 0; ++r)
+	    for (r = rule->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[rules[ruleno].rhs]; *r >= 0; ++r)
+	      for (r = rule->rhs; *r >= 0; ++r)
 		{
 		  rcount[ruleno]++;
 		  p->next = rsets[*r];
-		  p->value = ruleno;
+		  p->value = rule;
 		  rsets[*r] = p;
 		  p++;
 		}
@@ -95,11 +99,11 @@ set_nullable (void)
 	else
 	  {
 	    /* This rule has an empty RHS. */
-	    assert (ritem[rules[ruleno].rhs] == -ruleno);
-	    if (rules[ruleno].useful && !nullable[rules[ruleno].lhs])
+	    assert (item_number_as_rule_number (rule->rhs[0]) == ruleno);
+	    if (rule->useful && !nullable[rule->lhs->number])
 	      {
-		nullable[rules[ruleno].lhs] = 1;
-		*s2++ = rules[ruleno].lhs;
+		nullable[rule->lhs->number] = 1;
+		*s2++ = rule->lhs->number;
 	      }
 	  }
       }
@@ -107,12 +111,12 @@ set_nullable (void)
   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])
+	rule_t *rule = p->value;
+	if (--rcount[rule->number] == 0)
+	  if (rule->useful && !nullable[rule->lhs->number])
 	    {
-	      nullable[rules[ruleno].lhs] = 1;
-	      *s2++ = rules[ruleno].lhs;
+	      nullable[rule->lhs->number] = 1;
+	      *s2++ = rule->lhs->number;
 	    }
       }
 
@@ -121,13 +125,13 @@ set_nullable (void)
   XFREE (rsets + ntokens);
   XFREE (relts);
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     nullable_print (stderr);
 }
 
 
 void
-free_nullable (void)
+nullable_free (void)
 {
   XFREE (nullable + ntokens);
 }