2007-02-07 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 62640c5cc9280b693556b18cc31e2588139e14cd..985bbbeed46349fc647588596e95d03df8418a67 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,7 @@
 /* System-dependent definitions for Bison.
 
 /* System-dependent definitions for Bison.
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   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


@@ -14,56 +15,53 @@
 
    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
 

-#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
 
 #include <limits.h>
 #include <stddef.h>
 #endif
 
 #include <limits.h>
 #include <stddef.h>

-#include <stdio.h>

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

-/* Verify a requirement at compile-time (unlike assert, which is runtime).  */
-#define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}
-

 #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
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <unistd.h>
+#include <inttypes.h>

 
 

-#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 <xalloc.h>
-#define CALLOC(P, N) ((P) = xcalloc (N, sizeof *(P)))
-#define MALLOC(P, N) ((P) = xnmalloc (N, sizeof *(P)))
-#define REALLOC(P, N) ((P) = xnrealloc (P, N, sizeof *(P)))

 
 

+/*---------.
+| Gnulib.  |
+`---------*/

 
 

-/*---------------------.
-| Missing prototypes.  |
-`---------------------*/
-
-#include <stpcpy.h>
+#include <unlocked-io.h>
+#include <verify.h>
+#include <xalloc.h>

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


@@ -80,8 +78,8 @@ typedef size_t uintptr_t;
 
 #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


@@ -101,6 +99,8 @@ typedef size_t uintptr_t;
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

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

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


@@ -112,15 +112,6 @@ typedef size_t uintptr_t;
 #define N_(Msgid) (Msgid)
 
 
 #define N_(Msgid) (Msgid)
 
 

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

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


@@ -128,13 +119,28 @@ typedef size_t uintptr_t;
 #include <stdbool.h>
 
 
 #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))


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

-#ifdef VMS
-  /* VMS. */
-# define TAB_EXT       "_tab"
-# define OUTPUT_EXT    ".output"
-#else /* ! VMS */
-# ifdef MSDOS
-   /* MS DOS. */
-#  define TAB_EXT      "_tab"
-#  define OUTPUT_EXT   ".out"
-# else /* ! MSDOS */
-  /* Standard. */
-#  define TAB_EXT      ".tab"
-#  define OUTPUT_EXT   ".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"


@@ -205,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)