X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f61aad93992064785ef0f74d9bd5d19f016ba390..927b425baae16fc1d50e092b78b944e281b521f6:/src/system.h?ds=sidebyside diff --git a/src/system.h b/src/system.h index a1fee01c..63157904 100644 --- a/src/system.h +++ b/src/system.h @@ -1,6 +1,7 @@ /* 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 @@ -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, - 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 -#if HAVE_CONFIG_H -# include +/* flex 2.5.31 gratutiously defines macros like INT8_MIN. But this + runs afoul of pre-C99 compilers that have or + , which are included below if available. It also runs + afoul of pre-C99 compilers that define these macros in . */ +#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 #include -#include +#include +#include -/* 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 #endif -#if HAVE_STDLIB_H -# include -#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 #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include -/* An ANSI string.h and pre-ANSI memory.h might conflict. */ -# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -# endif /* not STDC_HEADERS and HAVE_MEMORY_H */ -#else /* not STDC_HEADERS and not HAVE_STRING_H */ -# include -/* memory.h and strings.h conflict on some systems. */ -#endif /* not STDC_HEADERS and not HAVE_STRING_H */ - -#include +#if HAVE_INTTYPES_H +# include +#endif +#if HAVE_STDINT_H +# include +#endif -#if HAVE_UINTPTR_T -# if HAVE_INTTYPES_H -# include -# else -# if HAVE_STDINT_H -# include -# 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 +#include #include -#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. | `---------------------*/ -#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 +/* From lib/basename.c. */ +char *base_name (char const *name); /*-----------------. @@ -133,8 +92,8 @@ void *memrchr (const void *str, int ch, size_t size); #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 @@ -158,12 +117,7 @@ void *memrchr (const void *str, int ch, size_t size); | NLS. | `------*/ -#if HAVE_LOCALE_H -# include -#endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) -#endif +#include #include #define _(Msgid) gettext (Msgid) @@ -190,9 +144,9 @@ void *memrchr (const void *str, int ch, size_t size); | Obstacks. | `-----------*/ -# define obstack_chunk_alloc xmalloc -# define obstack_chunk_free free -# include +#define obstack_chunk_alloc xmalloc +#define obstack_chunk_free free +#include #define obstack_sgrow(Obs, Str) \ obstack_grow (Obs, Str, strlen (Str)) @@ -231,21 +185,13 @@ do { \ | 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" @@ -263,11 +209,16 @@ do { \ for (_node = List; _node; _node = _next) \ { \ _next = _node->next; \ - XFREE (_node); \ + free (_node); \ } \ } while (0) +/* Assertions. '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). | `---------------------------------------------*/