maint: mention help2man, texinfo, apt-get

[bison.git] / data / variant.hh

diff --git a/data/variant.hh b/data/variant.hh
index 968d64964406e6a414f01ca52afce677c96598fb..76c3e60dc1081f445532f96c03c13233b93a5871 100644 (file)
--- a/data/variant.hh
+++ b/data/variant.hh
@@ -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,22 +95,22 @@ m4_define([b4_variant_define],
 
     /// Empty construction.
     variant ()]b4_parse_assert_if([
-      : tname (YY_NULL)])[
+      : yytname_ (YY_NULL)])[
     {}
 
     /// Construct and fill.
     template <typename T>
     variant (const T& t)]b4_parse_assert_if([
-      : tname (typeid (T).name ())])[
+      : yytname_ (typeid (T).name ())])[
     {
       YYASSERT (sizeof (T) <= S);
-      new (as_ <T> ()) T (t);
+      new (yyas_<T> ()) T (t);
     }
 
     /// Destruction, allowed only if empty.
     ~variant ()
     {]b4_parse_assert_if([
-      YYASSERT (!tname);
+      YYASSERT (!yytname_);
     ])[}
 
     /// Instantiate an empty \a T in here.
@@ -118,10 +118,10 @@ m4_define([b4_variant_define],
     T&
     build ()
     {]b4_parse_assert_if([
-      YYASSERT (!tname);
+      YYASSERT (!yytname_);
       YYASSERT (sizeof (T) <= S);
-      tname = typeid (T).name ();])[
-      return *new (as_<T> ()) T;
+      yytname_ = typeid (T).name ();])[
+      return *new (yyas_<T> ()) T;
     }
 
     /// Instantiate a \a T in here from \a t.
@@ -129,10 +129,10 @@ m4_define([b4_variant_define],
     T&
     build (const T& t)
     {]b4_parse_assert_if([
-      YYASSERT (!tname);
+      YYASSERT (!yytname_);
       YYASSERT (sizeof (T) <= S);
-      tname = typeid (T).name ();])[
-      return *new (as_<T> ()) T (t);
+      yytname_ = typeid (T).name ();])[
+      return *new (yyas_<T> ()) T (t);
     }
 
     /// Accessor to a built \a T.
@@ -140,9 +140,9 @@ m4_define([b4_variant_define],
     T&
     as ()
     {]b4_parse_assert_if([
-      YYASSERT (tname == typeid (T).name ());
+      YYASSERT (yytname_ == typeid (T).name ());
       YYASSERT (sizeof (T) <= S);])[
-      return *as_<T> ();
+      return *yyas_<T> ();
     }
 
     /// Const accessor to a built \a T (for %printer).
@@ -150,9 +150,9 @@ m4_define([b4_variant_define],
     const T&
     as () const
     {]b4_parse_assert_if([
-      YYASSERT (tname == typeid (T).name ());
+      YYASSERT (yytname_ == typeid (T).name ());
       YYASSERT (sizeof (T) <= S);])[
-      return *as_<T> ();
+      return *yyas_<T> ();
     }
 
     /// Swap the content with \a other, of same type.
@@ -167,8 +167,8 @@ m4_define([b4_variant_define],
     void
     swap (self_type& other)
     {]b4_parse_assert_if([
-      YYASSERT (tname);
-      YYASSERT (tname == other.tname);])[
+      YYASSERT (yytname_);
+      YYASSERT (yytname_ == other.yytname_);])[
       std::swap (as<T> (), other.as<T> ());
     }
 
@@ -178,8 +178,7 @@ m4_define([b4_variant_define],
     template <typename T>
     void
     move (self_type& other)
-    {]b4_parse_assert_if([
-      YYASSERT (!tname);])[
+    {
       build<T> ();
       swap<T> (other);
       other.destroy<T> ();
@@ -199,7 +198,7 @@ m4_define([b4_variant_define],
     destroy ()
     {
       as<T> ().~T ();]b4_parse_assert_if([
-      tname = YY_NULL;])[
+      yytname_ = YY_NULL;])[
     }
 
   private:
@@ -210,32 +209,31 @@ m4_define([b4_variant_define],
     /// Accessor to raw memory as \a T.
     template <typename T>
     T*
-    as_ ()
+    yyas_ ()
     {
-      void *yyp = buffer.raw;
+      void *yyp = yybuffer_.yyraw;
       return static_cast<T*> (yyp);
      }
 
     /// Const accessor to raw memory as \a T.
     template <typename T>
     const T*
-    as_ () const
+    yyas_ () const
     {
-      const void *yyp = buffer.raw;
+      const void *yyp = yybuffer_.yyraw;
       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
     {
-      long double align_me;
-      char raw[S];
-    } buffer;]b4_parse_assert_if([
+      /// 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 *tname;])[
+    const char *yytname_;])[
   };
 ]])
 
@@ -245,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<sizeof(union_type)> semantic_type;dnl
+    typedef variant<sizeof(union_type)> semantic_type;][]dnl
 ])
 
 
@@ -322,14 +320,13 @@ b4_join(b4_symbol_if([$1], [has_type],
     return symbol_type (b4_join([token::b4_symbol([$1], [id])],
                                 b4_symbol_if([$1], [has_type], [v]),
                                 b4_locations_if([l])));
-
   }
 
 ])])])
 
 
 # b4_basic_symbol_constructor_declare
-# ----------------------------------
+# -----------------------------------
 # Generate a constructor declaration for basic_symbol from given type.
 m4_define([b4_basic_symbol_constructor_declare],
 [[