Don't use m4_include on relative file names, as it doesn't work.

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index c4b9944d4d6123ae7445742378010f61af36abd7..beedf2b140f06281beb326df5b400cc70f684367 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,4 +1,5 @@
-/* Part of the bison parser generator,
+/* Calculate which nonterminals can expand into the null string for Bison.
+

    Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -24,18 +25,19 @@
    do so.  */
 
 #include "system.h"
    do so.  */
 
 #include "system.h"

+

 #include "getargs.h"
 #include "getargs.h"

-#include "symtab.h"

 #include "gram.h"
 #include "gram.h"

-#include "reduce.h"

 #include "nullable.h"
 #include "nullable.h"

+#include "reduce.h"
+#include "symtab.h"

 
 /* Linked list of rules.  */
 
 /* Linked list of rules.  */

-typedef struct rule_list_s
+typedef struct rule_list

 {
 {

-  struct rule_list_s *next;
-  rule_t *value;
-} rule_list_t;
+  struct rule_list *next;
+  rule *value;
+} rule_list;

 
 bool *nullable = NULL;
 
 
 bool *nullable = NULL;
 


@@ -45,28 +47,29 @@ nullable_print (FILE *out)
   int i;
   fputs ("NULLABLE\n", out);
   for (i = ntokens; i < nsyms; i++)
   int i;
   fputs ("NULLABLE\n", out);
   for (i = ntokens; i < nsyms; i++)

-    fprintf (out, "\t%s: %s\n", symbols[i]->tag, nullable[i] ? "yes" : "no");
+    fprintf (out, "\t%s: %s\n", symbols[i]->tag,
+            nullable[i - ntokens] ? "yes" : "no");

   fputs ("\n\n", out);
 }
 
 void
 nullable_compute (void)
 {
   fputs ("\n\n", out);
 }
 
 void
 nullable_compute (void)
 {

-  rule_number_t ruleno;
-  symbol_number_t *s1;
-  symbol_number_t *s2;
-  rule_list_t *p;
+  rule_number ruleno;
+  symbol_number *s1;
+  symbol_number *s2;
+  rule_list *p;

 
 

-  symbol_number_t *squeue = XCALLOC (symbol_number_t, nvars);
-  short *rcount = XCALLOC (short, nrules);
+  symbol_number *squeue = CALLOC (squeue, nvars);
+  short *rcount = CALLOC (rcount, nrules);

   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */
   /* RITEM contains all the rules, including useless productions.
      Hence we must allocate room for useless nonterminals too.  */

-  rule_list_t **rsets = XCALLOC (rule_list_t *, nvars) - ntokens;
+  rule_list **rsets = CALLOC (rsets, nvars);

   /* This is said to be more elements than we actually use.
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
   /* This is said to be more elements than we actually use.
      Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */

-  rule_list_t *relts = XCALLOC (rule_list_t, nritems + nvars + 1);
+  rule_list *relts = CALLOC (relts, nritems + nvars + 1);

 
 

-  nullable = XCALLOC (bool, nvars) - ntokens;
+  CALLOC (nullable, nvars);

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


@@ -74,56 +77,57 @@ nullable_compute (void)
   for (ruleno = 0; ruleno < nrules; ++ruleno)
     if (rules[ruleno].useful)
       {
   for (ruleno = 0; ruleno < nrules; ++ruleno)
     if (rules[ruleno].useful)
       {

-       rule_t *rule = &rules[ruleno];
-       if (rule->rhs[0] >= 0)
+       rule *rules_ruleno = &rules[ruleno];
+       if (rules_ruleno->rhs[0] >= 0)

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

-           item_number_t *r = NULL;
+           item_number *r = NULL;

            int any_tokens = 0;
            int any_tokens = 0;

-           for (r = rule->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 = rule->rhs; *r >= 0; ++r)
+             for (r = rules_ruleno->rhs; *r >= 0; ++r)

                {
                  rcount[ruleno]++;
                {
                  rcount[ruleno]++;

-                 p->next = rsets[*r];
-                 p->value = rule;
-                 rsets[*r] = p;
+                 p->next = rsets[*r - ntokens];
+                 p->value = rules_ruleno;
+                 rsets[*r - ntokens] = p;

                  p++;
                }
          }
        else
          {
            /* This rule has an empty RHS. */
                  p++;
                }
          }
        else
          {
            /* This rule has an empty RHS. */

-           if (item_number_as_rule_number (rule->rhs[0]) != ruleno)
+           if (item_number_as_rule_number (rules_ruleno->rhs[0]) != ruleno)

              abort ();
              abort ();

-           if (rule->useful && !nullable[rule->lhs->number])
+           if (rules_ruleno->useful
+               && ! nullable[rules_ruleno->lhs->number - ntokens])

              {
              {

-               nullable[rule->lhs->number] = 1;
-               *s2++ = rule->lhs->number;
+               nullable[rules_ruleno->lhs->number - ntokens] = 1;
+               *s2++ = rules_ruleno->lhs->number;

              }
          }
       }
 
   while (s1 < s2)
              }
          }
       }
 
   while (s1 < s2)

-    for (p = rsets[*s1++]; p; p = p->next)
+    for (p = rsets[*s1++ - ntokens]; p; p = p->next)

       {
       {

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

            {
            {

-             nullable[rule->lhs->number] = 1;
-             *s2++ = rule->lhs->number;
+             nullable[r->lhs->number - ntokens] = 1;
+             *s2++ = r->lhs->number;

            }
       }
 
   XFREE (squeue);
   XFREE (rcount);
            }
       }
 
   XFREE (squeue);
   XFREE (rcount);

-  XFREE (rsets + ntokens);
+  XFREE (rsets);

   XFREE (relts);
 
   if (trace_flag & trace_sets)
   XFREE (relts);
 
   if (trace_flag & trace_sets)


@@ -134,5 +138,5 @@ nullable_compute (void)
 void
 nullable_free (void)
 {
 void
 nullable_free (void)
 {

-  XFREE (nullable + ntokens);
+  XFREE (nullable);

 }
 }