Merge remote-tracking branch 'origin/maint'

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index a56c058a10360c7d867f350e859844bd7680b864..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)
 
 #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>
 
 #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.  */
 #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 ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

-#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)

 
 /*------.
 | NLS.  |
 
 /*------.
 | NLS.  |


@@ -173,6 +172,8 @@ typedef size_t uintptr_t;
 #define obstack_chunk_free  free
 #include <obstack.h>
 
 #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_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
 


@@ -217,7 +218,10 @@ typedef size_t uintptr_t;
   } while (0)
 
 
   } while (0)
 
 

+/* Append the ending 0, finish Obs, and return the string.  */

 
 

+# define obstack_finish0(Obs)                           \
+  (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))

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