yysyntax_error: fix for consistent error with lookahead.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index e297f608cacdde8aa4401339e94a6c2599f16128..0bd684f0ad1ddf18bf9a93a6c9cf8735d3c3824e 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,10 +1,12 @@
-/* system-dependent definitions for Bison.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* System-dependent definitions for Bison.

 
 

-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+   2010 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
    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


@@ -12,117 +14,53 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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
 

-#if HAVE_CONFIG_H
-# include <config.h>
+/* flex 2.5.31 gratutiously defines macros like INT8_MIN.  But this
+   runs afoul of pre-C99 compilers that have <inttypes.h> or
+   <stdint.h>, which are included below if available.  It also runs
+   afoul of pre-C99 compilers that define these macros in <limits.h>.  */
+#if ! defined __STDC_VERSION__ || __STDC_VERSION__ < 199901
+# undef INT8_MIN
+# undef INT16_MIN
+# undef INT32_MIN
+# undef INT8_MAX
+# undef INT16_MAX
+# undef UINT8_MAX
+# undef INT32_MAX
+# undef UINT16_MAX
+# undef UINT32_MAX

 #endif
 
 #endif
 

-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# define alloca(Size) __builtin_alloca (Size)
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdio.h>
-
-#include <assert.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

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

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-/* The following test is to work around the gross typo in
-   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
-   is defined to 0, not 1.  */
-#if !EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include <unistd.h>
+#include <inttypes.h>

 
 

-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
+#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
 
 #endif
 

-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems.  */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
-
-#include <errno.h>
-#include <limits.h>

 
 

-# include "xalloc.h"
-
-/* From xstrndup.c.  */
-char *xstrndup (const char *s, size_t n);
-
-
-/*----------------.
-| Using timevar.  |
-`----------------*/
-
-#include "timevar.h"
-extern int time_report;
-
-
-/*---------------------.
-| Missing prototypes.  |
-`---------------------*/
-
-#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY
-char *stpcpy (char *dest, const char *src);
-#endif
-
-#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR
-char *strchr (const char *s, int c);
-#endif
-
-#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
-size_t strspn (const char *s, const char *accept);
-#endif
-
-#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
-size_t strnlen (const char *s, size_t maxlen);
-#endif
-
-#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
-void *memchr (const void *s, int c, size_t n);
-#endif
-
-#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
-void *memrchr (const void *s, int c, size_t n);
-#endif
+/*---------.
+| Gnulib.  |
+`---------*/

 
 

+#include <unlocked-io.h>
+#include <verify.h>
+#include <xalloc.h>

 
 
 /*-----------------.
 
 
 /*-----------------.


@@ -139,8 +77,8 @@ void *memrchr (const void *s, int c, size_t n);
 
 #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


@@ -160,49 +98,60 @@ void *memrchr (const void *s, int c, size_t n);
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

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

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

-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale)
-#endif
+#include <locale.h>

 
 

-#include "gettext.h"
+#include <gettext.h>

 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 

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

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

-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-typedef enum {false = 0, true = 1} bool;
-#endif
+#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.  |
 `-----------*/
 

-# define obstack_chunk_alloc xmalloc
-# define obstack_chunk_free  free
-# include "obstack.h"
+#define obstack_chunk_alloc xmalloc
+#define obstack_chunk_free  free
+#include <obstack.h>

 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))


@@ -241,21 +190,13 @@ do {                                                              \
 | Extensions to use for the output files.  |
 `-----------------------------------------*/
 
 | Extensions to use for the output files.  |
 `-----------------------------------------*/
 

-#ifdef VMS
-  /* VMS. */
-# define EXT_TAB       "_tab"
-# define EXT_OUTPUT    ".output"
-#else /* ! VMS */
-# ifdef MSDOS
-   /* MS DOS. */
-#  define EXT_TAB      "_tab"
-#  define EXT_OUTPUT   ".out"
-# else /* ! MSDOS */
-  /* Standard. */
-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
-# endif /* ! MSDOS */
-#endif /* ! VMS */
+#ifndef OUTPUT_EXT
+# define OUTPUT_EXT ".output"
+#endif
+
+#ifndef TAB_EXT
+# define TAB_EXT ".tab"
+#endif

 
 #ifndef DEFAULT_TMPDIR
 # define DEFAULT_TMPDIR "/tmp"
 
 #ifndef DEFAULT_TMPDIR
 # define DEFAULT_TMPDIR "/tmp"


@@ -273,7 +214,7 @@ do {                                                \
   for (_node = List; _node; _node = _next)     \
     {                                          \
       _next = _node->next;                     \
   for (_node = List; _node; _node = _next)     \
     {                                          \
       _next = _node->next;                     \

-      XFREE (_node);                           \
+      free (_node);                            \

     }                                          \
 } while (0)
 
     }                                          \
 } while (0)