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

variants: remove the 'built' assertions

Browse Source 
When using %define parse.assert, the variants come with additional variables
that are useful for development purposes. One is a Boolean indicating if the
variant is built (to make sure we don't read a non-built variant), and the
other is a string describing the stored type. There is no need to have both of
these, the string is enough.

* data/variant.hh (built): Remove.
This commit is contained in:
Theophile Ranquet
2013-01-29 14:53:35 +01:00
parent c13928073c
commit fbecd2ab59
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/variant.hh
View File

@@ -95,15 +95,13 @@ m4_define([b4_variant_define],
/// Empty construction. /// Empty construction.
variant ()]b4_parse_assert_if([ variant ()]b4_parse_assert_if([
: built (false) : tname (YY_NULL)])[
, tname (YY_NULL)])[
{} {}
/// Construct and fill. /// Construct and fill.
template <typename T> template <typename T>
variant (const T& t)]b4_parse_assert_if([ variant (const T& t)]b4_parse_assert_if([
: built (true) : tname (typeid (T).name ())])[
, tname (typeid (T).name ())])[
{ {
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
new (buffer.raw) T (t); new (buffer.raw) T (t);
@@ -112,7 +110,7 @@ m4_define([b4_variant_define],
/// Destruction, allowed only if empty. /// Destruction, allowed only if empty.
~variant () ~variant ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!built); YYASSERT (!tname);
])[} ])[}
/// Instantiate an empty \a T in here. /// Instantiate an empty \a T in here.
@@ -120,10 +118,8 @@ m4_define([b4_variant_define],
T& T&
build () build ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!built);
YYASSERT (!tname); YYASSERT (!tname);
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
built = true;
tname = typeid (T).name ();])[ tname = typeid (T).name ();])[
return *new (buffer.raw) T; return *new (buffer.raw) T;
} }
@@ -133,10 +129,8 @@ m4_define([b4_variant_define],
T& T&
build (const T& t) build (const T& t)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!built);
YYASSERT (!tname); YYASSERT (!tname);
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
built = true;
tname = typeid (T).name ();])[ tname = typeid (T).name ();])[
return *new (buffer.raw) T (t); return *new (buffer.raw) T (t);
} }
@@ -146,7 +140,6 @@ m4_define([b4_variant_define],
T& T&
as () as ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (built);
YYASSERT (tname == typeid (T).name ()); YYASSERT (tname == typeid (T).name ());
YYASSERT (sizeof (T) <= S);])[ YYASSERT (sizeof (T) <= S);])[
return reinterpret_cast<T&> (buffer.raw); return reinterpret_cast<T&> (buffer.raw);
@@ -157,7 +150,6 @@ m4_define([b4_variant_define],
const T& const T&
as () const as () const
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (built);
YYASSERT (tname == typeid (T).name ()); YYASSERT (tname == typeid (T).name ());
YYASSERT (sizeof (T) <= S);])[ YYASSERT (sizeof (T) <= S);])[
return reinterpret_cast<const T&> (buffer.raw); return reinterpret_cast<const T&> (buffer.raw);
@@ -175,8 +167,7 @@ m4_define([b4_variant_define],
void void
swap (self_type& other) swap (self_type& other)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (built); YYASSERT (tname);
YYASSERT (other.built);
YYASSERT (tname == other.tname);])[ YYASSERT (tname == other.tname);])[
std::swap (as<T>(), other.as<T>()); std::swap (as<T>(), other.as<T>());
} }
@@ -188,7 +179,7 @@ m4_define([b4_variant_define],
void void
move (self_type& other) move (self_type& other)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (! built);])[ YYASSERT (!tname);])[
build<T>(); build<T>();
swap<T>(other); swap<T>(other);
other.destroy<T>(); other.destroy<T>();
@@ -208,7 +199,6 @@ m4_define([b4_variant_define],
destroy () destroy ()
{ {
as<T> ().~T ();]b4_parse_assert_if([ as<T> ().~T ();]b4_parse_assert_if([
built = false;
tname = YY_NULL;])[ tname = YY_NULL;])[
} }
@@ -226,9 +216,7 @@ m4_define([b4_variant_define],
char raw[S]; char raw[S];
} buffer;]b4_parse_assert_if([ } buffer;]b4_parse_assert_if([
/// Whether the content is built. /// Whether the content is built: if defined, the name of the stored type.
bool built;
/// If defined, the name of the stored type.
const char* tname;])[ const char* tname;])[
}; };
]]) ]])