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

c++: minor stylistic changes

Browse Source 
* data/c++m4: Remove useless comment lines.
* data/variant.hh (self_type): Use this typedef instead of variant<S>.
(b4_symbol_constructor_define_): Remove commented-out line, and stylistic
change (avoid blank line).
This commit is contained in:
Theophile Ranquet
2013-01-28 18:03:58 +01:00
parent ddb9db151b
commit 858666c443
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/c++.m4
View File

@@ -234,7 +234,6 @@ m4_define([b4_public_types_declare],
enum { empty = 0 }; enum { empty = 0 };
/// The symbol type. /// The symbol type.
///
/// -1 when this symbol is empty. /// -1 when this symbol is empty.
token_number_type type; token_number_type type;
}; };

11
data/variant.hh
View File

@@ -173,7 +173,7 @@ m4_define([b4_variant_define],
/// variant::move (). /// variant::move ().
template <typename T> template <typename T>
void void
swap (variant<S>& other) swap (self_type& other)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (built); YYASSERT (built);
YYASSERT (other.built); YYASSERT (other.built);
@@ -186,7 +186,7 @@ m4_define([b4_variant_define],
/// Destroys \a other. /// Destroys \a other.
template <typename T> template <typename T>
void void
move (variant<S>& other) move (self_type& other)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (! built);])[ YYASSERT (! built);])[
build<T>(); build<T>();
@@ -197,7 +197,7 @@ m4_define([b4_variant_define],
/// Copy the content of \a other to this. /// Copy the content of \a other to this.
template <typename T> template <typename T>
void void
copy (const variant<S>& other) copy (const self_type& other)
{ {
build<T> (other.as<T> ()); build<T> (other.as<T> ());
} }
@@ -314,9 +314,8 @@ b4_join(b4_symbol_if([$1], [has_type],
b4_locations_if([const location_type& l])))[ b4_locations_if([const location_type& l])))[
{ {
symbol_type res (token::]b4_symbol([$1], [id])[]b4_locations_if([, l])[); symbol_type res (token::]b4_symbol([$1], [id])[]b4_locations_if([, l])[);
]b4_symbol_if([$1], [has_type], [res.value.build (v);])[ ]b4_symbol_if([$1], [has_type], [res.value.build (v);
// ]b4_locations_if([res.location = l;])[ ])[return res;
return res;
} }
]])])]) ]])])])