From: Joel E. Denny <jdenny@ces.clemson.edu>
Date: Tue, 19 Dec 2006 21:40:14 +0000 (+0000)
Subject: * data/push.c (union yyalloc): Rename yyss, yyvs, and yyls fields to
X-Git-Tag: v2.3b~213
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/2d212f8ca61377c728f9262a03ca7471de5661c5

* data/push.c (union yyalloc): Rename yyss, yyvs, and yyls fields to
prevent a name collision in a future patch where these names will
sometimes be #define'd.
(YYSTACK_RELOCATE): Add an argument to select a union yyalloc field
since it no longer has the same name as the existing argument.
(yyparse or yypush_parse): Update all uses of YYSTACK_RELOCATE.
---

diff --git a/ChangeLog b/ChangeLog
index 2a550617..218b6c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-19  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	* data/push.c (union yyalloc): Rename yyss, yyvs, and yyls fields to
+	prevent a name collision in a future patch where these names will
+	sometimes be #define'd.
+	(YYSTACK_RELOCATE): Add an argument to select a union yyalloc field
+	since it no longer has the same name as the existing argument.
+	(yyparse or yypush_parse): Update all uses of YYSTACK_RELOCATE.
+
 2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
 	and Joel E. Denny  <jdenny@ces.clemson.edu>
 
diff --git a/data/push.c b/data/push.c
index d811eba7..a1cdb186 100644
--- a/data/push.c
+++ b/data/push.c
@@ -373,9 +373,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  ]b4_locations_if([  YYLTYPE yyls;
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  ]b4_locations_if([  YYLTYPE yyls_alloc;
 ])dnl
 [};
 
@@ -415,12 +415,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -1277,9 +1277,9 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-]b4_locations_if([	YYSTACK_RELOCATE (yyls);])[
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+]b4_locations_if([	YYSTACK_RELOCATE (yyls_alloc, yyls);])[
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != ]b4_yyssa[)
 	  YYSTACK_FREE (yyss1);