* src/bison.simple (YYSTACK_REALLOC): Fix typo that caused us to

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 797ae545becc73eadda568bbc92f4f963706a192..70605c499fe5d76023d818e4e5293ca059807066 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -40,6 +40,18 @@
 # include <stdlib.h>
 #endif
 
 # include <stdlib.h>
 #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 <unistd.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif


@@ -67,12 +79,47 @@
 extern int errno;
 #endif
 
 extern int errno;
 #endif
 

+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# 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
+

 #if PROTOTYPES
 # define PARAMS(p) p
 #else
 # define PARAMS(p) ()
 #endif
 
 #if PROTOTYPES
 # define PARAMS(p) p
 #else
 # define PARAMS(p) ()
 #endif
 

+# include "xalloc.h"
+
+/*---------------------.
+| Missing prototypes.  |
+`---------------------*/
+
+#if !HAVE_DECL_STPCPY
+char *stpcpy PARAMS ((char *dest, const char *src));
+#endif
+
+#if !HAVE_DECL_STRNDUP
+char *strndup PARAMS ((const char *s, size_t size));
+#endif
+
+#if !HAVE_DECL_STRNLEN
+size_t strnlen PARAMS ((const char *s, size_t maxlen));
+#endif
+
+
+

 /*-----------------.
 | GCC extensions.  |
 `-----------------*/
 /*-----------------.
 | GCC extensions.  |
 `-----------------*/


@@ -102,17 +149,9 @@ extern int errno;
 # 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)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "intl/libgettext.h"
+#define _(Msgid)  gettext (Msgid)
+#define N_(Msgid) (Msgid)

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


@@ -123,34 +162,6 @@ extern int errno;
 # define LOCALEDIR "/usr/local/share/locale"
 #endif
 
 # define LOCALEDIR "/usr/local/share/locale"
 #endif
 

-#endif  /* BISON_SYSTEM_H */
-
-
-/*---------------------------------.
-| 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)
-

 
 /*-----------.
 | Booleans.  |
 
 /*-----------.
 | Booleans.  |


@@ -167,12 +178,12 @@ typedef int bool;
 | Obstacks.  |
 `-----------*/
 
 | Obstacks.  |
 `-----------*/
 

-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free  free
-#include "obstack.h"
+# define obstack_chunk_alloc xmalloc
+# define obstack_chunk_free  free
+# include "obstack.h"

 
 

-#define obstack_grow_literal_string(Obs, Str) \
-  obstack_grow (Obs, Str, sizeof (Str) - 1)
+#define obstack_sgrow(Obs, Str) \
+  obstack_grow (Obs, Str, strlen (Str))

 
 #define obstack_fgrow1(Obs, Format, Arg1)      \
 do {                                           \
 
 #define obstack_fgrow1(Obs, Format, Arg1)      \
 do {                                           \


@@ -194,3 +205,106 @@ do {                                                      \
   sprintf (buf, Format, Arg1, Arg2, Arg3);             \
   obstack_grow (Obs, buf, strlen (buf));               \
 } while (0)
   sprintf (buf, Format, Arg1, Arg2, Arg3);             \
   obstack_grow (Obs, buf, strlen (buf));               \
 } while (0)

+
+#define obstack_fgrow4(Obs, Format, Arg1, Arg2, Arg3, Arg4)    \
+do {                                                           \
+  char buf[4096];                                              \
+  sprintf (buf, Format, Arg1, Arg2, Arg3, Arg4);               \
+  obstack_grow (Obs, buf, strlen (buf));                       \
+} 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. */
+
+#ifdef VMS
+  /* VMS. */
+# define EXT_TAB       "_tab"
+# define EXT_OUTPUT    ".output"
+# define EXT_STYPE_H   "_stype"
+# define EXT_GUARD_C   "_guard"
+#else /* ! VMS */
+# ifdef MSDOS
+   /* MS DOS. */
+#  define EXT_TAB      "_tab"
+#  define EXT_OUTPUT   ".out"
+#  define EXT_STYPE_H  ".sth"
+#  define EXT_GUARD_C  ".guc"
+# else /* ! MSDOS */
+  /* Standard. */
+#  define EXT_TAB      ".tab"
+#  define EXT_OUTPUT   ".output"
+#  define EXT_STYPE_H  ".stype"
+#  define EXT_GUARD_C  ".guard"
+# 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
+#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. */
+#define LIST_FREE(Type, List)                  \
+do {                                           \
+  Type *_node, *_next;                         \
+  for (_node = List; _node; _node = _next)     \
+    {                                          \
+      _next = _node->next;                     \
+      XFREE (_node);                           \
+    }                                          \
+} while (0)
+
+/*---------------------------------.
+| Debugging the memory allocator.  |
+`---------------------------------*/
+
+# if WITH_DMALLOC
+#  define DMALLOC_FUNC_CHECK
+#  include <dmalloc.h>
+# endif /* WITH_DMALLOC */
+
+#endif  /* BISON_SYSTEM_H */