c++: fix several issues with locations

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 35ff876476ae07e0b4dc1fd70b100846b4fa07cf..3267f2d24c6cc2dbc4d2ea755f3a2fa341c7aaee 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,13 +38,23 @@
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
 # include <stddef.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)
+

 # 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.  */


@@ -89,7 +99,7 @@ typedef size_t uintptr_t;
 #  endif
 # endif
 
 #  endif
 # endif
 

-/* The __-protected variants of `format' and `printf' attributes
+/* The __-protected variants of 'format' and 'printf' attributes

    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #  define __format__ format


@@ -158,7 +168,9 @@ 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)                \
+/* String-grow: append Str to Obs.  */
+
+# define obstack_sgrow(Obs, Str) \

   obstack_grow (Obs, Str, strlen (Str))
 
 /* Output Str escaped for our postprocessing (i.e., escape M4 special
   obstack_grow (Obs, Str, strlen (Str))
 
 /* Output Str escaped for our postprocessing (i.e., escape M4 special


@@ -168,15 +180,15 @@ typedef size_t uintptr_t;
 
 # define obstack_escape(Obs, Str)                       \
   do {                                                  \
 
 # define obstack_escape(Obs, Str)                       \
   do {                                                  \

-    char const *p;                                      \
-    for (p = Str; *p; p++)                              \
-      switch (*p)                                       \
+    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;    \
         {                                               \
         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;    \
+        default:  obstack_1grow (Obs, *p__ ); break;    \

         }                                               \
   } while (0)
 
         }                                               \
   } while (0)
 


@@ -204,7 +216,7 @@ typedef size_t uintptr_t;
 
 /* Append the ending 0, finish Obs, and return the string.  */
 
 
 /* Append the ending 0, finish Obs, and return the string.  */
 

-# define obstack_finish0(Obs)                           \
+# define obstack_finish0(Obs)                                   \

   (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))
 
 
   (obstack_1grow (Obs, '\0'), (char *) obstack_finish (Obs))