Cope with CVS weird way to report warnings.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 797ae545becc73eadda568bbc92f4f963706a192..83e2b0a51f0bde196afc8ac3bb2636f9b4e7b458 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -126,32 +126,6 @@ extern int errno;
 #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.  |
 `-----------*/
@@ -171,8 +145,8 @@ typedef int bool;
 #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 {                                           \
@@ -194,3 +168,79 @@ do {                                                       \
   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