Do not let the scan-skel token buffer grow unboundedly in the usual case.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index b8a73edbdc27effa05559fc53000a395976277f6..068b308a8d8bb846b26fedde747a988262d95dc9 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,6 @@
-/* system-dependent definitions for Bison.
-   Copyright 2000 Free Software Foundation, Inc.
+/* System-dependent definitions for Bison.
+
+   Copyright (C) 2000, 2001, 2002, 2003 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


@@ -18,22 +19,18 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H

 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

+#include <stddef.h>

 #include <stdio.h>
 
 #include <stdio.h>
 

-#include <assert.h>
-
-#ifdef MSDOS
-# include <io.h>
-#endif
+/* Verify a requirement at compile-time (unlike assert, which is runtime).  */
+#define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}

 
 

-#ifdef _MSC_VER
-# include <stdlib.h>
-# include <process.h>
-# define getpid _getpid
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>

 #endif
 
 #if HAVE_STDLIB_H
 #endif
 
 #if HAVE_STDLIB_H


@@ -62,45 +59,62 @@
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */

-# ifndef bcopy
-#  define bcopy(src, dst, num) memcpy((dst), (src), (num))
-# endif

 #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 */
 
 #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 */
 

-#if defined(STDC_HEADERS) || defined(HAVE_CTYPE_H)
-# include <ctype.h>
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+#include <limits.h>

 
 

-#if PROTOTYPES
-# define PARAMS(p) p
+#if HAVE_UINTPTR_T
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# else
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
+# endif

 #else
 #else

-# define PARAMS(p) ()
+/* This isn't perfect, but it's good enough for Bison, which needs
+   only to hash pointers.  */
+typedef size_t uintptr_t;

 #endif
 
 #endif
 

-# 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 *s, size_t n);
+

 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 
 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 

-#if !HAVE_DECL_STPCPY
-char *stpcpy PARAMS ((char *dest, const char *src));
+#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY
+char *stpcpy (char *dest, const char *src);

 #endif
 
 #endif
 

-#if !HAVE_DECL_STRNDUP
-char *strndup PARAMS ((const char *s, size_t size));
+#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR
+char *strchr (const char *s, int c);

 #endif
 
 #endif
 

-#if !HAVE_DECL_STRNLEN
-size_t strnlen PARAMS ((const char *s, size_t maxlen));
+#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
+size_t strspn (const char *s, const char *accept);
+#endif
+
+#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
+size_t strnlen (const char *s, size_t maxlen);
+#endif
+
+#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
+void *memchr (const void *s, int c, size_t n);
+#endif
+
+#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
+void *memrchr (const void *s, int c, size_t n);

 #endif
 
 
 #endif
 
 


@@ -109,45 +123,51 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 | GCC extensions.  |
 `-----------------*/
 
 | GCC extensions.  |
 `-----------------*/
 

+/* Use this to suppress gcc's `...may be used before initialized'
+   warnings.  */
+#ifdef lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+

 #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 __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
 #  define __attribute__(Spec) /* empty */
 # endif

+#endif
+

 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __format__ format
+# define __printf__ printf

 #endif
 
 #endif
 

+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif

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

-#ifdef HAVE_LOCALE_H
+#if HAVE_LOCALE_H

 # include <locale.h>
 #endif
 # include <locale.h>
 #endif

-#ifndef HAVE_SETLOCALE
+#if !HAVE_SETLOCALE

 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif
 

-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# undef  bindtextdomain
-# define bindtextdomain(Domain, Directory)
-# undef  textdomain
-# define textdomain(Domain)
-# undef  ngettext
-# define ngettext(Singular, Plural, Number)   \
-         ((Number == 1) ? Singular : Plural)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include <gettext.h>
+#define _(Msgid)  gettext (Msgid)
+#define N_(Msgid) (Msgid)

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


@@ -163,11 +183,23 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 | Booleans.  |
 `-----------*/
 
 | Booleans.  |
 `-----------*/
 

-#ifndef TRUE
-# define TRUE  (1)
-# define FALSE (0)
+#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
 #endif

