Generalize the display of semantic values and locations in traces.

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index 0e527c4527e1dbdab1b6a44f212ab0c23f5d00a3..9ae334a4b3fbe3646394493c1e5d4502cfe1f4ac 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -13,7 +13,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef COMPLAIN_H_
@@ -25,33 +25,30 @@
 extern "C" {
 # endif
 
-/* Informative messages, but we proceed. */
+/* Informative messages, but we proceed.  */
 
-void warn (const char *format, ...)
+void warn (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
 
-void warn_at (location_t location, const char *format, ...)
+void warn_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happen, but let's continue and die later. */
+/* Something bad happened, but let's continue and die later.  */
 
-void complain (const char *format, ...)
+void complain (char const *format, ...)
   __attribute__ ((__format__ (__printf__, 1, 2)));
 
-void complain_at (location_t location, const char *format, ...)
+void complain_at (location loc, char const *format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Something bad happen and we die now. */
+/* Something bad happened, and let's die now.  */
 
-void fatal (const char *format, ...)
+void fatal (char const *format, ...)
   __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)));
 
-void fatal_at (location_t location, const char *format, ...)
+void fatal_at (location loc, char const *format, ...)
   __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
 
-/* Position in the current input file. */
-extern char *infile;
-
 /* This variable is set each time `warn' is called.  */
 extern bool warning_issued;