Fix a couple of buffer overrun bugs.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 17a47ab4fdad8b1e0564fcf1b261eb8ebcac28c3..f68172234a393c6ab23a0ebbadbefc41d5a473aa 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include "system.h"
 #include "machine.h"
 #include <stdio.h>
 #include "system.h"
 #include "machine.h"

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

 #include "files.h"
 #include "gram.h"
 #include "state.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"


@@ -80,7 +80,7 @@ void
 print_token(extnum, token)
 int extnum, token;
 {
 print_token(extnum, token)
 int extnum, token;
 {

-  fprintf(foutput, " type %d is %s\n", extnum, tags[token]);
+  fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);

 }
 
 
 }
 
 


@@ -88,7 +88,7 @@ void
 print_state(state)
 int state;
 {
 print_state(state)
 int state;
 {

-  fprintf(foutput, "\n\nstate %d\n\n", state);
+  fprintf(foutput, _("\n\nstate %d\n\n"), state);

   print_core(state);
   print_actions(state);
 }
   print_core(state);
   print_actions(state);
 }


@@ -133,7 +133,7 @@ int state;
          sp++;
        }
 
          sp++;
        }
 

-      fprintf (foutput, "   (rule %d)", rule);
+      fprintf (foutput, _("   (rule %d)"), rule);

       putc('\n', foutput);
     }
 
       putc('\n', foutput);
     }
 


@@ -161,9 +161,9 @@ int state;
   if (!shiftp && !redp)
     {
       if (final_state == state)
   if (!shiftp && !redp)
     {
       if (final_state == state)

-       fprintf(foutput, "    $default\taccept\n");
+       fprintf(foutput, _("    $default\taccept\n"));

       else
       else

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

       return;
     }
 
       return;
     }
 


@@ -179,9 +179,9 @@ int state;
          /* The following line used to be turned off.  */
          if (ISVAR(symbol)) break;
           if (symbol==0)      /* I.e. strcmp(tags[symbol],"$")==0 */
          /* The following line used to be turned off.  */
          if (ISVAR(symbol)) break;
           if (symbol==0)      /* I.e. strcmp(tags[symbol],"$")==0 */

-            fprintf(foutput, "    $   \tgo to state %d\n", state1);
+            fprintf(foutput, _("    $   \tgo to state %d\n"), state1);

           else
           else

-            fprintf(foutput, "    %-4s\tshift, and go to state %d\n",
+            fprintf(foutput, _("    %-4s\tshift, and go to state %d\n"),

                     tags[symbol], state1);
        }
 
                     tags[symbol], state1);
        }
 


@@ -204,7 +204,7 @@ int state;
        {
          if (! errp->errs[j]) continue;
          symbol = errp->errs[j];
        {
          if (! errp->errs[j]) continue;
          symbol = errp->errs[j];

-         fprintf(foutput, "    %-4s\terror (nonassociative)\n", tags[symbol]);
+         fprintf(foutput, _("    %-4s\terror (nonassociative)\n"), tags[symbol]);

        }
 
       if (j > 0)
        }
 
       if (j > 0)


@@ -215,7 +215,7 @@ int state;
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];

-      fprintf(foutput, "    $default\treduce using rule %d (%s)\n\n",
+      fprintf(foutput, _("    $default\treduce using rule %d (%s)\n\n"),

                rule, tags[symbol]);
     }
   else if (redp)
                rule, tags[symbol]);
     }
   else if (redp)


@@ -230,7 +230,7 @@ int state;
          if (! shiftp->shifts[i]) continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
          if (! shiftp->shifts[i]) continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];

-         fprintf(foutput, "    %-4s\tgo to state %d\n", tags[symbol], state1);
+         fprintf(foutput, _("    %-4s\tgo to state %d\n"), tags[symbol], state1);

        }
 
       putc('\n', foutput);
        }
 
       putc('\n', foutput);


@@ -251,23 +251,23 @@ print_grammar()
   int column = 0;
 
   /* rule # : LHS -> RHS */
   int column = 0;
 
   /* rule # : LHS -> RHS */

-  fputs("\nGrammar\n", foutput);
+  fputs(_("\nGrammar\n"), foutput);

   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {

-       fprintf(foutput, "rule %-4d %s ->", i, tags[rlhs[i]]);
+       fprintf(foutput, _("rule %-4d %s ->"), i, tags[rlhs[i]]);

        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)
            fprintf(foutput, " %s", tags[*rule++]);
        else
        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)
            fprintf(foutput, " %s", tags[*rule++]);
        else

-         fputs ("              /* empty */", foutput);
+         fputs (_("            /* empty */"), foutput);

        putc('\n', foutput);
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
        putc('\n', foutput);
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */

-  fputs("\nTerminals, with rules where they appear\n\n", foutput);
+  fputs(_("\nTerminals, with rules where they appear\n\n"), foutput);

   fprintf(foutput, "%s (-1)\n", tags[0]);
   if (translations)
     {
   fprintf(foutput, "%s (-1)\n", tags[0]);
   if (translations)
     {


@@ -315,7 +315,7 @@ print_grammar()
        fprintf (foutput, "%s\n", buffer);
       }
 
        fprintf (foutput, "%s\n", buffer);
       }
 

-  fputs("\nNonterminals, with rules where they appear\n\n", foutput);
+  fputs(_("\nNonterminals, with rules where they appear\n\n"), foutput);

   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;


@@ -341,7 +341,7 @@ print_grammar()
       if (left_count > 0)
        {
          END_TEST (50);
       if (left_count > 0)
        {
          END_TEST (50);

-         sprintf (buffer + strlen(buffer), " on left:");
+         sprintf (buffer + strlen(buffer), _(" on left:"));

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


@@ -356,7 +356,7 @@ print_grammar()
          if (left_count > 0)
            sprintf (buffer + strlen(buffer), ",");
          END_TEST (50);
          if (left_count > 0)
            sprintf (buffer + strlen(buffer), ",");
          END_TEST (50);

-         sprintf (buffer + strlen(buffer), " on right:");
+         sprintf (buffer + strlen(buffer), _(" on right:"));

          for (j = 1; j <= nrules; j++)
            {
              for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
          for (j = 1; j <= nrules; j++)
            {
              for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)