From c5dbd909d0fcdacb46d4d601ebcadfc0f680cd56 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Mon, 4 Feb 2013 18:35:51 +0100
Subject: [PATCH] style: rename internal "stype" as "union_members" for clarity

"stype" is quite unclear, and it also collides with the former %define
variable that had the same name (replaced by api.value.type).

* src/parse-gram.y (stype): Rename as...
(union_members): this.
* data/bison.m4: Adjust.
(b4_user_stype): Rename as...
(b4_user_union_members): this.
* data/c++.m4, data/c.m4: Adjust.
* src/parse-gram.c: regen.
---
 data/bison.m4    | 4 ++--
 data/c++.m4      | 4 ++--
 data/c.m4        | 4 ++--
 src/parse-gram.c | 2 +-
 src/parse-gram.y | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/bison.m4 b/data/bison.m4
index 704f172..d01124b 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -577,14 +577,14 @@ m4_define([b4_define_user_code],
 # b4_user_initial_action
 # b4_user_post_prologue
 # b4_user_pre_prologue
-# b4_user_stype
+# b4_user_union_members
 # ----------------------
 # Macros that issue user code, ending with synclines.
 b4_define_user_code([actions])
 b4_define_user_code([initial_action])
 b4_define_user_code([post_prologue])
 b4_define_user_code([pre_prologue])
-b4_define_user_code([stype])
+b4_define_user_code([union_members])
 
 
 # b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE)
diff --git a/data/c++.m4 b/data/c++.m4
index 7e00aad..b034a4a 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -117,10 +117,10 @@ m4_define([b4_token_enums],
 # Declare semantic_type.
 m4_define([b4_semantic_type_declare],
 [    /// Symbol semantic values.
-m4_ifdef([b4_stype],
+m4_ifdef([b4_union_members],
 [    union semantic_type
     {
-b4_user_stype
+b4_user_union_members
     };],
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
diff --git a/data/c.m4 b/data/c.m4
index 3ddaa11..f145c73 100644
--- a/data/c.m4
+++ b/data/c.m4
@@ -501,11 +501,11 @@ b4_locations_if([, yylocationp])[]b4_user_args[);
 m4_define([b4_value_type_define],
 [[/* Value type.  */
 #if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED
-]m4_ifdef([b4_stype],
+]m4_ifdef([b4_union_members],
 [[typedef union ]b4_union_name[ ]b4_api_PREFIX[STYPE;
 union ]b4_union_name[
 {
-]b4_user_stype[
+]b4_user_union_members[
 };
 # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1]],
 [m4_if(b4_tag_seen_flag, 0,
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 301a0f6..cc42b0d 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -2349,7 +2349,7 @@ yyreduce:
 #line 439 "src/parse-gram.y" /* yacc.c:1669  */
     {
       union_seen = true;
-      muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
+      muscle_code_grow ("union_members", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
 #line 2356 "src/parse-gram.c" /* yacc.c:1669  */
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 0fd4687..2c84cb1 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -438,7 +438,7 @@ grammar_declaration:
   "%union" union_name braceless
     {
       union_seen = true;
-      muscle_code_grow ("stype", $3, @3);
+      muscle_code_grow ("union_members", $3, @3);
       code_scanner_last_string_free ();
     }
 ;
-- 
2.7.4