* tests/calc.at, tests/output.at, tests/regression.at,

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 437c1f15920ad1e3a6e9a0555a6dc1e97c017c73..bfd244637a0b8fe1efb9508df6f9ea07eaf4a16e 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


@@ -73,6 +85,26 @@ extern int errno;
 # define PARAMS(p) ()
 #endif
 
 # 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.  |
 `-----------------*/


@@ -106,10 +138,13 @@ extern int errno;
 # include <libintl.h>
 # define _(Text) gettext (Text)
 #else
 # include <libintl.h>
 # define _(Text) gettext (Text)
 #else

-# undef bindtextdomain
+# undef  bindtextdomain

 # define bindtextdomain(Domain, Directory)
 # define bindtextdomain(Domain, Directory)

-# undef textdomain
+# undef  textdomain

 # define textdomain(Domain)
 # define textdomain(Domain)

+# undef  ngettext
+# define ngettext(Singular, Plural, Number)   \
+         ((Number == 1) ? Singular : Plural)

 # define _(Text) Text
 #endif
 #define N_(Text) Text
 # define _(Text) Text
 #endif
 #define N_(Text) Text


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

-#endif  /* BISON_SYSTEM_H */
-

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


@@ -141,12 +174,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 {                                           \


@@ -169,6 +202,13 @@ do {                                                       \
   obstack_grow (Obs, buf, strlen (buf));               \
 } while (0)
 
   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.  |
 
 /*---------------------------------.
 | Machine-dependencies for Bison.  |


@@ -202,8 +242,8 @@ do {                                                        \
   /* VMS. */
 # define EXT_TAB       "_tab"
 # define EXT_OUTPUT    ".output"
   /* VMS. */
 # define EXT_TAB       "_tab"
 # define EXT_OUTPUT    ".output"

-# define EXT_STYPE_H   "_stype.h"
-# define EXT_GUARD_C   "_guard.c"
+# define EXT_STYPE_H   "_stype"
+# define EXT_GUARD_C   "_guard"

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


@@ -215,7 +255,37 @@ do {                                                       \
   /* Standard. */
 #  define EXT_TAB      ".tab"
 #  define EXT_OUTPUT   ".output"
   /* Standard. */
 #  define EXT_TAB      ".tab"
 #  define EXT_OUTPUT   ".output"

-#  define EXT_STYPE_H  ".stype.h"
-#  define EXT_GUARD_C  ".guard.c"
+#  define EXT_STYPE_H  ".stype"
+#  define EXT_GUARD_C  ".guard"

 # 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
+#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
+
+
+/*---------------------------------.
+| Debugging the memory allocator.  |
+`---------------------------------*/
+
+# if WITH_DMALLOC
+#  define DMALLOC_FUNC_CHECK
+#  include <dmalloc.h>
+# endif /* WITH_DMALLOC */
+
+#endif  /* BISON_SYSTEM_H */