* src/derives.c, src/print.c, src/reduce.c: To ease the

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index 8175f29f313c83212537c117f542546688d43c94..164dc72e869a8395028d7449348b76bddf8b64dd 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -29,7 +29,7 @@
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"

-#include "alloc.h"
+#include "xalloc.h"

 #include "complain.h"
 #include "reduce.h"
 #include "reader.h"
 #include "complain.h"
 #include "reduce.h"
 #include "reader.h"


@@ -122,7 +122,7 @@ useless_nonterminals (void)
   /* N is set as built.  Np is set being built this iteration. P is
      set of all productions which have a RHS all in N.  */
 
   /* N is set as built.  Np is set being built this iteration. P is
      set of all productions which have a RHS all in N.  */
 

-  Np = NEW2 (WORDSIZE (nvars), unsigned);
+  Np = XCALLOC (unsigned, WORDSIZE (nvars));

 
   /* The set being computed is a set of nonterminals which can derive
      the empty string or strings consisting of all terminals. At each
 
   /* The set being computed is a set of nonterminals which can derive
      the empty string or strings consisting of all terminals. At each


@@ -162,7 +162,7 @@ useless_nonterminals (void)
       Np = N;
       N = Ns;
     }
       Np = N;
       N = Ns;
     }

-  FREE (N);
+  XFREE (N);

   N = Np;
 }
 
   N = Np;
 }
 


@@ -198,8 +198,8 @@ inaccessable_symbols (void)
      terminals are printed (if running in verbose mode) so that the
      user can know.  */
 
      terminals are printed (if running in verbose mode) so that the
      user can know.  */
 

-  Vp = NEW2 (WORDSIZE (nsyms), unsigned);
-  Pp = NEW2 (WORDSIZE (nrules + 1), unsigned);
+  Vp = XCALLOC (unsigned, WORDSIZE (nsyms));
+  Pp = XCALLOC (unsigned, WORDSIZE (nrules + 1));

 
   /* If the start symbol isn't useful, then nothing will be useful. */
   if (!BITISSET (N, start_symbol - ntokens))
 
   /* If the start symbol isn't useful, then nothing will be useful. */
   if (!BITISSET (N, start_symbol - ntokens))


@@ -236,7 +236,7 @@ inaccessable_symbols (void)
     }
 end_iteration:
 
     }
 end_iteration:
 

-  FREE (V);
+  XFREE (V);

   V = Vp;
 
   /* Tokens 0, 1, and 2 are internal to Bison.  Consider them useful. */
   V = Vp;
 
   /* Tokens 0, 1, and 2 are internal to Bison.  Consider them useful. */


@@ -244,7 +244,7 @@ end_iteration:
   SETBIT (V, 1);               /* error token */
   SETBIT (V, 2);               /* some undefined token */
 
   SETBIT (V, 1);               /* error token */
   SETBIT (V, 2);               /* some undefined token */
 

-  FREE (P);
+  XFREE (P);

   P = Pp;
 
   nuseful_productions = bits_size (P, WORDSIZE (nrules + 1));
   P = Pp;
 
   nuseful_productions = bits_size (P, WORDSIZE (nrules + 1));


@@ -340,7 +340,7 @@ reduce_grammar_tables (void)
         number. -1 in the map means it was useless and is being
         eliminated.  */
 
         number. -1 in the map means it was useless and is being
         eliminated.  */
 

-      nontermmap = NEW2 (nvars, short) - ntokens;
+      nontermmap = XCALLOC (short, nvars) - ntokens;

       for (i = ntokens; i < nsyms; i++)
        nontermmap[i] = -1;
 
       for (i = ntokens; i < nsyms; i++)
        nontermmap[i] = -1;
 


@@ -401,7 +401,8 @@ print_results (void)
 
   if (nuseless_nonterminals > 0)
     {
 
   if (nuseless_nonterminals > 0)
     {

-      fprintf (foutput, _("Useless nonterminals:\n\n"));
+      fputs (_("Useless nonterminals:"), foutput);
+      fputs ("\n\n", foutput);

       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))
          fprintf (foutput, "   %s\n", tags[i]);
       for (i = ntokens; i < nsyms; i++)
        if (!BITISSET (V, i))
          fprintf (foutput, "   %s\n", tags[i]);


