Merge remote-tracking branch 'origin/maint'

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 1d0af8fabddb6e7b5c10678dc1288de5c9abd369..987ebe2adb2c5368424fd0f8c14503006276912e 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -52,13 +52,13 @@
 #define STRPREFIX_LIT(Literal, S)               \
   (STRNCMP_LIT (S, Literal) == 0)
 
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <unistd.h>
 #include <inttypes.h>
 
+#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
+#define STREQ(L, R)  (strcmp(L, R) == 0)
+#define STRNEQ(L, R) (!STREQ(L, R))
+
 #ifndef UINTPTR_MAX
 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
@@ -118,7 +118,6 @@ typedef size_t uintptr_t;
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
-#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
 
 /*------.
 | NLS.  |
@@ -173,38 +172,11 @@ typedef size_t uintptr_t;
 #define obstack_chunk_free  free
 #include <obstack.h>
 
+/* String-grow: append Str to Obs.  */
+
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
 
-#define obstack_fgrow1(Obs, Format, Arg1)       \
-  do {                                          \
-    char buf[4096];                             \
-    sprintf (buf, Format, Arg1);                \
-    obstack_grow (Obs, buf, strlen (buf));      \
-  } while (0)
-
-#define obstack_fgrow2(Obs, Format, Arg1, Arg2) \
-  do {                                          \
-    char buf[4096];                             \
-    sprintf (buf, Format, Arg1, Arg2);          \
-    obstack_grow (Obs, buf, strlen (buf));      \
-  } while (0)
-
-#define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3)   \
-  do {                                                  \
-    char buf[4096];                                     \
-    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)
-
-
 /* Output Str escaped for our postprocessing (i.e., escape M4 special
    characters).
 
@@ -246,7 +218,10 @@ typedef size_t uintptr_t;
   } while (0)
 
 
+/* Append the ending 0, finish Obs, and return the string.  */
 
+# define obstack_finish0(Obs)                           \
+  (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))
 
 
 /*-----------------------------------------.