Update FSF address.

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 9f9c2ee7369337d19236a6b674307e56f28e02b9..5e69a69b117d65807ca99023507c6ca2a60cf2c0 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
@@ -33,12 +34,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "files.h"
 #include "gram.h"
 #include "machine.h"
-#include "new.h"
+#include "alloc.h"
 
 
 extern char   **tags;          /* reader.c */
 extern int      verboseflag;   /* getargs.c */
 static int      statisticsflag;        /* XXXXXXX */
+extern int      fixed_outfiles;
 
 #ifndef TRUE
 #define TRUE   (1)
@@ -61,21 +63,22 @@ static int      nuseful_productions, nuseless_productions,
                 nuseful_nonterminals, nuseless_nonterminals;
 
 
-static void useless_nonterminals();
-static void inaccessable_symbols();
-static void reduce_grammar_tables();
-static void print_results();
-static void print_notices();
-void dump_grammar();
+bool bits_equal PARAMS((BSet, BSet, int));
+int nbits PARAMS((unsigned));
+int bits_size PARAMS((BSet, int));
+void reduce_grammar PARAMS((void));
+static void useless_nonterminals PARAMS((void));
+static void inaccessable_symbols PARAMS((void));
+static void reduce_grammar_tables PARAMS((void));
+static void print_results PARAMS((void));
+static void print_notices PARAMS((void));
+void dump_grammar PARAMS((void));
 
-extern void fatals ();
+extern void fatals PARAMS((char *, char *));
 \f
 
 bool
-bits_equal (L, R, n)
-BSet L;
-BSet R;
-int n;
+bits_equal (BSet L, BSet R, int n)
 {
   int i;
 
@@ -87,13 +90,12 @@ int n;
 
 
 int
-nbits (i)
-unsigned i;
+nbits (unsigned i)
 {
   int count = 0;
 
   while (i != 0) {
-    i ^= (i & -i);
+    i ^= (i & ((unsigned) (- (int) i)));
     ++count;
   }
   return count;
@@ -101,9 +103,7 @@ unsigned i;
 
 
 int
-bits_size (S, n)
-BSet S;
-int n;
+bits_size (BSet S, int n)
 {
   int i, count = 0;
 
@@ -113,7 +113,7 @@ int n;
 }
 \f
 void
-reduce_grammar ()
+reduce_grammar (void)
 {
   bool reduced;
 
@@ -169,14 +169,12 @@ reduce_grammar ()
 \f
 /*
  * Another way to do this would be with a set for each production and then do
- * subset tests against N, but even for the C grammar the whole reducing
+ * subset tests against N0, but even for the C grammar the whole reducing
  * process takes only 2 seconds on my 8Mhz AT.
  */
 
 static bool
-useful_production (i, N)
-int  i;
-BSet N;
+useful_production (int i, BSet N0)
 {
   rule  r;
   short n;
@@ -188,7 +186,7 @@ BSet N;
 
   for (r = &ritem[rrhs[i]]; *r > 0; r++)
     if (ISVAR(n = *r))
-      if (!BITISSET(N, n - ntokens))
+      if (!BITISSET(N0, n - ntokens))
        return FALSE;
   return TRUE;
 }
@@ -197,7 +195,7 @@ BSet N;
 /* Remember that rules are 1-origin, symbols are 0-origin. */
 
 static void
-useless_nonterminals ()
+useless_nonterminals (void)
 {
   BSet Np, Ns;
   int  i, n;
@@ -254,7 +252,7 @@ useless_nonterminals ()
 }
 \f
 static void
-inaccessable_symbols ()
+inaccessable_symbols (void)
 {
   BSet  Vp, Vs, Pp;
   int   i, n;
@@ -353,7 +351,7 @@ inaccessable_symbols ()
 }
 \f
 static void
-reduce_grammar_tables ()
+reduce_grammar_tables (void)
 {
 /* This is turned off because we would need to change the numbers
    in the case statements in the actions file.  */
@@ -482,7 +480,7 @@ reduce_grammar_tables ()
 }
 \f
 static void
-print_results ()
+print_results (void)
 {
   int   i;
 /*  short j; JF unused */
@@ -532,7 +530,7 @@ print_results ()
 }
 \f
 void
-dump_grammar ()
+dump_grammar (void)
 {
   int i;
   rule r;
@@ -569,10 +567,8 @@ dump_grammar ()
 
 
 static void
-print_notices ()
+print_notices (void)
 {
-  extern int fixed_outfiles;
-
   if (fixed_outfiles && nuseless_productions)
     fprintf(stderr, _("%d rules never reduced\n"), nuseless_productions);