X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ee9cf8c4a6bf34fe291ed860e0d7779d78a5bcb0..3afe18fd1fdc467e6662158275c5d8c3b7121e83:/data/variant.hh diff --git a/data/variant.hh b/data/variant.hh index 3b21329c..19538f6d 100644 --- a/data/variant.hh +++ b/data/variant.hh @@ -26,7 +26,7 @@ # YYTYPE. m4_define([b4_symbol_variant], [m4_pushdef([b4_dollar_dollar], - [$2.$3< $][3 >(m4_shift3($@))])dnl + [$2.$3< $][3 > (m4_shift3($@))])dnl switch ($1) { b4_type_foreach([b4_type_action_])[]dnl @@ -63,7 +63,7 @@ m4_define([b4_char_sizeof], [b4_symbol_if([$1], [has_type], [ m4_map([ b4_symbol_tag_comment], [$@])dnl - char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type])])@}; + char _b4_char_sizeof_dummy@{sizeof(b4_symbol([$1], [type]))@}; ])]) @@ -95,24 +95,22 @@ m4_define([b4_variant_define], /// Empty construction. variant ()]b4_parse_assert_if([ - : built (false) - , tname (YY_NULL)])[ + : yytname_ (YY_NULL)])[ {} /// Construct and fill. template variant (const T& t)]b4_parse_assert_if([ - : built (true) - , tname (typeid (T).name ())])[ + : yytname_ (typeid (T).name ())])[ { YYASSERT (sizeof (T) <= S); - new (buffer.raw) T (t); + new (yyas_ ()) T (t); } /// Destruction, allowed only if empty. ~variant () {]b4_parse_assert_if([ - YYASSERT (!built); + YYASSERT (!yytname_); ])[} /// Instantiate an empty \a T in here. @@ -120,12 +118,10 @@ m4_define([b4_variant_define], T& build () {]b4_parse_assert_if([ - YYASSERT (!built); - YYASSERT (!tname); + YYASSERT (!yytname_); YYASSERT (sizeof (T) <= S); - built = true; - tname = typeid (T).name ();])[ - return *new (buffer.raw) T; + yytname_ = typeid (T).name ();])[ + return *new (yyas_ ()) T; } /// Instantiate a \a T in here from \a t. @@ -133,12 +129,10 @@ m4_define([b4_variant_define], T& build (const T& t) {]b4_parse_assert_if([ - YYASSERT (!built); - YYASSERT (!tname); + YYASSERT (!yytname_); YYASSERT (sizeof (T) <= S); - built = true; - tname = typeid (T).name ();])[ - return *new (buffer.raw) T (t); + yytname_ = typeid (T).name ();])[ + return *new (yyas_ ()) T (t); } /// Accessor to a built \a T. @@ -146,10 +140,9 @@ m4_define([b4_variant_define], T& as () {]b4_parse_assert_if([ - YYASSERT (built); - YYASSERT (tname == typeid (T).name ()); + YYASSERT (yytname_ == typeid (T).name ()); YYASSERT (sizeof (T) <= S);])[ - return reinterpret_cast (buffer.raw); + return *yyas_ (); } /// Const accessor to a built \a T (for %printer). @@ -157,10 +150,9 @@ m4_define([b4_variant_define], const T& as () const {]b4_parse_assert_if([ - YYASSERT (built); - YYASSERT (tname == typeid (T).name ()); + YYASSERT (yytname_ == typeid (T).name ()); YYASSERT (sizeof (T) <= S);])[ - return reinterpret_cast (buffer.raw); + return *yyas_ (); } /// Swap the content with \a other, of same type. @@ -175,10 +167,9 @@ m4_define([b4_variant_define], void swap (self_type& other) {]b4_parse_assert_if([ - YYASSERT (built); - YYASSERT (other.built); - YYASSERT (tname == other.tname);])[ - std::swap (as(), other.as()); + YYASSERT (yytname_); + YYASSERT (yytname_ == other.yytname_);])[ + std::swap (as (), other.as ()); } /// Move the content of \a other to this. @@ -187,11 +178,10 @@ m4_define([b4_variant_define], template void move (self_type& other) - {]b4_parse_assert_if([ - YYASSERT (! built);])[ - build(); - swap(other); - other.destroy(); + { + build (); + swap (other); + other.destroy (); } /// Copy the content of \a other to this. @@ -208,8 +198,7 @@ m4_define([b4_variant_define], destroy () { as ().~T ();]b4_parse_assert_if([ - built = false; - tname = YY_NULL;])[ + yytname_ = YY_NULL;])[ } private: @@ -217,19 +206,34 @@ m4_define([b4_variant_define], self_type& operator=(const self_type&); variant (const self_type&); - /// A buffer large enough to store any of the semantic values. - /// Long double is chosen as it has the strongest alignment - /// constraints. + /// Accessor to raw memory as \a T. + template + T* + yyas_ () + { + void *yyp = yybuffer_.yyraw; + return static_cast (yyp); + } + + /// Const accessor to raw memory as \a T. + template + const T* + yyas_ () const + { + const void *yyp = yybuffer_.yyraw; + return static_cast (yyp); + } + union { - long double align_me; - char raw[S]; - } buffer;]b4_parse_assert_if([ - - /// Whether the content is built. - bool built; - /// If defined, the name of the stored type. - const char* tname;])[ + /// Strongest alignment constraints. + long double yyalign_me; + /// 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. + const char *yytname_;])[ }; ]]) @@ -239,16 +243,16 @@ m4_define([b4_variant_define], ## -------------------------- ## -# b4_semantic_type_declare -# ------------------------ +# b4_value_type_declare +# --------------------- # Declare semantic_type. -m4_define([b4_semantic_type_declare], -[ /// An auxiliary type to compute the largest semantic type. +m4_define([b4_value_type_declare], +[[ /// An auxiliary type to compute the largest semantic type. union union_type {]b4_type_foreach([b4_char_sizeof])[}; /// Symbol semantic values. - typedef variant semantic_type;dnl + typedef variant semantic_type;][]dnl ]) @@ -258,7 +262,7 @@ m4_define([b4_semantic_type_declare], # ---------------------------- m4_define([b4_symbol_value], [m4_ifval([$2], - [$1.as< $2 >()], + [$1.as< $2 > ()], [$1])]) # b4_symbol_value_template(VAL, [TYPE]) @@ -266,7 +270,7 @@ m4_define([b4_symbol_value], # Same as b4_symbol_value, but used in a template method. m4_define([b4_symbol_value_template], [m4_ifval([$2], - [$1.template as< $2 >()], + [$1.template as< $2 > ()], [$1])]) @@ -323,7 +327,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], [[