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 3dcd007b038bab8331bd7fc8370b361ee7276e22..068b308a8d8bb846b26fedde747a988262d95dc9 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,6 @@
-/* system-dependent definitions for Bison.
-   Copyright (C) 2000, 2001, 2002 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,30 +19,15 @@
 #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
 

-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# define alloca(Size) __builtin_alloca (Size)
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
+#include <stddef.h>

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

-#include <assert.h>
+/* 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 <sys/types.h>
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>


@@ -78,52 +64,56 @@ char *alloca ();
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 

-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-

 #include <limits.h>
 
 #include <limits.h>
 

-# include "xalloc.h"
+#if HAVE_UINTPTR_T
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# else
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
+# endif
+#else
+/* This isn't perfect, but it's good enough for Bison, which needs
+   only to hash pointers.  */
+typedef size_t uintptr_t;
+#endif
+
+#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);
 
 
 
 /* From xstrndup.c.  */
 char *xstrndup (const char *s, size_t n);
 
 

-/*----------------.
-| Using timevar.  |
-`----------------*/
-
-#include "timevar.h"
-extern int time_report;
-
-

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

-#if !HAVE_DECL_STPCPY
+#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY

 char *stpcpy (char *dest, const char *src);
 #endif
 
 char *stpcpy (char *dest, const char *src);
 #endif
 

-#if !HAVE_DECL_STRCHR
+#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR

 char *strchr (const char *s, int c);
 #endif
 
 char *strchr (const char *s, int c);
 #endif
 

-#if !HAVE_DECL_STRSPN
+#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN

 size_t strspn (const char *s, const char *accept);
 #endif
 
 size_t strspn (const char *s, const char *accept);
 #endif
 

-#if !HAVE_DECL_STRNLEN
+#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN

 size_t strnlen (const char *s, size_t maxlen);
 #endif
 
 size_t strnlen (const char *s, size_t maxlen);
 #endif
 

-#if !HAVE_DECL_MEMCHR
+#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR

 void *memchr (const void *s, int c, size_t n);
 #endif
 
 void *memchr (const void *s, int c, size_t n);
 #endif
 

-#if !HAVE_DECL_MEMRCHR
+#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR

 void *memrchr (const void *s, int c, size_t n);
 #endif
 
 void *memrchr (const void *s, int c, size_t n);
 #endif
 


@@ -133,6 +123,14 @@ void *memrchr (const void *s, int c, size_t n);
 | 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.  */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \


@@ -160,14 +158,14 @@ void *memrchr (const void *s, int c, size_t n);
 | 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
 

-#include "gettext.h"
+#include <gettext.h>

 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 


@@ -188,7 +186,19 @@ void *memrchr (const void *s, int c, size_t n);
 #if HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
 #if HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

-typedef enum {false = 0, true = 1} bool;
+# 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
 
 


@@ -198,7 +208,7 @@ typedef enum {false = 0, true = 1} 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))


@@ -239,17 +249,17 @@ do {                                                              \
 
 #ifdef VMS
   /* VMS. */
 
 #ifdef VMS
   /* VMS. */

-# define EXT_TAB       "_tab"
-# define EXT_OUTPUT    ".output"
+# 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 TAB_EXT      "_tab"
+#  define OUTPUT_EXT   ".out"

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

-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
+#  define TAB_EXT      ".tab"
+#  define OUTPUT_EXT   ".output"

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