Java: Fix syntax error handling without error token.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index d6b45eeb908b973e5fcf00ab91b439772c463185..9191b55608cb3168569ebef049a0838ce5e804d8 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,12 +1,11 @@
 /* System-dependent definitions for Bison.
 
 /* System-dependent definitions for Bison.
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
-   Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2012 Free Software Foundation, Inc.

 
 

-   This program is free software; you can redistribute it and/or modify
+   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
    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.
+   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,8 +13,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/>.  */

 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H


@@ -41,59 +39,53 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "unlocked-io.h"
-

 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 

-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <inttypes.h>

 
 

-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-#if ! HAVE_UINTPTR_T
+#ifndef UINTPTR_MAX

 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
 #endif
 
 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
 #endif
 

-#include <verify.h>
-#include <xalloc.h>
-
-
-/*---------------------.
-| Missing prototypes.  |
-`---------------------*/
+// Version mismatch.
+#define EX_MISMATCH 63

 
 

-#include <stpcpy.h>
+/*---------.
+| Gnulib.  |
+`---------*/

 
 

-/* From lib/basename.c. */
-char *base_name (char const *name);
+#include <unlocked-io.h>
+#include <verify.h>
+#include <xalloc.h>

 
 
 /*-----------------.
 | GCC extensions.  |
 `-----------------*/
 
 
 
 /*-----------------.
 | GCC extensions.  |
 `-----------------*/
 

-/* Use this to suppress gcc's `...may be used before initialized'
-   warnings.  */
-#ifdef lint
-# define IF_LINT(Code) Code
-#else
-# define IF_LINT(Code) /* empty */
-#endif
+/* Use PACIFY_CC to indicate that Code is unimportant to the logic of Bison
+   but that it is necessary for suppressing compiler warnings.  For example,
+   Code might be a variable initializer that's always overwritten before the
+   variable is used.
+
+   PACIFY_CC is intended to be useful only as a comment as it does not alter
+   Code.  It is tempting to redefine PACIFY_CC so that it will suppress Code
+   when configuring without --enable-gcc-warnings.  However, that would mean
+   that, for maintainers, Bison would compile with potentially less warnings
+   and safer logic than it would for users.  Due to the overhead of M4,
+   suppressing Code is unlikely to offer any significant improvement in
+   Bison's performance anyway.  */
+#define PACIFY_CC(Code) Code

 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */

-# if !defined (__GNUC__) || __GNUC__ < 2 || \
-(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)

 #  define __attribute__(Spec) /* empty */
 # endif
 #endif
 #  define __attribute__(Spec) /* empty */
 # endif
 #endif


@@ -113,6 +105,8 @@ char *base_name (char const *name);
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

+#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
+

 /*------.
 | NLS.  |
 `------*/
 /*------.
 | NLS.  |
 `------*/


@@ -124,15 +118,6 @@ char *base_name (char const *name);
 #define N_(Msgid) (Msgid)
 
 
 #define N_(Msgid) (Msgid)
 
 

-/*-------------------------------.
-| Fix broken compilation flags.  |
-`-------------------------------*/
-
-#ifndef LOCALEDIR
-# define LOCALEDIR "/usr/local/share/locale"
-#endif
-
-

 /*-----------.
 | Booleans.  |
 `-----------*/
 /*-----------.
 | Booleans.  |
 `-----------*/


@@ -140,6 +125,33 @@ char *base_name (char const *name);
 #include <stdbool.h>
 
 
 #include <stdbool.h>
 
 

+
+/*-------------.
+| Assertions.  |
+`-------------*/
+
+/* In the past, Bison defined aver to simply invoke abort in the case of
+   a failed assertion.  The rationale was that <assert.h>'s assertions
+   were too heavyweight and could be disabled too easily.  See
+   discussions at
+   <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00080.html>
+   <http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00111.html>.
+
+   However, normal assert output can be helpful during development and
+   in bug reports from users.  Moreover, it's not clear now that
+   <assert.h>'s assertions are significantly heavyweight.  Finally, if
+   users want to experiment with disabling assertions, it's debatable
+   whether it's our responsibility to stop them.  See discussion
+   starting at
+   <http://lists.gnu.org/archive/html/bison-patches/2009-09/msg00013.html>.
+
+   For now, we use assert but we call it aver throughout Bison in case
+   we later wish to try another scheme.
+*/
+#include <assert.h>
+#define aver assert
+
+

 /*-----------.
 | Obstacks.  |
 `-----------*/
 /*-----------.
 | Obstacks.  |
 `-----------*/


@@ -214,11 +226,6 @@ do {                                               \
 } while (0)
 
 
 } while (0)
 
 

-/* Assertions.  <assert.h>'s assertions are too heavyweight, and can
-   be disabled too easily, so implement it separately here.  */
-#define assert(x) ((void) ((x) || (abort (), 0)))
-
-

 /*---------------------------------------------.
 | Debugging memory allocation (must be last).  |
 `---------------------------------------------*/
 /*---------------------------------------------.
 | Debugging memory allocation (must be last).  |
 `---------------------------------------------*/