#

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3ef6683ecaf58d0478efeb3a24deb9ec32c768db..4482286fe2e67f06fb1f219b589c402228ad8416 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -135,9 +135,9 @@ fatal(s)
   extern char *infile;
 
   if (infile == 0)
   extern char *infile;
 
   if (infile == 0)

-    fprintf(stderr, _("fatal error: %s\n"), s);
+    fprintf(stderr, _("%s: fatal error: %s\n"), program_name, s);

   else
   else

-    fprintf(stderr, _("\"%s\", line %d: %s\n"), infile, lineno, s);
+    fprintf(stderr, _("%s:%d: fatal error: %s\n"), infile, lineno, s);

   done(1);
 }
 
   done(1);
 }
 


@@ -163,9 +163,9 @@ warn(s)
   extern char *infile;
 
   if (infile == 0)
   extern char *infile;
 
   if (infile == 0)

-    fprintf(stderr, _("error: %s\n"), s);
+    fprintf(stderr, _("%s: %s\n"), program_name, s);

   else
   else

-    fprintf(stderr, _("(\"%s\", line %d) error: %s\n"),
+    fprintf(stderr, _("%s:%d: %s\n"),

            infile, lineno, s);
 
   failure = 1;
            infile, lineno, s);
 
   failure = 1;


@@ -228,7 +228,7 @@ toomany(s)
      char *s;
 {
   char buffer[200];
      char *s;
 {
   char buffer[200];

-  sprintf(buffer, _("limit of %d exceeded, too many %s"), MAXSHORT, s);
+  sprintf(buffer, _("too many %s (max %d)"), s, MAXSHORT);

   fatal(buffer);
 }
 
   fatal(buffer);
 }
 


@@ -238,6 +238,6 @@ void
 berror(s)
      char *s;
 {
 berror(s)
      char *s;
 {

-  fprintf(stderr, _("internal error, %s\n"), s);
+  fprintf(stderr, _("%s: internal error: %s\n"), program_name, s);

   abort();
 }
   abort();
 }