-typedef int bool;

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


@@ -176,7 +208,7 @@ typedef int bool;
 
 # define obstack_chunk_alloc xmalloc
 # define obstack_chunk_free  free
 
 # define obstack_chunk_alloc xmalloc
 # define obstack_chunk_free  free

-# include "obstack.h"
+# 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))


@@ -210,80 +242,37 @@ do {                                                              \
 } while (0)
 
 
 } while (0)
 
 

-/*---------------------------------.
-| Machine-dependencies for Bison.  |
-`---------------------------------*/
-
-#ifdef eta10
-# define       MAXSHORT        2147483647
-# define       MINSHORT        -2147483648
-#else
-# define       MAXSHORT        32767
-# define       MINSHORT        -32768
-#endif

 
 

-#if defined (MSDOS) && !defined (__GO32__)
-# define       BITS_PER_WORD   16
-# define MAXTABLE      16383
-#else
-# define       BITS_PER_WORD   32
-# define MAXTABLE      32767
-#endif
-
-#define        WORDSIZE(n)     (((n) + BITS_PER_WORD - 1) / BITS_PER_WORD)
-#define        SETBIT(x, i)    ((x)[(i)/BITS_PER_WORD] |= (1<<((i) % BITS_PER_WORD)))
-#define RESETBIT(x, i) ((x)[(i)/BITS_PER_WORD] &= ~(1<<((i) % BITS_PER_WORD)))
-#define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0)
-
-
-/* Extensions to use for the output files. */
+/*-----------------------------------------.
+| Extensions to use for the output files.  |
+`-----------------------------------------*/

 
 #ifdef VMS
   /* VMS. */
 
 #ifdef VMS
   /* VMS. */

-# define EXT_TAB       "_tab"
-# define EXT_OUTPUT    ".output"
-# define EXT_STYPE_H   "_stype"
-# define EXT_GUARD_C   "_guard"
+# define TAB_EXT       "_tab"
+# define OUTPUT_EXT    ".output"

 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */
 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */

-#  define EXT_TAB      "_tab"
-#  define EXT_OUTPUT   ".out"
-#  define EXT_STYPE_H  ".sth"
-#  define EXT_GUARD_C  ".guc"
+#  define TAB_EXT      "_tab"
+#  define OUTPUT_EXT   ".out"

 # else /* ! MSDOS */
   /* Standard. */
 # else /* ! MSDOS */
   /* Standard. */

-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
-#  define EXT_STYPE_H  ".stype"
-#  define EXT_GUARD_C  ".guard"
+#  define TAB_EXT      ".tab"
+#  define OUTPUT_EXT   ".output"

 # endif /* ! MSDOS */
 #endif /* ! VMS */
 
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 

-#if defined (VMS) & !defined (__VMS_POSIX)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
-# endif
+#ifndef DEFAULT_TMPDIR
+# define DEFAULT_TMPDIR "/tmp"

 #endif
 
 #endif
 

-#if defined (_MSC_VER)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
-# endif
-#endif

 
 
 
 

-/* As memcpy, but for shorts.  */
-#define shortcpy(Dest, Src, Num) \
-  memcpy (Dest, Src, Num * sizeof (short))
+/*---------------------.
+| Free a linked list.  |
+`---------------------*/

 
 

-/* Free a linked list. */

 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \
 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \


@@ -294,13 +283,14 @@ do {                                              \
     }                                          \
 } while (0)
 
     }                                          \
 } while (0)
 

-/*---------------------------------.
-| Debugging the memory allocator.  |
-`---------------------------------*/
+
+/*---------------------------------------------.
+| Debugging memory allocation (must be last).  |
+`---------------------------------------------*/

 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK
 #  include <dmalloc.h>
 # endif /* WITH_DMALLOC */
 
 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK
 #  include <dmalloc.h>
 # endif /* WITH_DMALLOC */
 

-#endif  /* BISON_SYSTEM_H */
+#endif  /* ! BISON_SYSTEM_H */