Merge remote-tracking branch 'origin/maint'

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 97a92257339ea2fb683764406780ba9c59a0248e..0d69e93e32a98c5f360ce1d90c52a88030b01001 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-2011 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


@@ -39,6 +39,18 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

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


@@ -52,6 +64,8 @@
 typedef size_t uintptr_t;
 #endif
 
 typedef size_t uintptr_t;
 #endif
 

+// Version mismatch.
+#define EX_MISMATCH 63

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


@@ -66,18 +80,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


@@ -155,32 +175,32 @@ typedef size_t uintptr_t;
 #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));       \
+#define obstack_fgrow1(Obs, Format, Arg1)       \
+do {                                            \
+  char buf[4096];                               \
+  sprintf (buf, Format, Arg1);                  \
+  obstack_grow (Obs, buf, strlen (buf));        \

 } while (0)
 
 } while (0)
 

-#define obstack_fgrow2(Obs, Format, Arg1, Arg2)        \
-do {                                           \
-  char buf[4096];                              \
-  sprintf (buf, Format, Arg1, Arg2);           \
-  obstack_grow (Obs, buf, strlen (buf));       \
+#define obstack_fgrow2(Obs, Format, Arg1, Arg2) \
+do {                                            \
+  char buf[4096];                               \
+  sprintf (buf, Format, Arg1, Arg2);            \
+  obstack_grow (Obs, buf, strlen (buf));        \

 } while (0)
 
 } 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));               \
+#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)
 
 } 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));                       \
+#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)
 
 
 } while (0)
 
 


@@ -207,14 +227,14 @@ do {                                                              \
 | 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)