regen

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index e3f17d890b7a0e4415348b1c46c47955a96dc7f6..f40e0fc0ca8b99b6cd49957898600f8f45bfc3bd 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,6 @@
 /* System-dependent definitions for Bison.
 
 /* System-dependent definitions for Bison.
 

-   Copyright (C) 2000-2007, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -38,21 +38,20 @@
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
 # 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>
 
 # 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.  */
 typedef size_t uintptr_t;
 # endif
 
 # ifndef UINTPTR_MAX
 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
 # endif
 

-// Version mismatch.
+/* Version mismatch. */

 # define EX_MISMATCH 63
 
 /*---------.
 # define EX_MISMATCH 63
 
 /*---------.


@@ -85,7 +84,7 @@ typedef size_t uintptr_t;
 # ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 #  if (! defined __GNUC__ || __GNUC__ < 2 \
 # ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 #  if (! defined __GNUC__ || __GNUC__ < 2 \

-      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)
+       || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))

 #   define __attribute__(Spec) /* empty */
 #  endif
 # endif
 #   define __attribute__(Spec) /* empty */
 #  endif
 # endif


@@ -105,7 +104,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.  |


@@ -160,37 +158,54 @@ typedef size_t uintptr_t;
 # define obstack_chunk_free  free
 # include <obstack.h>
 
 # define obstack_chunk_free  free
 # include <obstack.h>
 

-# define obstack_sgrow(Obs, Str) \
+# define obstack_sgrow(Obs, Str)                \

   obstack_grow (Obs, Str, strlen (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).
+
+   For instance "[foo]" -> "@{foo@}", "$$" -> "$][$][". */
+
+# 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_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)
+/* 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).

 
 

-# 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)
+   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))

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


@@ -205,25 +220,21 @@ do {                                                              \
 #  define TAB_EXT ".tab"
 # endif
 
 #  define TAB_EXT ".tab"
 # endif
 

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

 
 
 /*---------------------.
 | Free a linked list.  |
 `---------------------*/
 
 
 
 /*---------------------.
 | Free a linked list.  |
 `---------------------*/
 

-# define LIST_FREE(Type, List)                 \
-do {                                           \
-  Type *_node, *_next;                         \
-  for (_node = List; _node; _node = _next)     \
-    {                                          \
-      _next = _node->next;                     \
-      free (_node);                            \
-    }                                          \
-} while (0)
+# define LIST_FREE(Type, List)                  \
+  do {                                          \
+    Type *_node, *_next;                        \
+    for (_node = List; _node; _node = _next)    \
+      {                                         \
+        _next = _node->next;                    \
+        free (_node);                           \
+      }                                         \
+  } while (0)

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