Be a bit more systematic about using 'abort'.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 0b11dbe693c256f2fc56efb11e014f38e8b978b8..d6b45eeb908b973e5fcf00ab91b439772c463185 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 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 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,109 +15,67 @@
 
    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
 
 #endif
 

+#include <limits.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <stdio.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];}
+#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_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
-
-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-#endif
-

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

 
 

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

 /* 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>
 #include <xalloc.h>

-#define CALLOC(P, N) ((P) = xcalloc (N, sizeof *(P)))
-#define MALLOC(P, N) ((P) = xmalloc ((N) * sizeof *(P)))
-#define REALLOC(P, N) ((P) = xrealloc (P, (N) * sizeof *(P)))
-
-/* From xstrndup.c.  */
-char *xstrndup (const char *str, size_t size);

 
 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 
 
 
 /*---------------------.
 | 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 *str, int ch);
-#endif
-
-#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
-size_t strspn (const char *str, const char *accept);
-#endif
-
-#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
-size_t strnlen (const char *str, size_t maxlen);
-#endif
-
-#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
-void *memchr (const void *str, int ch, size_t size);
-#endif
-
-#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
-void *memrchr (const void *str, int ch, size_t size);
-#endif
+#include <stpcpy.h>

 
 

+/* From lib/basename.c. */
+char *base_name (char const *name);

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


@@ -158,12 +117,7 @@ void *memrchr (const void *str, int ch, size_t size);
 | NLS.  |
 `------*/
 
 | NLS.  |
 `------*/
 

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

 
 #include <gettext.h>
 #define _(Msgid)  gettext (Msgid)
 
 #include <gettext.h>
 #define _(Msgid)  gettext (Msgid)


@@ -183,32 +137,16 @@ void *memrchr (const void *str, int ch, size_t size);
 | Booleans.  |
 `-----------*/
 
 | Booleans.  |
 `-----------*/
 

-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef __bool_true_false_are_defined
-#  if ! HAVE__BOOL
-#   ifdef __cplusplus
-typedef bool _Bool;
-#   else
-typedef unsigned char _Bool;
-#   endif
-#  endif
-#  define bool _Bool
-#  define false 0
-#  define true 1
-#  define __bool_true_false_are_defined 1
-# endif
-#endif
+#include <stdbool.h>

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


@@ -247,21 +185,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"


@@ -279,11 +209,16 @@ 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)
 
 

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