06-conflict-messages.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        Normalize conflict related messages.

        * src/complain.h, src/complain.c (warn, complain): New.
        * src/conflicts.c (conflicts_print): Use them.
        (conflict_report_yacc): New, extracted from...
        (conflicts_print): here.
        * tests/conflicts.at, tests/existing.at: Adjust.

Index: src/complain.c
--- src/complain.c Tue, 23 Jul 2002 20:15:05 +0200 akim
+++ src/complain.c Tue, 30 Jul 2002 13:00:13 +0200 akim
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.

    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -142,6 +142,35 @@
   putc ('\n', stderr);
   fflush (stderr);
 }
+
+void
+#if defined VA_START && defined __STDC__
+warn (const char *message, ...)
+#else
+warn (message, va_alist)
+  char *message;
+  va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  fflush (stdout);
+  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
+
+#ifdef VA_START
+  VA_START (args, message);
+  vfprintf (stderr, message, args);
+  va_end (args);
+#else
+  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+
+  ++warn_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
 
 /*-----------------------------------------------------------.
 | An error has occurred, but we can proceed, and die later.  |
@@ -177,6 +206,35 @@
   putc ('\n', stderr);
   fflush (stderr);
 }
+
+void
+#if defined VA_START && defined __STDC__
+complain (const char *message, ...)
+#else
+complain (message, va_alist)
+     char *message;
+     va_dcl
+#endif
+{
+#ifdef VA_START
+  va_list args;
+#endif
+
+  fflush (stdout);
+  fprintf (stderr, "%s: ", infile ? infile : program_name);
+
+#ifdef VA_START
+  VA_START (args, message);
+  vfprintf (stderr, message, args);
+  va_end (args);
+#else
+  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+
+  ++complain_message_count;
+  putc ('\n', stderr);
+  fflush (stderr);
+}
 
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
@@ -186,7 +244,7 @@
 #if defined VA_START && defined __STDC__
 fatal_at (location_t location, const char *message, ...)
 #else
-fatal (location, message, va_alist)
+fatal_at (location, message, va_alist)
   location_t location;
   char *message;
   va_dcl
Index: src/complain.h
--- src/complain.h Tue, 23 Jul 2002 20:15:05 +0200 akim
+++ src/complain.h Tue, 30 Jul 2002 12:44:33 +0200 akim
@@ -29,11 +29,17 @@

 /* Informative messages, but we proceed. */

+void warn (const char *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
+
 void warn_at (location_t location, const char *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));

 /* Something bad happen, but let's continue and die later. */

+void complain (const char *format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
+
 void complain_at (location_t location, const char *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));

@@ -46,7 +52,9 @@
   __attribute__ ((__format__ (__printf__, 2, 3)));

 # else
+void warn ();
 void warn_at ();
+void complain ();
 void complain_at ();
 void fatal ();
 void fatal_at ();
Index: src/conflicts.c
--- src/conflicts.c Mon, 29 Jul 2002 19:31:35 +0200 akim
+++ src/conflicts.c Tue, 30 Jul 2002 12:54:02 +0200 akim
@@ -385,6 +385,7 @@
   return rrc_count;
 }

+
 /*--------------------------------------------------------------.
 | Return a human readable string which reports shift/reduce and |
 | reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |
@@ -416,14 +417,32 @@
       cp += strlen (cp);
     }

-  *cp++ = '.';
-  *cp++ = '\n';
   *cp++ = '\0';

   return res;
 }


+/*----------------------------------------------------------------.
+| Same as above, but report the number of conflicts a` la POSIX.  |
+`----------------------------------------------------------------*/
+
+static void
+conflict_report_yacc (int src_num, int rrc_num)
+{
+  /* If invoked with `--yacc', use the output format specified by
+     POSIX.  */
+  fprintf (stderr, _("conflicts: "));
+  if (src_num > 0)
+    fprintf (stderr, _(" %d shift/reduce"), src_num);
+  if (src_num > 0 && rrc_num > 0)
+    fprintf (stderr, ",");
+  if (rrc_num > 0)
+    fprintf (stderr, _(" %d reduce/reduce"), rrc_num);
+  putc ('\n', stderr);
+}
+
+
 /*-----------------------------------------------------------.
 | Output the detailed description of states with conflicts.  |
 `-----------------------------------------------------------*/
