Merge remote-tracking branch 'origin/maint'

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 0d69e93e32a98c5f360ce1d90c52a88030b01001..987ebe2adb2c5368424fd0f8c14503006276912e 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -39,6 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))

 #define STREQ(L, R)  (strcmp(L, R) == 0)
 #define STRNEQ(L, R) (!STREQ(L, R))
 
 #define STREQ(L, R)  (strcmp(L, R) == 0)
 #define STRNEQ(L, R) (!STREQ(L, R))
 


@@ -51,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.  */


@@ -117,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.  |


@@ -172,38 +172,57 @@ 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))
 

-#define obstack_fgrow1(Obs, Format, Arg1)       \
-do {                                            \
-  char buf[4096];                               \
-  sprintf (buf, Format, Arg1);                  \
-  obstack_grow (Obs, buf, strlen (buf));        \
-} while (0)
+/* Output Str escaped for our postprocessing (i.e., escape M4 special
+   characters).

 
 

-#define obstack_fgrow2(Obs, Format, Arg1, Arg2) \
-do {                                            \
-  char buf[4096];                               \
-  sprintf (buf, Format, Arg1, Arg2);            \
-  obstack_grow (Obs, buf, strlen (buf));        \
-} while (0)
+   For instance "[foo]" -> "@{foo@}", "$$" -> "$][$][". */

 
 

-#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_escape(Obs, Str)                       \
+  do {                                                  \
+    char const *p__;                                    \
+    for (p__ = Str; *p__; p__++)                        \
+      switch (*p__)                                     \
+        {                                               \
+        case '$': obstack_sgrow (Obs, "$]["); break;    \
+        case '@': obstack_sgrow (Obs, "@@" ); break;    \
+        case '[': obstack_sgrow (Obs, "@{" ); break;    \
+        case ']': obstack_sgrow (Obs, "@}" ); break;    \
+        default:  obstack_1grow (Obs, *p__ ); break;    \
+        }                                               \
+  } 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 both quoted for M4 (i.e., embed in [[...]]), and escaped
+   for our postprocessing (i.e., escape M4 special characters).  If
+   Str is empty (or NULL), output "[]" instead of "[[]]" as it make M4
+   programming easier (m4_ifval can be used).
+
+   For instance "[foo]" -> "[[@{foo@}]]", "$$" -> "[[$][$][]]". */
+
+# define obstack_quote(Obs, Str)                \
+  do {                                          \
+    char const* obstack_quote_p = Str;          \
+    if (obstack_quote_p && obstack_quote_p[0])  \
+      {                                         \
+        obstack_sgrow (Obs, "[[");              \
+        obstack_escape (Obs, obstack_quote_p);  \
+        obstack_sgrow (Obs, "]]");              \
+      }                                         \
+    else                                        \
+      obstack_sgrow (Obs, "[]");                \
+  } while (0)

 
 
 
 

+/* Append the ending 0, finish Obs, and return the string.  */
+
+# define obstack_finish0(Obs)                           \
+  (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))
+

 
 /*-----------------------------------------.
 | Extensions to use for the output files.  |
 
 /*-----------------------------------------.
 | Extensions to use for the output files.  |


@@ -217,10 +236,6 @@ do {                                                            \
 # define TAB_EXT ".tab"
 #endif
 
 # define TAB_EXT ".tab"
 #endif
 

-#ifndef DEFAULT_TMPDIR
-# define DEFAULT_TMPDIR "/tmp"
-#endif
-

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