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

style: rename variant private members

Browse Source 
* data/variant.hh (buffer, tname, as_, raw, align_me): Rename as...
(yybuffer_, yytname_,yyas_, yyraw, yyalign_me): these.
This commit is contained in:
Akim Demaille
2013-02-19 09:25:58 +01:00
parent 361444e419
commit 29248b4c13
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
data/variant.hh
View File

@@ -95,22 +95,22 @@ m4_define([b4_variant_define],
/// Empty construction. /// Empty construction.
variant ()]b4_parse_assert_if([ variant ()]b4_parse_assert_if([
: tname (YY_NULL)])[ : yytname_ (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([
: tname (typeid (T).name ())])[ : yytname_ (typeid (T).name ())])[
{ {
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
new (as_ <T> ()) T (t); new (yyas_<T> ()) T (t);
} }
/// Destruction, allowed only if empty. /// Destruction, allowed only if empty.
~variant () ~variant ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!tname); YYASSERT (!yytname_);
])[} ])[}
/// Instantiate an empty \a T in here. /// Instantiate an empty \a T in here.
@@ -118,10 +118,10 @@ m4_define([b4_variant_define],
T& T&
build () build ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!tname); YYASSERT (!yytname_);
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
tname = typeid (T).name ();])[ yytname_ = typeid (T).name ();])[
return *new (as_<T> ()) T; return *new (yyas_<T> ()) T;
} }
/// Instantiate a \a T in here from \a t. /// Instantiate a \a T in here from \a t.
@@ -129,10 +129,10 @@ m4_define([b4_variant_define],
T& T&
build (const T& t) build (const T& t)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (!tname); YYASSERT (!yytname_);
YYASSERT (sizeof (T) <= S); YYASSERT (sizeof (T) <= S);
tname = typeid (T).name ();])[ yytname_ = typeid (T).name ();])[
return *new (as_<T> ()) T (t); return *new (yyas_<T> ()) T (t);
} }
/// Accessor to a built \a T. /// Accessor to a built \a T.
@@ -140,9 +140,9 @@ m4_define([b4_variant_define],
T& T&
as () as ()
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (tname == typeid (T).name ()); YYASSERT (yytname_ == typeid (T).name ());
YYASSERT (sizeof (T) <= S);])[ YYASSERT (sizeof (T) <= S);])[
return *as_<T> (); return *yyas_<T> ();
} }
/// Const accessor to a built \a T (for %printer). /// Const accessor to a built \a T (for %printer).
@@ -150,9 +150,9 @@ m4_define([b4_variant_define],
const T& const T&
as () const as () const
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (tname == typeid (T).name ()); YYASSERT (yytname_ == typeid (T).name ());
YYASSERT (sizeof (T) <= S);])[ YYASSERT (sizeof (T) <= S);])[
return *as_<T> (); return *yyas_<T> ();
} }
/// Swap the content with \a other, of same type. /// Swap the content with \a other, of same type.
@@ -167,8 +167,8 @@ m4_define([b4_variant_define],
void void
swap (self_type& other) swap (self_type& other)
{]b4_parse_assert_if([ {]b4_parse_assert_if([
YYASSERT (tname); YYASSERT (yytname_);
YYASSERT (tname == other.tname);])[ YYASSERT (yytname_ == other.yytname_);])[
std::swap (as<T> (), other.as<T> ()); std::swap (as<T> (), other.as<T> ());
} }
@@ -179,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 (!tname);])[ YYASSERT (!yytname_);])[
build<T> (); build<T> ();
swap<T> (other); swap<T> (other);
other.destroy<T> (); other.destroy<T> ();
@@ -199,7 +199,7 @@ m4_define([b4_variant_define],
destroy () destroy ()
{ {
as<T> ().~T ();]b4_parse_assert_if([ as<T> ().~T ();]b4_parse_assert_if([
tname = YY_NULL;])[ yytname_ = YY_NULL;])[
} }
private: private:
@@ -210,32 +210,31 @@ m4_define([b4_variant_define],
/// Accessor to raw memory as \a T. /// Accessor to raw memory as \a T.
template <typename T> template <typename T>
T* T*
as_ () yyas_ ()
{ {
void *yyp = buffer.raw; void *yyp = yybuffer_.yyraw;
return static_cast<T*> (yyp); return static_cast<T*> (yyp);
} }
/// Const accessor to raw memory as \a T. /// Const accessor to raw memory as \a T.
template <typename T> template <typename T>
const T* const T*
as_ () const yyas_ () const
{ {
const void *yyp = buffer.raw; const void *yyp = yybuffer_.yyraw;
return static_cast<const T*> (yyp); return static_cast<const T*> (yyp);
} }
/// A buffer large enough to store any of the semantic values.
/// Long double is chosen as it has the strongest alignment
/// constraints.
union union
{ {
long double align_me; /// Strongest alignment constraints.
char raw[S]; long double yyalign_me;
} buffer;]b4_parse_assert_if([ /// A buffer large enough to store any of the semantic values.
char yyraw[S];
} yybuffer_;]b4_parse_assert_if([
/// Whether the content is built: if defined, the name of the stored type. /// Whether the content is built: if defined, the name of the stored type.
const char *tname;])[ const char *yytname_;])[
}; };
]]) ]])