gnulib: update

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index da3c97ed0606782022281b3fd9a8a31cd9fd5e1a..bf7f59f9dbb66ab718f148e81517aacf7efbd50b 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -38,11 +38,6 @@
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
-
-# if HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-# endif
-
 # include <unistd.h>
 # include <inttypes.h>
 
@@ -105,7 +100,6 @@ typedef size_t uintptr_t;
 #  define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 # endif
 
-# define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
 
 /*------.
 | NLS.  |
@@ -163,36 +157,50 @@ typedef size_t uintptr_t;
 # 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)  \
+# define obstack_escape(Obs, Str)                       \
   do {                                                  \
-    char buf[4096];                                     \
-    sprintf (buf, Format, Arg1, Arg2, Arg3);            \
-    obstack_grow (Obs, buf, strlen (buf));              \
+    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));                      \
+
+/* 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)
 
 
 
+
+
 /*-----------------------------------------.
 | Extensions to use for the output files.  |
 `-----------------------------------------*/
@@ -205,10 +213,6 @@ typedef size_t uintptr_t;
 #  define TAB_EXT ".tab"
 # endif
 
-# ifndef DEFAULT_TMPDIR
-#  define DEFAULT_TMPDIR "/tmp"
-# endif
-
 
 
 /*---------------------.