* reader.c (copy_comment): New function, factored out from:

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index ba9e1778e58dab8634d01f111744af64a785a2a3..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
 
 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 "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 char   **tags;          /* reader.c */
 extern int      verboseflag;   /* getargs.c */
 static int      statisticsflag;        /* XXXXXXX */

+extern int      fixed_outfiles;

 
 #ifndef TRUE
 #define TRUE   (1)
 
 #ifndef TRUE
 #define TRUE   (1)


@@ -61,21 +63,22 @@ static int      nuseful_productions, nuseless_productions,
                 nuseful_nonterminals, nuseless_nonterminals;
 
 
                 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
 \f
 
 bool

-bits_equal (L, R, n)
-BSet L;
-BSet R;
-int n;
+bits_equal (BSet L, BSet R, int n)

 {
   int i;
 
 {
   int i;
 


@@ -87,13 +90,12 @@ int n;
 
 
 int
 
 
 int

-nbits (i)
-unsigned i;
+nbits (unsigned i)

 {
   int count = 0;
 
   while (i != 0) {
 {
   int count = 0;
 
   while (i != 0) {

-    i ^= (i & -i);
+    i ^= (i & ((unsigned) (- (int) i)));

     ++count;
   }
   return count;
     ++count;
   }
   return count;


@@ -101,9 +103,7 @@ unsigned i;
 
 
 int
 
 
 int

-bits_size (S, n)
-BSet S;
-int n;
+bits_size (BSet S, int n)

 {
   int i, count = 0;
 
 {
   int i, count = 0;
 


@@ -113,7 +113,7 @@ int n;
 }
 \f
 void
 }
 \f
 void

-reduce_grammar ()
+reduce_grammar (void)

 {
   bool reduced;
 
 {
   bool reduced;
 


@@ -138,7 +138,7 @@ reduce_grammar ()
   print_notices();
 
   if (!BITISSET(N, start_symbol - ntokens))
   print_notices();
 
   if (!BITISSET(N, start_symbol - ntokens))

-    fatals("Start symbol %s does not derive any sentence.",
+    fatals(_("Start symbol %s does not derive any sentence"),

           tags[start_symbol]);
 
   reduce_grammar_tables();
           tags[start_symbol]);
 
   reduce_grammar_tables();


@@ -151,8 +151,8 @@ reduce_grammar ()
   /**/ statisticsflag = FALSE; /* someday getopts should handle this */
   if (statisticsflag == TRUE)
     fprintf(stderr,
   /**/ statisticsflag = FALSE; /* someday getopts should handle this */
   if (statisticsflag == TRUE)
     fprintf(stderr,

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

            ntokens, (ntokens == 1 ? "" : "s"),
            nvars,   (nvars   == 1 ? "" : "s"),
            nrules,  (nrules  == 1 ? "" : "s"));
            ntokens, (ntokens == 1 ? "" : "s"),
            nvars,   (nvars   == 1 ? "" : "s"),
            nrules,  (nrules  == 1 ? "" : "s"));


@@ -169,14 +169,12 @@ reduce_grammar ()
 \f
 /*
  * Another way to do this would be with a set for each production and then do
 \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.
  */
 
  * process takes only 2 seconds on my 8Mhz AT.
  */
 

-static bool 
-useful_production (i, N)
-int  i;
-BSet N;
+static bool
+useful_production (int i, BSet N0)

 {
   rule  r;
   short n;
 {
   rule  r;
   short n;


@@ -188,7 +186,7 @@ BSet N;
 
   for (r = &ritem[rrhs[i]]; *r > 0; r++)
     if (ISVAR(n = *r))
 
   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;
 }
        return FALSE;
   return TRUE;
 }


@@ -196,8 +194,8 @@ BSet N;
 
 /* Remember that rules are 1-origin, symbols are 0-origin. */
 
 
 /* Remember that rules are 1-origin, symbols are 0-origin. */
 

-static void 
-useless_nonterminals ()
+static void
+useless_nonterminals (void)

 {
   BSet Np, Ns;
   int  i, n;
 {
   BSet Np, Ns;
   int  i, n;


@@ -218,7 +216,7 @@ useless_nonterminals ()
    * set being computed remains unchanged.  Any nonterminals not in the
    * set at that point are useless in that they will never be used in
    * deriving a sentence of the language.
    * set being computed remains unchanged.  Any nonterminals not in the
    * set at that point are useless in that they will never be used in
    * deriving a sentence of the language.

-   * 
+   *

    * This iteration doesn't use any special traversal over the
    * productions.  A set is kept of all productions for which all the
    * nonterminals in the RHS are in useful.  Only productions not in
    * This iteration doesn't use any special traversal over the
    * productions.  A set is kept of all productions for which all the
    * nonterminals in the RHS are in useful.  Only productions not in


@@ -253,8 +251,8 @@ useless_nonterminals ()
   N = Np;
 }
 \f
   N = Np;
 }
 \f

-static void 
-inaccessable_symbols ()
+static void
+inaccessable_symbols (void)

 {
   BSet  Vp, Vs, Pp;
   int   i, n;
 {
   BSet  Vp, Vs, Pp;
   int   i, n;


@@ -270,13 +268,13 @@ inaccessable_symbols ()
    * reachable symbols, add the production to the set of reachable
    * productions, and add all of the nonterminals in the RHS of the
    * production to the set of reachable symbols.
    * reachable symbols, add the production to the set of reachable
    * productions, and add all of the nonterminals in the RHS of the
    * production to the set of reachable symbols.

-   * 
+   *

    * Consider only the (partially) reduced grammar which has only
    * nonterminals in N and productions in P.
    * Consider only the (partially) reduced grammar which has only
    * nonterminals in N and productions in P.

-   * 
+   *

    * The result is the set P of productions in the reduced grammar, and
    * the set V of symbols in the reduced grammar.
    * The result is the set P of productions in the reduced grammar, and
    * the set V of symbols in the reduced grammar.

-   * 
+   *

    * Although this algorithm also computes the set of terminals which are
    * reachable, no terminal will be deleted from the grammar. Some
    * terminals might not be in the grammar but might be generated by
    * Although this algorithm also computes the set of terminals which are
    * reachable, no terminal will be deleted from the grammar. Some
    * terminals might not be in the grammar but might be generated by


@@ -302,7 +300,7 @@ inaccessable_symbols ()
        Vp[i] = V[i];
       for (i = 1; i <= nrules; i++)
        {
        Vp[i] = V[i];
       for (i = 1; i <= nrules; i++)
        {

-         if (!BITISSET(Pp, i) && BITISSET(P, i) && 
+         if (!BITISSET(Pp, i) && BITISSET(P, i) &&

              BITISSET(V, rlhs[i]))
            {
              for (r = &ritem[rrhs[i]]; *r >= 0; r++)
              BITISSET(V, rlhs[i]))
            {
              for (r = &ritem[rrhs[i]]; *r >= 0; r++)


@@ -352,8 +350,8 @@ inaccessable_symbols ()
       SETBIT(V1, rprecsym[i]);
 }
 \f
       SETBIT(V1, rprecsym[i]);
 }
 \f

-static void 
-reduce_grammar_tables ()
+static void
+reduce_grammar_tables (void)

 {
 /* This is turned off because we would need to change the numbers
    in the case statements in the actions file.  */
 {
 /* This is turned off because we would need to change the numbers
    in the case statements in the actions file.  */


@@ -481,8 +479,8 @@ reduce_grammar_tables ()
     }
 }
 \f
     }
 }
 \f

-static void 
-print_results ()
+static void
+print_results (void)

 {
   int   i;
 /*  short j; JF unused */
 {
   int   i;
 /*  short j; JF unused */


@@ -491,7 +489,7 @@ print_results ()
 
   if (nuseless_nonterminals > 0)
     {
 
   if (nuseless_nonterminals > 0)
     {

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

       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]);


@@ -503,7 +501,7 @@ print_results ()
        {
          if (!b)
            {
        {
          if (!b)
            {

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

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


@@ -512,7 +510,7 @@ print_results ()
 
   if (nuseless_productions > 0)
     {
 
   if (nuseless_productions > 0)
     {

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

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


@@ -531,8 +529,8 @@ print_results ()
     fprintf(foutput, "\n\n");
 }
 \f
     fprintf(foutput, "\n\n");
 }
 \f

-void 
-dump_grammar ()
+void
+dump_grammar (void)

 {
   int i;
   rule r;
 {
   int i;
   rule r;


@@ -540,23 +538,23 @@ dump_grammar ()
   fprintf(foutput,
          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
          ntokens, nvars, nsyms, nrules, nitems);
   fprintf(foutput,
          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
          ntokens, nvars, nsyms, nrules, nitems);

-  fprintf(foutput, "Variables\n---------\n\n");
-  fprintf(foutput, "Value  Sprec    Sassoc    Tag\n");
+  fprintf(foutput, _("Variables\n---------\n\n"));
+  fprintf(foutput, _("Value  Sprec    Sassoc    Tag\n"));

   for (i = ntokens; i < nsyms; i++)
     fprintf(foutput, "%5d  %5d  %5d  %s\n",
            i, sprec[i], sassoc[i], tags[i]);
   fprintf(foutput, "\n\n");
   for (i = ntokens; i < nsyms; i++)
     fprintf(foutput, "%5d  %5d  %5d  %s\n",
            i, sprec[i], sassoc[i], tags[i]);
   fprintf(foutput, "\n\n");

-  fprintf(foutput, "Rules\n-----\n\n");
+  fprintf(foutput, _("Rules\n-----\n\n"));

   for (i = 1; i <= nrules; i++)
     {
   for (i = 1; i <= nrules; i++)
     {

-      fprintf(foutput, "%-5d(%5d%5d)%5d : (@%-5d)", 
+      fprintf(foutput, "%-5d(%5d%5d)%5d : (@%-5d)",

              i, rprec[i], rassoc[i], rlhs[i], rrhs[i]);
       for (r = &ritem[rrhs[i]]; *r > 0; r++)
        fprintf(foutput, "%5d", *r);
       fprintf(foutput, " [%d]\n", -(*r));
     }
   fprintf(foutput, "\n\n");
              i, rprec[i], rassoc[i], rlhs[i], rrhs[i]);
       for (r = &ritem[rrhs[i]]; *r > 0; r++)
        fprintf(foutput, "%5d", *r);
       fprintf(foutput, " [%d]\n", -(*r));
     }
   fprintf(foutput, "\n\n");

-  fprintf(foutput, "Rules interpreted\n-----------------\n\n");
+  fprintf(foutput, _("Rules interpreted\n-----------------\n\n"));

   for (i = 1; i <= nrules; i++)
     {
       fprintf(foutput, "%-5d  %s :", i, tags[rlhs[i]]);
   for (i = 1; i <= nrules; i++)
     {
       fprintf(foutput, "%-5d  %s :", i, tags[rlhs[i]]);


@@ -568,31 +566,29 @@ dump_grammar ()
 }
 
 
 }
 
 

-static void 
-print_notices ()
+static void
+print_notices (void)

 {
 {

-  extern int fixed_outfiles;
-

   if (fixed_outfiles && nuseless_productions)
   if (fixed_outfiles && nuseless_productions)

-    fprintf(stderr, "%d rules never reduced\n", nuseless_productions);
+    fprintf(stderr, _("%d rules never reduced\n"), nuseless_productions);

 
 

-  fprintf(stderr, "%s contains ", infile);
+  fprintf(stderr, _("%s contains "), infile);

 
   if (nuseless_nonterminals > 0)
     {
 
   if (nuseless_nonterminals > 0)
     {

-      fprintf(stderr, "%d useless nonterminal%s",
+      fprintf(stderr, _("%d useless nonterminal%s"),

              nuseless_nonterminals,
              (nuseless_nonterminals == 1 ? "" : "s"));
     }
   if (nuseless_nonterminals > 0 && nuseless_productions > 0)
              nuseless_nonterminals,
              (nuseless_nonterminals == 1 ? "" : "s"));
     }
   if (nuseless_nonterminals > 0 && nuseless_productions > 0)

-    fprintf(stderr, " and ");
+    fprintf(stderr, _(" and "));

 
   if (nuseless_productions > 0)
     {
 
   if (nuseless_productions > 0)
     {

-      fprintf(stderr, "%d useless rule%s",
+      fprintf(stderr, _("%d useless rule%s"),

              nuseless_productions,
              (nuseless_productions == 1 ? "" : "s"));
     }
              nuseless_productions,
              (nuseless_productions == 1 ? "" : "s"));
     }

-  fprintf(stderr, ".\n");
+  fprintf(stderr, "\n");

   fflush(stderr);
 }
   fflush(stderr);
 }