errors: support indented context info in m4 macros

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 1d43f1d28d206200aadc4ad23f7fd756c1bd9898..985ef404e79a2e42f0595edf1695e668b6f7aad5 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -84,17 +84,18 @@ void
 error_message (const location *loc, warnings flags, const char *prefix,
                const char *message, va_list args)
 {
 error_message (const location *loc, warnings flags, const char *prefix,
                const char *message, va_list args)
 {

-  (void) flags;

   unsigned pos = 0;
 
   if (loc)
     pos += location_print (stderr, *loc);
   else
   unsigned pos = 0;
 
   if (loc)
     pos += location_print (stderr, *loc);
   else

-    pos += fprintf(stderr, "%s", current_file ? current_file : program_name);
-  pos += fprintf(stderr, ": ");
+    pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
+  pos += fprintf (stderr, ": ");

 
   if (indent_ptr)
     {
 
   if (indent_ptr)
     {

+      if (*indent_ptr)
+        prefix = NULL;

       if (!*indent_ptr)
         *indent_ptr = pos;
       else if (*indent_ptr > pos)
       if (!*indent_ptr)
         *indent_ptr = pos;
       else if (*indent_ptr > pos)


@@ -119,31 +120,24 @@ error_message (const location *loc, warnings flags, const char *prefix,
 
 /** Raise a complaint. That can be a fatal error, a complaint or just a
     warning.  */
 
 /** Raise a complaint. That can be a fatal error, a complaint or just a
     warning.  */

-

 static inline void
 complains (const location *loc, warnings flags, const char *message,
            va_list args)
 static inline void
 complains (const location *loc, warnings flags, const char *message,
            va_list args)

-

 {
 {

+  const char* prefix =
+    flags & fatal ? _("fatal error")
+    : flags & (errors_flag | complaint) ? _("error")
+    : _("warning");
+
+  complaint_issued |= flags & (complaint | errors_flag);
+  if (flags & (warnings_flag | silent | fatal | complaint))
+    error_message (loc, flags, prefix, message, args);

   if (flags & fatal)
   if (flags & fatal)

-    {
-       error_message (loc, fatal, _("fatal error"), message, args);
-       exit (EXIT_FAILURE);
-    }
-  else if (flags & (complaint | warnings_flag | silent))
-    {
-      const char* prefix =
-        flags & (errors_flag | complaint) ? _("error") : _("warning");
-      if (flags & (complaint | errors_flag))
-        complaint_issued = true;
-      error_message (loc, flags,
-                     indent_ptr && *indent_ptr ? NULL : prefix,
-                     message, args);
-    }
+    exit (EXIT_FAILURE);

 }
 
 void
 }
 
 void

-complain (location const* loc, warnings flags, const char *message, ...)
+complain (location const *loc, warnings flags, const char *message, ...)

 {
   va_list args;
   va_start (args, message);
 {
   va_list args;
   va_start (args, message);


@@ -152,12 +146,40 @@ complain (location const* loc, warnings flags, const char *message, ...)
 }
 
 void
 }
 
 void

-complain_at_indent (location loc, warnings flags, unsigned *indent,
-                    const char *message, ...)
+complain_indent (location const *loc, warnings flags, unsigned *indent,
+                 const char *message, ...)

 {
   va_list args;
   indent_ptr = indent;
   va_start (args, message);
 {
   va_list args;
   indent_ptr = indent;
   va_start (args, message);

-  complains (&loc, flags, message, args);
+  complains (loc, flags, message, args);

   va_end (args);
 }
   va_end (args);
 }

+
+void
+complain_args (location const *loc, warnings w, unsigned *indent,
+               int argc, char *argv[])
+{
+  switch (argc)
+  {
+  case 2:
+    complain_indent (loc, w, indent, "%s", _(argv[1]));
+    break;
+  case 3:
+    complain_indent (loc, w, indent, _(argv[1]), argv[2]);
+    break;
+  case 4:
+    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3]);
+    break;
+  case 5:
+    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4]);
+    break;
+  case 6:
+    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4],
+                     argv[5]);
+    break;
+  default:
+    complain (loc, fatal, "too many arguments for complains");
+    break;
+  }
+}