c++: style: use "unsigned", not "unsigned int"

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 6a871d8290e9a6844b43acf1f676a7de3d66f3cc..63347785c38b6a040cbf6a654a754207ed9cc0f3 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

-   Copyright (C) 2000-2002, 2006, 2009-2012 Free Software Foundation,
+   Copyright (C) 2000-2002, 2006, 2009-2015 Free Software Foundation,

    Inc.
 
    This program is free software: you can redistribute it and/or modify
    Inc.
 
    This program is free software: you can redistribute it and/or modify


@@ -22,40 +22,89 @@
 # include "location.h"
 
 /* Sub-messages indent. */
 # include "location.h"
 
 /* Sub-messages indent. */

-#define SUB_INDENT (4)
+# define SUB_INDENT (4)

 
 /*-------------.
 | --warnings.  |
 `-------------*/
 
 
 /*-------------.
 | --warnings.  |
 `-------------*/
 

+/** The bits assigned to each warning type.  */

 typedef enum
   {
 typedef enum
   {

-    Wnone             = 0,       /**< Issue no warnings.  */
-    Wmidrule_values   = 1 << 0,  /**< Unset or unused midrule values.  */
-    Wyacc             = 1 << 1,  /**< POSIXME.  */
-    Wconflicts_sr     = 1 << 2,  /**< S/R conflicts.  */
-    Wconflicts_rr     = 1 << 3,  /**< R/R conflicts.  */
-    Wdeprecated       = 1 << 4,  /**< Obsolete constructs.  */
-    Wother            = 1 << 5,  /**< All other warnings.  */
+    warning_midrule_values, /**< Unset or unused midrule values.  */
+    warning_yacc,           /**< POSIXME.  */
+    warning_conflicts_sr,   /**< S/R conflicts.  */
+    warning_conflicts_rr,   /**< R/R conflicts.  */
+    warning_empty_rule,     /**< Implicitly empty rules.  */
+    warning_deprecated,     /**< Obsolete constructs.  */
+    warning_precedence,     /**< Useless precedence and associativity.  */
+    warning_other,          /**< All other warnings.  */
+
+    warnings_size           /**< The number of warnings.  Must be last.  */
+  } warning_bit;
+
+/** Whether -Werror was set. */
+extern bool warnings_are_errors;
+
+/** Decode a single argument from -W.
+ *
+ *  \param arg      the subarguments to decode.
+ *                  If null, then activate all the flags.
+ *  \param no       length of the potential "no-" prefix.
+ *                  Can be 0 or 3. If 3, negate the action of the subargument.
+ *  \param err      length of a potential "error=".
+ *                  Can be 0 or 6. If 6, treat the subargument as a CATEGORY.
+ *
+ *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
+ *  If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
+ *  flags from \c all.  Thus no-none = all and no-all = none.
+ */
+void warning_argmatch (char const *arg, size_t no, size_t err);
+
+/** Decode a comma-separated list of arguments from -W.
+ *
+ *  \param args     comma separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ */
+void warnings_argmatch (char *args);
+
+
+/*-----------.
+| complain.  |
+`-----------*/
+
+/** Initialize this module.  */
+void complain_init (void);
+
+typedef enum
+  {
+    /**< Issue no warnings.  */
+    Wnone             = 0,
+
+    Wmidrule_values   = 1 << warning_midrule_values,
+    Wyacc             = 1 << warning_yacc,
+    Wconflicts_sr     = 1 << warning_conflicts_sr,
+    Wconflicts_rr     = 1 << warning_conflicts_rr,
+    Wdeprecated       = 1 << warning_deprecated,
+    Wempty_rule       = 1 << warning_empty_rule,
+    Wprecedence       = 1 << warning_precedence,
+    Wother            = 1 << warning_other,

 
     Werror            = 1 << 10, /** This bit is no longer used. */
 
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */
 
     Werror            = 1 << 10, /** This bit is no longer used. */
 
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */

+    no_caret          = 1 << 14, /**< Do not display caret location.  */

 
     /**< All above warnings.  */
 
     /**< All above warnings.  */

-    Wall              = ~complaint & ~fatal & ~silent
+    Weverything       = ~complaint & ~fatal & ~silent,
+    Wall              = Weverything & ~Wyacc

   } warnings;
 
   } warnings;
 

-/** What warnings are issued.  */
-extern warnings warnings_flag;
-
-/** What warnings are made errors.  */
-extern warnings errors_flag;
-
-/** Display a "[-Wyacc]" like message on stderr.  */
-void warnings_print_categories (warnings warn_flags);
+/** Whether the warnings of \a flags are all unset.
+    (Never enabled, never disabled). */
+bool warning_is_unset (warnings flags);

 
 /** Make a complaint, with maybe a location.  */
 void complain (location const *loc, warnings flags, char const *message, ...)
 
 /** Make a complaint, with maybe a location.  */
 void complain (location const *loc, warnings flags, char const *message, ...)


@@ -70,7 +119,26 @@ void complain_indent (location const *loc, warnings flags, unsigned *indent,
                       char const *message, ...)
   __attribute__ ((__format__ (__printf__, 4, 5)));
 
                       char const *message, ...)
   __attribute__ ((__format__ (__printf__, 4, 5)));
 

+
+/** Report an obsolete syntax, suggest the updated one.  */
+void deprecated_directive (location const *loc,
+                           char const *obsolete, char const *updated);
+
+/** Report a repeated directive for a rule.  */
+void duplicate_directive (char const *directive,
+                          location first, location second);
+
+/** Warnings treated as errors shouldn't stop the execution as regular
+    errors should (because due to their nature, it is safe to go
+    on). Thus, there are three possible execution statuses.  */
+typedef enum
+  {
+    status_none,             /**< No diagnostic issued so far.  */
+    status_warning_as_error, /**< A warning was issued (but no error).  */
+    status_complaint         /**< An error was issued.  */
+  } err_status;
+

 /** Whether an error was reported.  */
 /** Whether an error was reported.  */

-extern bool complaint_issued;
+extern err_status complaint_status;

 
 #endif /* !COMPLAIN_H_ */
 
 #endif /* !COMPLAIN_H_ */