Use ASCII for Sebastien Fricker's name.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 45427449e4f34f96c7f7644d19e0cfba9692d85a..985bbbeed46349fc647588596e95d03df8418a67 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,7 @@
-/* system-dependent definitions for Bison.
-   Copyright 2000, 2001, 2002  Free Software Foundation, Inc.
+/* System-dependent definitions for Bison.
+
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 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
 
    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


@@ -13,182 +15,132 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

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

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#include <assert.h>
-
-#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
+/* 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
 

-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-#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 */
-
-#if defined(STDC_HEADERS) || defined(HAVE_CTYPE_H)
-# include <ctype.h>
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# 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
-
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* FIXME: Autoconfiscate. */

 #include <limits.h>
 #include <limits.h>

+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

 
 

-# include "xalloc.h"
-
-/* From xstrndup.c.  */
-char *xstrndup PARAMS ((const char *s, size_t n));
-
-/*---------------------.
-| Missing prototypes.  |
-`---------------------*/
-
-#if !HAVE_DECL_STPCPY
-char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-#if !HAVE_DECL_STRCHR
-char *strchr(const char *s, int c);
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>

 #endif
 
 #endif
 

-#if !HAVE_DECL_STRSPN
-size_t strspn(const char *s, const char *accept);
-#endif
+#include <unistd.h>
+#include <inttypes.h>

 
 

-#if !HAVE_DECL_STRNLEN
-size_t strnlen PARAMS ((const char *s, size_t maxlen));
+#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_DECL_MEMCHR
-void *memchr PARAMS ((const void *s, int c, size_t n));
-#endif

 
 

-#if !HAVE_DECL_MEMRCHR
-void *memrchr PARAMS ((const void *s, int c, size_t n));
-#endif
+/*---------.
+| Gnulib.  |
+`---------*/

 
 

+#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
+

 #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
 #  define __attribute__(Spec) /* empty */
 # endif

+#endif
+

 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __format__ format
+# define __printf__ printf

 #endif
 
 #endif
 

+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
+#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)

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

-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#ifndef 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.  |
 `-----------*/
 

-#ifndef TRUE
-# define TRUE  (1)
-# define FALSE (0)
-#endif
-typedef int bool;
+#include <stdbool.h>
+
+
+
+/*-------------.
+| Assertions.  |
+`-------------*/
+
+/* <assert.h>'s assertions are too heavyweight, and can be disabled
+   too easily, so use aver rather than assert.  */
+static inline void
+aver (bool assertion)
+{
+  if (! assertion)
+    abort ();
+}

 
 
 /*-----------.
 | 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))


@@ -227,27 +179,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"
-# define EXT_STYPE_H   "_stype"
-# define EXT_GUARD_C   "_guard"
-#else /* ! VMS */
-# ifdef MSDOS
-   /* MS DOS. */
-#  define EXT_TAB      "_tab"
-#  define EXT_OUTPUT   ".out"
-#  define EXT_STYPE_H  ".sth"
-#  define EXT_GUARD_C  ".guc"
-# else /* ! MSDOS */
-  /* Standard. */
-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
-#  define EXT_STYPE_H  ".stype"
-#  define EXT_GUARD_C  ".guard"
-# 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"


@@ -265,7 +203,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)