* doc/bison.texinfo: Update.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 437c1f15920ad1e3a6e9a0555a6dc1e97c017c73..83e2b0a51f0bde196afc8ac3bb2636f9b4e7b458 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -145,8 +145,8 @@ typedef int bool;
 #define obstack_chunk_free  free
 #include "obstack.h"
 
 #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 +169,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 +209,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 +222,25 @@ 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