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

variants: document move and swap

Browse Source 
* data/variant.hh (swap): Doc.
(build): Rename as...
(move): This, more coherent naming with clearer meaning.
* data/c++.m4 (move): Adjust.
This commit is contained in:
Theophile Ranquet
2013-01-11 12:38:35 +01:00
parent 04816a6f32
commit 6656c9b52a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/c++.m4
View File

@@ -306,7 +306,7 @@ m4_define([b4_public_types_define],
{ {
this->type = s.type_get ();]b4_locations_if([ this->type = s.type_get ();]b4_locations_if([
location = s.location;])[ location = s.location;])[
]b4_variant_if([b4_symbol_variant([s.type_get ()], [value], [build], ]b4_variant_if([b4_symbol_variant([s.type_get ()], [value], [move],
[s.value])], [s.value])],
[value = s.value;])[ [value = s.value;])[
} }

12
data/variant.hh
View File

@@ -161,7 +161,12 @@ m4_define([b4_variant_define],
} }
/// Swap the content with \a other, of same type. /// Swap the content with \a other, of same type.
/// Both variants must be built beforehand. /// Both variants must be built beforehand, because swapping the actual
/// data requires reading it (with as()), and this is not possible on
/// unconstructed variants: it would require some dynamic testing, which
/// should not be the variant's responsability.
/// Swapping between built and ((possibly) non-built is done with
/// variant::move ().
template <typename T> template <typename T>
inline void inline void
swap (variant<S>& other) swap (variant<S>& other)
@@ -176,8 +181,9 @@ m4_define([b4_variant_define],
/// Destroys \a other. /// Destroys \a other.
template <typename T> template <typename T>
inline void inline void
build (variant<S>& other) move (variant<S>& other)
{ {]b4_parse_assert_if([
YYASSERT (! built);])[
build<T>(); build<T>();
swap<T>(other); swap<T>(other);
other.destroy<T>(); other.destroy<T>();