@@ -443,8 +462,9 @@
       if (conflicts[i])
        {
          fprintf (out, _("State %d contains "), i);
-         fputs (conflict_report (count_sr_conflicts (s),
-                                 count_rr_conflicts (s, TRUE)), out);
+         fprintf (out, "%s.\n",
+                  conflict_report (count_sr_conflicts (s),
+                                   count_rr_conflicts (s, TRUE)));
          printed_sth = TRUE;
        }
     }
@@ -530,32 +550,15 @@

   /* Report the total number of conflicts on STDERR.  */
   if (yacc_flag)
-    {
-      /* If invoked with `--yacc', use the output format specified by
-        POSIX.  */
-      fprintf (stderr, _("conflicts: "));
-      if (src_total > 0)
-       fprintf (stderr, _(" %d shift/reduce"), src_total);
-      if (src_total > 0 && rrc_total > 0)
-       fprintf (stderr, ",");
-      if (rrc_total > 0)
-       fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
-      putc ('\n', stderr);
-    }
+    conflict_report_yacc (src_total, rrc_total);
   else
-    {
-      fprintf (stderr, _("%s contains "), infile);
-      fputs (conflict_report (src_total, rrc_total), stderr);
-    }
+    warn ("%s", conflict_report (src_total, rrc_total));

   if (expected_conflicts != -1 && !src_ok)
-    {
-      complain_message_count++;
-      fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
-                                "expected %d shift/reduce conflicts\n",
-                                expected_conflicts),
-              expected_conflicts);
-    }
+    complain (ngettext ("expected %d shift/reduce conflict",
+                       "expected %d shift/reduce conflicts",
+                       expected_conflicts),
+             expected_conflicts);
 }


Index: tests/conflicts.at
--- tests/conflicts.at Tue, 30 Jul 2002 12:36:46 +0200 akim
+++ tests/conflicts.at Tue, 30 Jul 2002 12:58:47 +0200 akim
@@ -142,7 +142,7 @@ exp: exp OP exp | NUM;
 ]])

 AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[input.y contains 1 shift/reduce conflict.
+[input.y: warning: 1 shift/reduce conflict
 ])

 # Check the contents of the report.
@@ -371,7 +371,7 @@ num: '0';
 ]])

 AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[[input.y contains 1 reduce/reduce conflict.
+[[input.y: warning: 1 reduce/reduce conflict
 input.y:4.4-8: warning: rule never reduced because of conflicts: id: '0'
 ]])

@@ -483,8 +483,8 @@ exp: exp OP exp | NUM;
 ]])

 AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y contains 1 shift/reduce conflict.
-expected 0 shift/reduce conflicts
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 0 shift/reduce conflicts
 ])
 AT_CLEANUP

@@ -520,7 +520,7 @@ exp: exp OP exp | NUM;
 ]])

 AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y contains 1 shift/reduce conflict.
-expected 2 shift/reduce conflicts
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 2 shift/reduce conflicts
 ])
 AT_CLEANUP
Index: tests/existing.at
--- tests/existing.at Mon, 10 Jun 2002 23:55:02 +0200 akim
+++ tests/existing.at Tue, 30 Jul 2002 13:06:03 +0200 akim
@@ -1191,7 +1191,7 @@
 # don't actually check the output.  But SEGV is watching us, and
 # so might do dmalloc.
 AT_CHECK([[bison --verbose --defines input.y]], 0, [],
-[[input.y contains 78 shift/reduce conflicts and 10 reduce/reduce conflicts.
+[[input.y: warning: 78 shift/reduce conflicts and 10 reduce/reduce conflicts
 ]])

 AT_CHECK([[grep '^State.*contains' input.output]], 0,