X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a686f6cdc0077cea9f705f3c87bb8fc4fa27e1b4..70b7c357476ed3525ddb5d2739e70690cfebb207:/src/complain.c

diff --git a/src/complain.c b/src/complain.c
index 926d9013..d43e623e 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2004-2006, 2009-2012 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,13 +28,14 @@
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
+#include "quote.h"
 
 warnings warnings_flag =
   Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;
 
 warnings errors_flag;
 
-bool complaint_issued;
+err_status complaint_status = status_none;
 static unsigned *indent_ptr = 0;
 
 void
@@ -110,36 +111,40 @@ error_message (const location *loc, warnings flags, const char *prefix,
   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);
+        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.  */
-
 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))
+  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)
     exit (EXIT_FAILURE);
 }
 
 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);
@@ -148,38 +153,54 @@ complain (location const* loc, warnings flags, const char *message, ...)
 }
 
 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);
-  complains (&loc, flags, message, args);
+  complains (loc, flags, message, args);
   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)
   {
+  case 1:
+    complain_indent (loc, w, indent, "%s", _(argv[0]));
+    break;
   case 2:
-    complain (loc, w, "%s", _(argv[1]));
+    complain_indent (loc, w, indent, _(argv[0]), argv[1]);
     break;
   case 3:
-    complain (loc, w, _(argv[1]), argv[2]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);
     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:
-    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;
   }
+
+}
+
+void
+deprecated_directive (location const *loc, char const *old, char const *upd)
+{
+  if (feature_flag & feature_caret)
+    complain (loc, Wdeprecated,
+              _("deprecated directive, use %s"),
+              quote_n (1, upd));
+  else
+    complain (loc, Wdeprecated,
+              _("deprecated directive: %s, use %s"),
+              quote (old), quote_n (1, upd));
 }