c++: rename b4_semantic_type_declare as b4_value_type_declare

This is to match the names used in C and api.value.type, even if the
parser actually defines semantic_type.

* data/c++.m4 (b4_semantic_type_declare): Rename as...
(b4_value_type_declare): this.
* data/variant.hh: Likewise.
This commit is contained in:
Akim Demaille
2013-02-08 17:09:33 +01:00
parent 6c7022f7d3
commit 7601a471f5
3 changed files with 10 additions and 9 deletions

View File

@@ -112,10 +112,12 @@ m4_define([b4_token_enums],
## Semantic Values. ##
## ----------------- ##
# b4_semantic_type_declare
# ------------------------
# b4_value_type_declare
# ---------------------
# Declare semantic_type.
m4_define([b4_semantic_type_declare],
m4_define([b4_value_type_declare],
[ /// Symbol semantic values.
m4_ifdef([b4_union_members],
[ union semantic_type
@@ -133,7 +135,7 @@ b4_user_union_members
# Depending on %define token_lex, may be output in the header or source file.
m4_define([b4_public_types_declare],
[[#ifndef ]b4_api_PREFIX[STYPE
]b4_semantic_type_declare[
]b4_value_type_declare[
#else
typedef ]b4_api_PREFIX[STYPE semantic_type;
#endif]b4_locations_if([

View File

@@ -244,10 +244,10 @@ m4_define([b4_variant_define],
## -------------------------- ##
# b4_semantic_type_declare
# ------------------------
# b4_value_type_declare
# ---------------------
# Declare semantic_type.
m4_define([b4_semantic_type_declare],
m4_define([b4_value_type_declare],
[ /// An auxiliary type to compute the largest semantic type.
union union_type
{]b4_type_foreach([b4_char_sizeof])[};
@@ -328,7 +328,7 @@ b4_join(b4_symbol_if([$1], [has_type],
# b4_basic_symbol_constructor_declare
# ----------------------------------
# -----------------------------------
# Generate a constructor declaration for basic_symbol from given type.
m4_define([b4_basic_symbol_constructor_declare],
[[

View File

@@ -143,7 +143,6 @@ m4_define([b4_rhs_value],
[b4_symbol_value([yyvsp@{b4_subtract([$2], [$1])@}], [$3])])
## ----------- ##
## Locations. ##
## ----------- ##