@@ -413,7 +414,9 @@ print_results (void)
        {
          if (!b)
            {
        {
          if (!b)
            {

-             fprintf (foutput, _("\n\nTerminals which are not used:\n\n"));
+             fputs ("\n\n", foutput);
+             fprintf (foutput, _("Terminals which are not used:"));
+             fputs ("\n\n", foutput);

              b = TRUE;
            }
          fprintf (foutput, "   %s\n", tags[i]);
              b = TRUE;
            }
          fprintf (foutput, "   %s\n", tags[i]);


@@ -422,7 +425,9 @@ print_results (void)
 
   if (nuseless_productions > 0)
     {
 
   if (nuseless_productions > 0)
     {

-      fprintf (foutput, _("\n\nUseless rules:\n\n"));
+      fputs ("\n\n", foutput);
+      fprintf (foutput, _("Useless rules:"));
+      fputs ("\n\n", foutput);

       for (i = 1; i <= nrules; i++)
        {
          if (!BITISSET (P, i))
       for (i = 1; i <= nrules; i++)
        {
          if (!BITISSET (P, i))


@@ -438,7 +443,7 @@ print_results (void)
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)
        }
     }
   if (nuseless_nonterminals > 0 || nuseless_productions > 0 || b)

-    fprintf (foutput, "\n\n");
+    fputs ("\n\n", foutput);

 }
 \f
 #if 0                          /* XXX currently unused.  */
 }
 \f
 #if 0                          /* XXX currently unused.  */


@@ -483,7 +488,7 @@ dump_grammar (void)
 static void
 print_notices (void)
 {
 static void
 print_notices (void)
 {

-  if (fixed_outfiles && nuseless_productions)
+  if (yacc_flag && nuseless_productions)

     fprintf (stderr, _("%d rules never reduced\n"), nuseless_productions);
 
   fprintf (stderr, _("%s contains "), infile);
     fprintf (stderr, _("%d rules never reduced\n"), nuseless_productions);
 
   fprintf (stderr, _("%s contains "), infile);


@@ -513,17 +518,17 @@ reduce_grammar (void)
 
   /* Allocate the global sets used to compute the reduced grammar */
 
 
   /* Allocate the global sets used to compute the reduced grammar */
 

-  N = NEW2 (WORDSIZE (nvars), unsigned);
-  P = NEW2 (WORDSIZE (nrules + 1), unsigned);
-  V = NEW2 (WORDSIZE (nsyms), unsigned);
-  V1 = NEW2 (WORDSIZE (nsyms), unsigned);
+  N = XCALLOC (unsigned, WORDSIZE (nvars));
+  P = XCALLOC (unsigned, WORDSIZE (nrules + 1));
+  V = XCALLOC (unsigned, WORDSIZE (nsyms));
+  V1 = XCALLOC (unsigned, WORDSIZE (nsyms));

 
   useless_nonterminals ();
   inaccessable_symbols ();
 
   reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
 
 
   useless_nonterminals ();
   inaccessable_symbols ();
 
   reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
 

-  if (verboseflag)
+  if (verbose_flag)

     print_results ();
 
   if (reduced == FALSE)
     print_results ();
 
   if (reduced == FALSE)


@@ -537,14 +542,14 @@ reduce_grammar (void)
 
   reduce_grammar_tables ();
 #if 0
 
   reduce_grammar_tables ();
 #if 0

-  if (verboseflag)
+  if (verbose_flag)

     {
       fprintf (foutput, "REDUCED GRAMMAR\n\n");
       dump_grammar ();
     }
 #endif
 
     {
       fprintf (foutput, "REDUCED GRAMMAR\n\n");
       dump_grammar ();
     }
 #endif
 

-  if (statisticsflag)
+  if (statistics_flag)

     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,
     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,


@@ -558,7 +563,7 @@ reduce_grammar (void)
 done_reducing:
   /* Free the global sets used to compute the reduced grammar */
 
 done_reducing:
   /* Free the global sets used to compute the reduced grammar */
 

-  FREE (N);
-  FREE (V);
-  FREE (P);
+  XFREE (N);
+  XFREE (V);
+  XFREE (P);

 }
 }