X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f60321dc590673828a6b6aed652523927d11adc8..efbc95a7e4fcba4363372df34f183d7db89a85a6:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 0fa812ab..5a1b45a4 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 @@ -49,6 +50,7 @@ warnings_print_categories (warnings warn_flags) "conflicts-sr", "conflicts-rr", "deprecated", + "precedence", "other" }; @@ -87,7 +89,7 @@ error_message (const location *loc, warnings flags, const char *prefix, unsigned pos = 0; if (loc) - pos += location_print (stderr, *loc); + pos += location_print (*loc, stderr); else pos += fprintf (stderr, "%s", current_file ? current_file : program_name); pos += fprintf (stderr, ": "); @@ -110,12 +112,15 @@ 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 (*loc, stderr); } } + fflush (stderr); } /** Raise a complaint. That can be a fatal error, a complaint or just a @@ -129,8 +134,11 @@ complains (const location *loc, warnings flags, const char *message, : 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); @@ -182,4 +190,18 @@ complain_args (location const *loc, warnings w, unsigned *indent, 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)); }