X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7625ec2c8305644991a041afb1c9a707e96e3d93..4654b0c0a8a355e7a8fcdf51b1a5eb6c485126f1:/src/system.h diff --git a/src/system.h b/src/system.h index 9b874b95..57a432d0 100644 --- a/src/system.h +++ b/src/system.h @@ -1,12 +1,12 @@ /* System-dependent definitions for Bison. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 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 + 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 - 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 @@ -14,14 +14,25 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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> @@ -29,41 +40,27 @@ #include <stdlib.h> #include <string.h> -#include "unlocked-io.h" - #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 -#include <verify.h> -#include <xalloc.h> - - -/*---------------------. -| Missing prototypes. | -`---------------------*/ -#include <stpcpy.h> +/*---------. +| Gnulib. | +`---------*/ -/* From lib/basename.c. */ -char *base_name (char const *name); +#include <unlocked-io.h> +#include <verify.h> +#include <xalloc.h> /*-----------------. @@ -80,8 +77,8 @@ char *base_name (char const *name); #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 @@ -101,6 +98,8 @@ char *base_name (char const *name); # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) #endif +#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__) + /*------. | NLS. | `------*/ @@ -112,15 +111,6 @@ char *base_name (char const *name); #define N_(Msgid) (Msgid) -/*-------------------------------. -| Fix broken compilation flags. | -`-------------------------------*/ - -#ifndef LOCALEDIR -# define LOCALEDIR "/usr/local/share/locale" -#endif - - /*-----------. | Booleans. | `-----------*/ @@ -128,6 +118,21 @@ char *base_name (char const *name); #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. | `-----------*/