maint: more syntax-checks

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index c0de06d7ab0f63c50b260680621f3cd912c616f1..984b13610d8297fe465962926634a9bd5f03c713 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -34,7 +34,7 @@ warnings warnings_flag =
 
 warnings errors_flag;
 
 
 warnings errors_flag;
 

-bool complaint_issued;
+err_status complaint_status = status_none;

 static unsigned *indent_ptr = 0;
 
 void
 static unsigned *indent_ptr = 0;
 
 void


@@ -84,7 +84,6 @@ 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)
   unsigned pos = 0;
 
   if (loc)


@@ -95,6 +94,8 @@ error_message (const location *loc, warnings flags, const char *prefix,
 
   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)


@@ -109,41 +110,40 @@ error_message (const location *loc, warnings flags, const char *prefix,
   warnings_print_categories (flags);
   {
     size_t l = strlen (message);
   warnings_print_categories (flags);
   {
     size_t l = strlen (message);

-    if (l < 2 || message[l-2] != ':' || message[l-1] != ' ')
+    if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')

       {
         putc ('\n', stderr);
         fflush (stderr);
       {
         putc ('\n', stderr);
         fflush (stderr);

+        if (loc && feature_flag & feature_caret && !(flags & no_caret))
+          location_caret (stderr, *loc);

       }
   }
       }
   }

+  fflush (stderr);

 }
 
 /** 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");
+
+  if ((flags & complaint) && complaint_status < status_complaint)
+    complaint_status = status_complaint;
+  else if ((flags & (warnings_flag & errors_flag)) && ! complaint_status)
+    complaint_status = status_warning_as_error;
+  if (flags & (warnings_flag | 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,35 +152,37 @@ 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);
 }
 
 void
   va_end (args);
 }
 
 void

-complain_args (location const *loc, warnings w, int argc, char *argv[])
+complain_args (location const *loc, warnings w, unsigned *indent,
+               int argc, char *argv[])

 {
   switch (argc)
   {
 {
   switch (argc)
   {

+  case 1:
+    complain_indent (loc, w, indent, "%s", _(argv[0]));
+    break;

   case 2:
   case 2:

-    complain (loc, w, "%s", _(argv[1]));
+    complain_indent (loc, w, indent, _(argv[0]), argv[1]);

     break;
   case 3:
     break;
   case 3:

-    complain (loc, w, _(argv[1]), argv[2]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);

     break;
   case 4:
     break;
   case 4:

-    complain (loc, w, _(argv[1]), argv[2], argv[3]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]);

     break;
   case 5:
     break;
   case 5:

-    complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4]);
-    break;
-  case 6:
-    complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3],
+                     argv[4]);

     break;
   default:
     complain (loc, fatal, "too many arguments for complains");
     break;
   default:
     complain (loc, fatal, "too many arguments for complains");