c++: style: use "unsigned", not "unsigned int"

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index 929aa777bb513241b5de256b05e21b82b744825a..253b7cd8f075f067dc89531b0f77c10b612bb671 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,6 +1,6 @@
 /* Closures for Bison
 
 /* Closures for Bison
 

-   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2012 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015 Free

    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -44,7 +44,7 @@ static bitsetv firsts = NULL;
 
 /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var.  */
 #define FDERIVES(Var)   fderives[(Var) - ntokens]
 
 /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var.  */
 #define FDERIVES(Var)   fderives[(Var) - ntokens]

-#define   FIRSTS(Var)   firsts[(Var) - ntokens]
+#define FIRSTS(Var)   firsts[(Var) - ntokens]

 \f
 
 /*-----------------.
 \f
 
 /*-----------------.


@@ -52,7 +52,7 @@ static bitsetv firsts = NULL;
 `-----------------*/
 
 static void
 `-----------------*/
 
 static void

-print_closure (char const *title, item_number *array, size_t size)
+print_closure (char const *title, item_number const *array, size_t size)

 {
   size_t i;
   fprintf (stderr, "Closure: %s\n", title);
 {
   size_t i;
   fprintf (stderr, "Closure: %s\n", title);


@@ -77,12 +77,9 @@ print_firsts (void)
   for (i = ntokens; i < nsyms; i++)
     {
       bitset_iterator iter;
   for (i = ntokens; i < nsyms; i++)
     {
       bitset_iterator iter;

-      fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
+      fprintf (stderr, "  %s firsts\n", symbols[i]->tag);

       BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
       BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)

-        {
-          fprintf (stderr, "\t\t%s\n",
-                   symbols[j + ntokens]->tag);
-        }
+        fprintf (stderr, "    %s\n", symbols[j + ntokens]->tag);

     }
   fprintf (stderr, "\n\n");
 }
     }
   fprintf (stderr, "\n\n");
 }


@@ -98,11 +95,12 @@ print_fderives (void)
   for (i = ntokens; i < nsyms; i++)
     {
       bitset_iterator iter;
   for (i = ntokens; i < nsyms; i++)
     {
       bitset_iterator iter;

-      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+      fprintf (stderr, "  %s derives\n", symbols[i]->tag);

       BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
         {
       BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
         {

-          fprintf (stderr, "\t\t%3d ", r);
+          fprintf (stderr, "    %3d ", r);

           rule_rhs_print (&rules[r], stderr);
           rule_rhs_print (&rules[r], stderr);

+          fprintf (stderr, "\n");

         }
     }
   fprintf (stderr, "\n\n");
         }
     }
   fprintf (stderr, "\n\n");


@@ -191,7 +189,7 @@ new_closure (unsigned int n)
 
 
 void
 
 
 void

-closure (item_number *core, size_t n)
+closure (item_number const *core, size_t n)

 {
   /* Index over CORE. */
   size_t c;
 {
   /* Index over CORE. */
   size_t c;