* src/gram.c: Remove comments that duplicate comments in gram.h.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index f3cd0ec1b6cdb4c72cd20e99693fc33123036be6..2c26c4e45e445388cdb73590309abd2eb65c4d45 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -3,10 +3,10 @@
    Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
    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
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   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 Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */


@@ -28,10 +26,7 @@
 
 #include "complain.h"
 #include "files.h"
 
 #include "complain.h"
 #include "files.h"

-
-/* The calling program should define program_name and set it to the
-   name of the executing program.  */
-extern char *program_name;
+#include "getargs.h"

 
 bool complaint_issued;
 
 
 bool complaint_issued;
 


@@ -79,15 +74,29 @@ error_message (location *loc,
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 | Report a warning, and proceed.  |
 `--------------------------------*/
 

+static void
+set_warning_issued (void)
+{
+  static bool warning_issued = false;
+  if (!warning_issued && (warnings_flag & warnings_error))
+    {
+      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
+      complaint_issued = true;
+    }
+  warning_issued = true;
+}
+

 void
 warn_at (location loc, const char *message, ...)
 {
 void
 warn_at (location loc, const char *message, ...)
 {

+  set_warning_issued ();

   ERROR_MESSAGE (&loc, _("warning"), message);
 }
 
 void
 warn (const char *message, ...)
 {
   ERROR_MESSAGE (&loc, _("warning"), message);
 }
 
 void
 warn (const char *message, ...)
 {

+  set_warning_issued ();

   ERROR_MESSAGE (NULL, _("warning"), message);
 }
 
   ERROR_MESSAGE (NULL, _("warning"), message);
 }