Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-16 15:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: rename internal "stype" as "union_members" for clarity

Browse Source 
"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.
This commit is contained in:
Akim Demaille
2013-02-04 18:35:51 +01:00
parent 6112cb1802
commit c5dbd909d0
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/bison.m4
View File

@@ -577,14 +577,14 @@ m4_define([b4_define_user_code],
# b4_user_initial_action # b4_user_initial_action
# b4_user_post_prologue # b4_user_post_prologue
# b4_user_pre_prologue # b4_user_pre_prologue
# b4_user_stype # b4_user_union_members
# ---------------------- # ----------------------
# Macros that issue user code, ending with synclines. # Macros that issue user code, ending with synclines.
b4_define_user_code([actions]) b4_define_user_code([actions])
b4_define_user_code([initial_action]) b4_define_user_code([initial_action])
b4_define_user_code([post_prologue]) b4_define_user_code([post_prologue])
b4_define_user_code([pre_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) # b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE)

4
data/c++.m4
View File

@@ -117,10 +117,10 @@ m4_define([b4_token_enums],
# Declare semantic_type. # Declare semantic_type.
m4_define([b4_semantic_type_declare], m4_define([b4_semantic_type_declare],
[ /// Symbol semantic values. [ /// Symbol semantic values.
m4_ifdef([b4_stype], m4_ifdef([b4_union_members],
[ union semantic_type [ union semantic_type
{ {
b4_user_stype b4_user_union_members
};], };],
[m4_if(b4_tag_seen_flag, 0, [m4_if(b4_tag_seen_flag, 0,
[[ typedef int semantic_type;]], [[ typedef int semantic_type;]],

4
data/c.m4
View File

@@ -501,11 +501,11 @@ b4_locations_if([, yylocationp])[]b4_user_args[);
m4_define([b4_value_type_define], m4_define([b4_value_type_define],
[[/* Value type. */ [[/* Value type. */
#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED #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; [[typedef union ]b4_union_name[ ]b4_api_PREFIX[STYPE;
union ]b4_union_name[ union ]b4_union_name[
{ {
]b4_user_stype[ ]b4_user_union_members[
}; };
# define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1]], # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1]],
[m4_if(b4_tag_seen_flag, 0, [m4_if(b4_tag_seen_flag, 0,

2
src/parse-gram.c
View File

@@ -2349,7 +2349,7 @@ yyreduce:
#line 439 "src/parse-gram.y" /* yacc.c:1669 */ #line 439 "src/parse-gram.y" /* yacc.c:1669 */
{ {
union_seen = true; 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 (); code_scanner_last_string_free ();
} }
#line 2356 "src/parse-gram.c" /* yacc.c:1669 */ #line 2356 "src/parse-gram.c" /* yacc.c:1669 */

2
src/parse-gram.y
View File

@@ -438,7 +438,7 @@ grammar_declaration:
"%union" union_name braceless "%union" union_name braceless
{ {
union_seen = true; union_seen = true;
muscle_code_grow ("stype", $3, @3); muscle_code_grow ("union_members", $3, @3);
code_scanner_last_string_free (); code_scanner_last_string_free ();
} }
; ;