X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1f65350a16be6a090cf19bad626e191c67159a19..49e8e901fb79304bd9ef106d6cf72e055d9f204d:/src/system.h diff --git a/src/system.h b/src/system.h index 62640c5c..97a92257 100644 --- a/src/system.h +++ b/src/system.h @@ -1,11 +1,11 @@ /* System-dependent definitions for Bison. - Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2000-2007, 2009-2011 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 @@ -13,57 +13,53 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #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];} - #if HAVE_SYS_TYPES_H # include #endif -#if HAVE_UNISTD_H -# include -#endif - -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_STDINT_H -# include -#endif +#include +#include -#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 -#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))) - -/*---------------------. -| Missing prototypes. | -`---------------------*/ +/*---------. +| Gnulib. | +`---------*/ -#include +#include +#include +#include /*-----------------. @@ -80,8 +76,8 @@ typedef size_t uintptr_t; #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 +97,8 @@ typedef size_t uintptr_t; # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) #endif +#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__) + /*------. | NLS. | `------*/ @@ -112,15 +110,6 @@ typedef size_t uintptr_t; #define N_(Msgid) (Msgid) -/*-------------------------------. -| Fix broken compilation flags. | -`-------------------------------*/ - -#ifndef LOCALEDIR -# define LOCALEDIR "/usr/local/share/locale" -#endif - - /*-----------. | Booleans. | `-----------*/ @@ -128,13 +117,40 @@ typedef size_t uintptr_t; #include + +/*-------------. +| Assertions. | +`-------------*/ + +/* In the past, Bison defined aver to simply invoke abort in the case of + a failed assertion. The rationale was that 's assertions + were too heavyweight and could be disabled too easily. See + discussions at + + . + + However, normal assert output can be helpful during development and + in bug reports from users. Moreover, it's not clear now that + 's assertions are significantly heavyweight. Finally, if + users want to experiment with disabling assertions, it's debatable + whether it's our responsibility to stop them. See discussion + starting at + . + + For now, we use assert but we call it aver throughout Bison in case + we later wish to try another scheme. +*/ +#include +#define aver assert + + /*-----------. | 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)) @@ -173,21 +189,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" @@ -205,7 +213,7 @@ do { \ for (_node = List; _node; _node = _next) \ { \ _next = _node->next; \ - XFREE (_node); \ + free (_node); \ } \ } while (0)