Merge branch 'maint'

[bison.git] / src / system.h

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

-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2012 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


@@ -40,6 +39,19 @@
 #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))
+
+/* Just like strncmp, but the second argument must be a literal string
+   and you don't specify the length.  */
+#define STRNCMP_LIT(S, Literal)                         \
+  strncmp (S, "" Literal "", sizeof (Literal) - 1)
+
+/* Whether Literal is a prefix of S.  */
+#define STRPREFIX_LIT(Literal, S)               \
+  (STRNCMP_LIT (S, Literal) == 0)
+

 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif


@@ -53,6 +65,8 @@
 typedef size_t uintptr_t;
 #endif
 
 typedef size_t uintptr_t;
 #endif
 

+// Version mismatch.
+#define EX_MISMATCH 63

 
 /*---------.
 | Gnulib.  |
 
 /*---------.
 | Gnulib.  |


@@ -67,18 +81,24 @@ typedef size_t uintptr_t;
 | GCC extensions.  |
 `-----------------*/
 
 | GCC extensions.  |
 `-----------------*/
 

-/* Use this to suppress gcc's `...may be used before initialized'
-   warnings.  */
-#ifdef lint
-# define IF_LINT(Code) Code
-#else
-# define IF_LINT(Code) /* empty */
-#endif
+/* Use PACIFY_CC to indicate that Code is unimportant to the logic of Bison
+   but that it is necessary for suppressing compiler warnings.  For example,
+   Code might be a variable initializer that's always overwritten before the
+   variable is used.
+
+   PACIFY_CC is intended to be useful only as a comment as it does not alter
+   Code.  It is tempting to redefine PACIFY_CC so that it will suppress Code
+   when configuring without --enable-gcc-warnings.  However, that would mean
+   that, for maintainers, Bison would compile with potentially less warnings
+   and safer logic than it would for users.  Due to the overhead of M4,
+   suppressing Code is unlikely to offer any significant improvement in
+   Bison's performance anyway.  */
+#define PACIFY_CC(Code) Code

 
 #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


@@ -123,17 +143,26 @@ typedef size_t uintptr_t;
 | Assertions.  |
 `-------------*/
 
 | Assertions.  |
 `-------------*/
 

-/* <assert.h>'s assertions are too heavyweight, and can be disabled
-   too easily, so use aver rather than assert.  See discussions at
+/* In the past, Bison defined aver to simply invoke abort in the case of
+   a failed assertion.  The rationale was that <assert.h>'s assertions
+   were too heavyweight and could be disabled too easily.  See
+   discussions at

    <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00080.html>
    <http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00111.html>.
    <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00080.html>
    <http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00111.html>.

+
+   However, normal assert output can be helpful during development and
+   in bug reports from users.  Moreover, it's not clear now that
+   <assert.h>'s assertions are significantly heavyweight.  Finally, if
+   users want to experiment with disabling assertions, it's debatable
+   whether it's our responsibility to stop them.  See discussion
+   starting at
+   <http://lists.gnu.org/archive/html/bison-patches/2009-09/msg00013.html>.
+
+   For now, we use assert but we call it aver throughout Bison in case
+   we later wish to try another scheme.

 */
 */

-static inline void
-aver (bool assertion)
-{
-  if (! assertion)
-    abort ();
-}
+#include <assert.h>
+#define aver assert

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


@@ -147,33 +176,47 @@ aver (bool assertion)
 #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_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)
+
+
+/* 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)

 
 

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

 
 
 
 
 
 


@@ -189,24 +232,20 @@ 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);                            \
-    }                                          \
+#define LIST_FREE(Type, List)                   \
+do {                                            \
+  Type *_node, *_next;                          \
+  for (_node = List; _node; _node = _next)      \
+    {                                           \
+      _next = _node->next;                      \
+      free (_node);                             \
+    }                                           \

 } while (0)
 
 
 } while (0)