Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index bacdf37ce42c2743e6d5810677c4f8ce3261189c..c3678887386728d64805d2ac7217748f958a86b2 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -18,6 +18,38 @@
 
 m4_include(b4_pkgdatadir/[c++.m4])
 
 
 m4_include(b4_pkgdatadir/[c++.m4])
 

+# b4_subtract(LHS, RHS)
+# ---------------------
+# Evaluate LHS - RHS if they are integer literals, otherwise expand
+# to (LHS) - (RHS).
+m4_define([b4_subtract],
+[m4_bmatch([$1$2], [^[0123456789]*$],
+           [m4_eval([$1 - $2])],
+           [($1) - ($2)])])
+
+
+# b4_args(ARG1, ...)
+# _b4_args(ARG1, ...)
+# -------------------
+# Join with comma, skipping empty arguments.
+# b4_args calls itself recursively until it sees the first non-empty
+# argument, then calls _b4_args which prepends each non-empty argument
+# with a comma.
+m4_define([b4_args],
+[m4_if([$#$1],
+       [1], [],
+       [m4_ifval([$1],
+                 [$1[]_$0(m4_shift($@))],
+                 [$0(m4_shift($@))])])])
+
+# _b4_args(ARGS1, ...)
+# --------------------
+m4_define([_b4_args],
+[m4_if([$#$1],
+       [1], [],
+       [m4_ifval([$1], [, $1])[]$0(m4_shift($@))])])
+
+

 # b4_table_define(TABLE-NAME, CONTENT)
 # ------------------------------------
 # Define "parser::yy<TABLE-NAME>_" which contents is CONTENT.
 # b4_table_define(TABLE-NAME, CONTENT)
 # ------------------------------------
 # Define "parser::yy<TABLE-NAME>_" which contents is CONTENT.


@@ -84,7 +116,7 @@ m4_define([b4_lhs_location],
 # Return the data corresponding to the symbol #NUM, where the current
 # rule has RULE-LENGTH symbols on RHS.
 m4_define([b4_rhs_data],
 # Return the data corresponding to the symbol #NUM, where the current
 # rule has RULE-LENGTH symbols on RHS.
 m4_define([b4_rhs_data],

-          [yystack_@{($1) - ($2)@}])
+          [yystack_@{b4_subtract($@)@}])

 
 
 # b4_rhs_state(RULE-LENGTH, NUM)
 
 
 # b4_rhs_state(RULE-LENGTH, NUM)


@@ -111,12 +143,23 @@ m4_define([b4_rhs_location],
           [b4_rhs_data([$1], [$2]).location])
 
 
           [b4_rhs_data([$1], [$2]).location])
 
 

+# b4_symbol_(NUM, FIELD)
+# ----------------------
+# Recover a FIELD about symbol #NUM.  Thanks to m4_indir, fails if
+# undefined.
+m4_define([b4_symbol_],
+[m4_indir([b4_symbol($1, $2)])])
+
+

 # b4_symbol(NUM, FIELD)
 # ---------------------
 # Recover a FIELD about symbol #NUM.  Thanks to m4_indir, fails if
 # b4_symbol(NUM, FIELD)
 # ---------------------
 # Recover a FIELD about symbol #NUM.  Thanks to m4_indir, fails if

-# undefined.
+# undefined.  If FIELD = id, prepend the prefix.

 m4_define([b4_symbol],
 m4_define([b4_symbol],

-[m4_indir([b4_symbol($1, $2)])])
+[m4_case([$2],
+         [id],    [m4_do([b4_percent_define_get([token.prefix])],
+                         [b4_symbol_([$1], [id])])],
+         [b4_symbol_($@)])])

 
 
 # b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE)
 
 
 # b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE)


@@ -162,92 +205,157 @@ m4_define([b4_symbol_case_],
 # Run actions for the symbol NUMS that all have the same type-name.
 # Skip NUMS that have no type-name.
 m4_define([b4_type_action_],
 # Run actions for the symbol NUMS that all have the same type-name.
 # Skip NUMS that have no type-name.
 m4_define([b4_type_action_],

-[b4_symbol_if([$1], [has_type_name],
+[b4_symbol_if([$1], [has_type],

 [m4_map([b4_symbol_case_], [$@])[]dnl
         b4_dollar_dollar([b4_symbol([$1], [number])],
                          [b4_symbol([$1], [tag])],
 [m4_map([b4_symbol_case_], [$@])[]dnl
         b4_dollar_dollar([b4_symbol([$1], [number])],
                          [b4_symbol([$1], [tag])],

-                         [b4_symbol([$1], [type_name])]);
+                         [b4_symbol([$1], [type])]);

        break;
 
 ])])
 
 
        break;
 
 ])])
 
 

-# b4_symbol_constructor_declaration_(SYMBOL-NUMBERS)
-# ----------------------------------------------------
+# b4_symbol_constructor_declaration_(SYMBOL-NUMBER)
+# -------------------------------------------------

 # Declare the overloaded version of make_symbol for the (common) type of
 # these SYMBOL-NUMBERS.  Use at class-level.
 m4_define([b4_symbol_constructor_declaration_],
 # Declare the overloaded version of make_symbol for the (common) type of
 # these SYMBOL-NUMBERS.  Use at class-level.
 m4_define([b4_symbol_constructor_declaration_],

-[    template <token_type>
-    static inline symbol_type
-    make_symbol (b4_symbol_if([$1], [has_type_name],
-                              [const b4_symbol([$1], [type_name])& v, ])dnl
-const location_type& l);
+[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [has_id],
+[    static inline
+    symbol_type
+    make_[]b4_symbol_([$1], [id]) (dnl
+b4_args(b4_symbol_if([$1], [has_type],
+                     [const b4_symbol([$1], [type])& v]),
+        b4_locations_if([const location_type& l])));
+
+])])])

 
 

-])

 
 # b4_symbol_constructor_declarations
 # ----------------------------------
 
 # b4_symbol_constructor_declarations
 # ----------------------------------

-# Declare the overloaded versions of make_symbol for all the value types.
+# Declare symbol constructors for all the value types.

 # Use at class-level.
 m4_define([b4_symbol_constructor_declarations],
 [b4_variant_if([
 # Use at class-level.
 m4_define([b4_symbol_constructor_declarations],
 [b4_variant_if([

-    // Declaration of make_symbol for each value type.
-m4_map([b4_symbol_constructor_declaration_], m4_defn([b4_type_names]))])])
-
-
-
-# b4_symbol_constructor_specialization_(SYMBOL-NUMBER)
-# ----------------------------------------------------
-# Declare the specialization of make_symbol for this each SYMBOL-NUMBER.
-# Specializations cannot be declared at class-level, this must be done
-# at namespace-level.
-m4_define([b4_symbol_constructor_specialization_],
-[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [tag_is_id],
-[  template <>
-  inline
-  b4_parser_class_name::symbol_type
-  b4_parser_class_name::make_symbol <b4_parser_class_name::token::b4_symbol([$1], [tag])> (dnl
-b4_symbol_if([$1], [has_type_name],
-             [const b4_symbol([$1], [type_name])& v, ])dnl
-const b4_parser_class_name::location_type& l);
-])])])
-
-# b4_symbol_constructor_specializations
-# -------------------------------------
-# Declare specializations of make_symbol.
-m4_define([b4_symbol_constructor_specializations],
-[b4_variant_if([
-  // Specializations of make_symbol for each symbol type.
-m4_map([b4_symbol_constructor_specialization_],
-       m4_defn([b4_symbol_numbers]))])dnl
-])
+    // Symbol constructors declarations.
+m4_map([b4_symbol_constructor_declaration_], m4_defn([b4_symbol_numbers]))])])

 
 
 
 # b4_symbol_constructor_definition_(SYMBOL-NUMBER)
 # ------------------------------------------------
 
 
 
 # b4_symbol_constructor_definition_(SYMBOL-NUMBER)
 # ------------------------------------------------

-# Define make_symbol for this SYMBOL-NUMBER.
+# Define symbol constructor for this SYMBOL-NUMBER.

 m4_define([b4_symbol_constructor_definition_],
 m4_define([b4_symbol_constructor_definition_],

-[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [tag_is_id],
-[  template <>
-  b4_parser_class_name::symbol_type
-  b4_parser_class_name::make_symbol <b4_parser_class_name::token::b4_symbol([$1], [tag])> (dnl
-b4_symbol_if([$1], [has_type_name],
-             [const b4_symbol([$1], [type_name])& v, ])dnl
-const location_type& l)
+[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [has_id],
+[  b4_parser_class_name::symbol_type
+  b4_parser_class_name::make_[]b4_symbol_([$1], [id]) (dnl
+b4_args(b4_symbol_if([$1], [has_type],
+                     [const b4_symbol([$1], [type])& v]),
+        b4_locations_if([const location_type& l])))

   {
   {

-    return symbol_type (yytranslate_ (token::b4_symbol([$1], [tag])),dnl
- b4_symbol_if([$1], [has_type_name], [v, ])l);
+    return symbol_type (b4_args([yytranslate_ (token::b4_symbol([$1], [id]))],
+                                b4_symbol_if([$1], [has_type], [v]),
+                                b4_locations_if([l])));

   }
 
 ])])])
 
 
   }
 
 ])])])
 
 

-# b4_symbol_constructor_declarations
+# b4_symbol_constructor_definitions

 # ----------------------------------
 # Define the overloaded versions of make_symbol for all the value types.
 m4_define([b4_symbol_constructor_definitions],
 # ----------------------------------
 # Define the overloaded versions of make_symbol for all the value types.
 m4_define([b4_symbol_constructor_definitions],

-[b4_variant_if(
+[[  // symbol_base_type.
+  template <typename Exact>
+  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type ()
+    : value()]b4_locations_if([
+    , location()])[
+  {
+  }]b4_locations_if([[
+
+  template <typename Exact>
+  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type (const location_type& l)
+    : value()
+    , location(l)
+  {
+  }]])[
+
+  template <typename Exact>
+  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type (]b4_args(
+          [const semantic_type& v],
+          b4_locations_if([const location_type& l]))[)
+    : value(v)]b4_locations_if([
+    , location(l)])[
+  {
+  }
+
+  template <typename Exact>
+  const Exact&
+  ]b4_parser_class_name[::symbol_base_type<Exact>::self () const
+  {
+    return static_cast<const Exact&>(*this);
+  }
+
+  template <typename Exact>
+  Exact&
+  ]b4_parser_class_name[::symbol_base_type<Exact>::self ()
+  {
+    return static_cast<Exact&>(*this);
+  }
+
+  template <typename Exact>
+  int
+  ]b4_parser_class_name[::symbol_base_type<Exact>::type_get () const
+  {
+    return self ().type_get_ ();
+  }
+
+  // symbol_type.
+  ]b4_parser_class_name[::symbol_type::symbol_type ()
+    : super_type ()
+    , type ()
+  {
+  }
+
+  ]b4_parser_class_name[::symbol_type::symbol_type (]b4_args(
+                [int t],
+                b4_locations_if([const location_type& l]))[)
+    : super_type (]b4_locations_if([l])[)
+    , type (t)
+  {
+  }
+
+  ]b4_parser_class_name[::symbol_type::symbol_type (]b4_args(
+                 [int t],
+                 [const semantic_type& v],
+                 b4_locations_if([const location_type& l]))[)
+    : super_type (v]b4_locations_if([, l])[)
+    , type (t)
+  {
+  }
+
+  int
+  ]b4_parser_class_name[::symbol_type::type_get_ () const
+  {
+    return type;
+  }
+]b4_lex_symbol_if([[
+  ]b4_parser_class_name[::token_type
+  ]b4_parser_class_name[::symbol_type::token () const
+  {
+    // YYTOKNUM[NUM] -- (External) token number corresponding to the
+    // (internal) symbol number NUM (which must be that of a token).  */
+    static
+    const ]b4_int_type_for([b4_toknum])[
+    yytoken_number_[] =
+    {
+  ]b4_toknum[
+    };
+    return static_cast<token_type> (yytoken_number_[type]);
+  }
+]])[
+
+]b4_variant_if(

 [  // Implementation of make_symbol for each symbol type.
 m4_map([b4_symbol_constructor_definition_], m4_defn([b4_symbol_numbers]))])])
 
 [  // Implementation of make_symbol for each symbol type.
 m4_map([b4_symbol_constructor_definition_], m4_defn([b4_symbol_numbers]))])])
 


@@ -283,7 +391,14 @@ m4_define([_b4_char_sizeof_dummy],
 dummy[]_b4_char_sizeof_counter])
 
 
 dummy[]_b4_char_sizeof_counter])
 
 

-# b4_char_sizeof(SYMBOL-NUM)
+# b4_char_sizeof_(SYMBOL-NUM)
+# ---------------------------
+# A comment describing this symbol.
+m4_define([b4_char_sizeof_],
+[      // b4_symbol([$1], [tag])
+])
+
+# b4_char_sizeof(SYMBOL-NUMS)

 # --------------------------
 # To be mapped on the list of type names to produce:
 #
 # --------------------------
 # To be mapped on the list of type names to produce:
 #


@@ -291,12 +406,41 @@ dummy[]_b4_char_sizeof_counter])
 #    char dummy2[sizeof(type_name_2)];
 #
 # for defined type names.
 #    char dummy2[sizeof(type_name_2)];
 #
 # for defined type names.

-# $3 is doubly-quoted, do not quote it again.

 m4_define([b4_char_sizeof],
 m4_define([b4_char_sizeof],

-[m4_ifval(b4_symbol([$1], [type_name]),
+[b4_symbol_if([$1], [has_type],

 [
 [

-      char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type_name])])@}; // b4_symbol([$1], [tag])])dnl
-])
+m4_map([b4_char_sizeof_], [$@])dnl
+      char _b4_char_sizeof_dummy@{sizeof([b4_symbol([$1], [type])])@};
+])])
+
+
+# b4_yytranslate_definition
+# -------------------------
+# Define yytranslate_.  Sometimes we want it in the header file,
+# sometimes the cc file suffices.
+m4_define([b4_yytranslate_definition],
+[[  // Symbol number corresponding to token number t.
+  ]b4_parser_class_name[::token_number_type
+  ]b4_parser_class_name[::yytranslate_ (]b4_lex_symbol_if([token_type],
+                                                          [int])[ t)
+  {
+    static
+    const token_number_type
+    translate_table[] =
+    {
+]b4_translate[
+    };
+    const unsigned int user_token_number_max_ = ]b4_user_token_number_max[;
+    const token_number_type undef_token_ = ]b4_undef_token_number[;
+
+    if (static_cast<int>(t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
+      return translate_table[t];
+    else
+      return undef_token_;
+  }
+]])

 
 
 m4_pushdef([b4_copyright_years],
 
 
 m4_pushdef([b4_copyright_years],


@@ -309,15 +453,15 @@ m4_define([b4_parser_class_name],
 b4_defines_if([],
               [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
 
 b4_defines_if([],
               [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
 

-# Backward compatibility.
+b4_locations_if(
+[# Backward compatibility.

 m4_define([b4_location_constructors])
 m4_define([b4_location_constructors])

-m4_include(b4_pkgdatadir/[location.cc])
+m4_include(b4_pkgdatadir/[location.cc])])

 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl

-b4_defines_if(
-[@output(b4_spec_defines_file@)@
+@output(b4_spec_defines_file@)@

 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 dnl FIXME: This is wrong, we want computed header guards.
 [
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 dnl FIXME: This is wrong, we want computed header guards.
 [


@@ -334,8 +478,8 @@ dnl FIXME: This is wrong, we want computed header guards.
 #include "stack.hh"
 
 ]b4_namespace_open[
 #include "stack.hh"
 
 ]b4_namespace_open[

-  class position;
-  class location;
+]b4_locations_if([  class position;
+  class location;])[

 ]b4_variant_if(
 [[
   /// A char[S] buffer to store and retrieve objects.
 ]b4_variant_if(
 [[
   /// A char[S] buffer to store and retrieve objects.


@@ -436,7 +580,7 @@ dnl FIXME: This is wrong, we want computed header guards.
 ]])[
 ]b4_namespace_close[
 
 ]])[
 ]b4_namespace_close[
 

-#include "location.hh"
+]b4_locations_if([#include "location.hh"])[

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -456,7 +600,8 @@ dnl FIXME: This is wrong, we want computed header guards.
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 

-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+]b4_locations_if([dnl
+[/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 


@@ -473,7 +618,7 @@ do {                                                            \
       (Current).begin = (Current).end = (Rhs)[0].location.end; \
     }                                                           \
 } while (false)
       (Current).begin = (Current).end = (Rhs)[0].location.end; \
     }                                                           \
 } while (false)

-#endif
+#endif]])[

 
 ]b4_namespace_open[
 
 
 ]b4_namespace_open[
 


@@ -485,8 +630,7 @@ do {                                                            \
 ]b4_variant_if(
 [    /// An auxiliary type to compute the largest semantic type.
     union union_type
 ]b4_variant_if(
 [    /// An auxiliary type to compute the largest semantic type.
     union union_type

-    {]m4_map([b4_char_sizeof], m4_defn([b4_symbol_numbers]))[
-    };
+    {]m4_map([b4_char_sizeof], m4_defn([b4_type_names]))[};

 
     /// Symbol semantic values.
     typedef variant<sizeof(union_type)> semantic_type;],
 
     /// Symbol semantic values.
     typedef variant<sizeof(union_type)> semantic_type;],


@@ -500,9 +644,9 @@ m4_ifdef([b4_stype],
 [[    typedef YYSTYPE semantic_type;]])])])[
 #else
     typedef YYSTYPE semantic_type;
 [[    typedef YYSTYPE semantic_type;]])])])[
 #else
     typedef YYSTYPE semantic_type;

-#endif
+#endif]b4_locations_if([

     /// Symbol locations.
     /// Symbol locations.

-    typedef ]b4_percent_define_get([[location_type]])[ location_type;
+    typedef b4_percent_define_get([[location_type]]) location_type;])[

     /// Tokens.
     struct token
     {
     /// Tokens.
     struct token
     {


@@ -534,10 +678,10 @@ m4_ifdef([b4_stype],
 #endif
 
   private:
 #endif
 
   private:

-    /// Report a syntax error.
-    /// \param loc    where the syntax error is found.
+    /// Report a syntax error.]b4_locations_if([
+    /// \param loc    where the syntax error is found.])[

     /// \param msg    a description of the syntax error.
     /// \param msg    a description of the syntax error.

-    virtual void error (const location_type& loc, const std::string& msg);
+    virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg);

 
     /// Generate an error message.
     /// \param state   the state where the error occurred.
 
     /// Generate an error message.
     /// \param state   the state where the error occurred.


@@ -583,18 +727,14 @@ m4_ifdef([b4_stype],
 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
     /// For a symbol, its name in clear.
     static const char* const yytname_[];
 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
     /// For a symbol, its name in clear.
     static const char* const yytname_[];

-#endif
+#endif]b4_error_verbose_if([

 
 

-#if YYERROR_VERBOSE

     /// Convert the symbol name \a n to a form suitable for a diagnostic.
     /// Convert the symbol name \a n to a form suitable for a diagnostic.

-    virtual std::string yytnamerr_ (const char *n);
-#endif
+    static std::string yytnamerr_ (const char *n);])[

 
 #if YYDEBUG
     /// For each rule, its source line number.
     static const ]b4_int_type_for([b4_rline])[ yyrline_[];
 
 #if YYDEBUG
     /// For each rule, its source line number.
     static const ]b4_int_type_for([b4_rline])[ yyrline_[];

-    /// For each scanner token number, its symbol number.
-    static const ]b4_int_type_for([b4_toknum])[ yytoken_number_[];

     /// Report on the debug stream that the rule \a r is going to be reduced.
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.
     /// Report on the debug stream that the rule \a r is going to be reduced.
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.


@@ -606,7 +746,7 @@ m4_ifdef([b4_stype],
 #endif
 
     /// Convert a scanner token number \a t to a symbol number.
 #endif
 
     /// Convert a scanner token number \a t to a symbol number.

-    static inline token_number_type yytranslate_ (int t);
+    static inline token_number_type yytranslate_ (]b4_lex_symbol_if([token_type], [int])[ t);

 
     /// A complete symbol, with its type.
     template <typename Exact>
 
     /// A complete symbol, with its type.
     template <typename Exact>


@@ -615,9 +755,11 @@ m4_ifdef([b4_stype],
       /// Default constructor.
       inline symbol_base_type ();
 
       /// Default constructor.
       inline symbol_base_type ();
 

-      /// Constructor.
-      inline symbol_base_type (const location_type& l);
-      inline symbol_base_type (const semantic_type& v, const location_type& l);
+      /// Constructor.]b4_locations_if([
+      inline symbol_base_type (const location_type& l)])[;
+      inline symbol_base_type (]b4_args(
+        [const semantic_type& v],
+        b4_locations_if([const location_type& l]))[);

 
       /// Return this with its exact type.
       const Exact& self () const;
 
       /// Return this with its exact type.
       const Exact& self () const;


@@ -627,10 +769,10 @@ m4_ifdef([b4_stype],
       int type_get () const;
 
       /// The semantic value.
       int type_get () const;
 
       /// The semantic value.

-      semantic_type value;
+      semantic_type value;]b4_locations_if([

 
       /// The location.
 
       /// The location.

-      location_type location;
+      location_type location;])[

     };
 
 #if YYDEBUG
     };
 
 #if YYDEBUG


@@ -661,17 +803,21 @@ m4_ifdef([b4_stype],
       inline symbol_type ();
 
       /// Constructor.
       inline symbol_type ();
 
       /// Constructor.

-      inline symbol_type (int t,
-                          const semantic_type& v, const location_type& l);
+      inline symbol_type (]b4_args([int t],
+                                   [const semantic_type& v],
+                                   b4_locations_if([const location_type& l]))[);

 
 

-      inline symbol_type (int t,
-                          const location_type& l);
+      inline symbol_type (]b4_args([int t],
+                                   b4_locations_if([const location_type& l]))[);

 
       /// The symbol type.
       int type;
 
       /// Return the type corresponding to this state.
       inline int type_get_ () const;
 
       /// The symbol type.
       int type;
 
       /// Return the type corresponding to this state.
       inline int type_get_ () const;

+
+      /// Its token.
+      inline token_type token () const;

     };
 
 ]b4_symbol_constructor_declarations[
     };
 
 ]b4_symbol_constructor_declarations[


@@ -687,8 +833,9 @@ m4_ifdef([b4_stype],
       inline stack_symbol_type ();
 
       /// Constructor.
       inline stack_symbol_type ();
 
       /// Constructor.

-      inline stack_symbol_type (state_type s,
-                                const semantic_type& v, const location_type& l);
+      inline stack_symbol_type (]b4_args([state_type s],
+                                         [const semantic_type& v],
+                                         b4_locations_if([const location_type& l]))[);

 
       /// The state.
       state_type state;
 
       /// The state.
       state_type state;


@@ -736,7 +883,9 @@ m4_ifdef([b4_stype],
 
 ]b4_parse_param_vars[
   };
 
 ]b4_parse_param_vars[
   };

-]b4_symbol_constructor_specializations[
+
+]b4_lex_symbol_if([b4_yytranslate_definition])[
+]b4_lex_symbol_if([b4_symbol_constructor_definitions])[

 ]b4_namespace_close[
 
 ]b4_percent_define_flag_if([[global_tokens_and_yystype]],
 ]b4_namespace_close[
 
 ]b4_percent_define_flag_if([[global_tokens_and_yystype]],


@@ -750,7 +899,6 @@ m4_ifdef([b4_stype],
 b4_percent_code_get([[provides]])[]dnl
 
 [#endif /* ! defined PARSER_HEADER_H */]
 b4_percent_code_get([[provides]])[]dnl
 
 [#endif /* ! defined PARSER_HEADER_H */]

-])dnl

 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl


@@ -760,10 +908,9 @@ m4_if(b4_prefix, [yy], [],
 #define yylex   b4_prefix[]lex])[
 
 /* First part of user declarations.  */
 #define yylex   b4_prefix[]lex])[
 
 /* First part of user declarations.  */

-]b4_user_pre_prologue
+]b4_user_pre_prologue[

 
 

-b4_defines_if([[
-#include "@basename(]b4_spec_defines_file[@)"]])[
+#include "@basename(]b4_spec_defines_file[@)"

 
 /* User implementation prologue.  */
 ]b4_user_post_prologue
 
 /* User implementation prologue.  */
 ]b4_user_post_prologue


@@ -829,8 +976,7 @@ b4_percent_code_get[]dnl
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 

-]b4_namespace_open[
-#if YYERROR_VERBOSE
+]b4_namespace_open[]b4_error_verbose_if([[

 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is


@@ -868,8 +1014,7 @@ b4_percent_code_get[]dnl
 
     return yystr;
   }
 
     return yystr;
   }

-
-#endif
+]])[

 
   /// Build a parser object.
   ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
 
   /// Build a parser object.
   ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [


@@ -890,77 +1035,7 @@ b4_percent_code_get[]dnl
   | Symbol types.  |
   `---------------*/
 
   | Symbol types.  |
   `---------------*/
 

-  // symbol_base_type.
-  template <typename Exact>
-  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type ()
-    : value()
-    , location()
-  {
-  }
-
-  template <typename Exact>
-  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type (const location_type& l)
-    : value()
-    , location(l)
-  {
-  }
-
-  template <typename Exact>
-  ]b4_parser_class_name[::symbol_base_type<Exact>::symbol_base_type (const semantic_type& v, const location_type& l)
-    : value(v)
-    , location(l)
-  {
-  }
-
-  template <typename Exact>
-  const Exact&
-  ]b4_parser_class_name[::symbol_base_type<Exact>::self () const
-  {
-    return static_cast<const Exact&>(*this);
-  }
-
-  template <typename Exact>
-  Exact&
-  ]b4_parser_class_name[::symbol_base_type<Exact>::self ()
-  {
-    return static_cast<Exact&>(*this);
-  }
-
-  template <typename Exact>
-  int
-  ]b4_parser_class_name[::symbol_base_type<Exact>::type_get () const
-  {
-    return self ().type_get_ ();
-  }
-
-  // symbol_type.
-  ]b4_parser_class_name[::symbol_type::symbol_type ()
-    : super_type ()
-    , type ()
-  {
-  }
-
-  ]b4_parser_class_name[::symbol_type::symbol_type (int t,
-                           const location_type& l)
-    : super_type (l)
-    , type (t)
-  {
-  }
-
-  ]b4_parser_class_name[::symbol_type::symbol_type (int t,
-                           const semantic_type& v, const location_type& l)
-    : super_type (v, l)
-    , type (t)
-  {
-  }
-
-  int
-  ]b4_parser_class_name[::symbol_type::type_get_ () const
-  {
-    return type;
-  }
-
-]b4_symbol_constructor_definitions[
+]b4_lex_symbol_if([], [b4_symbol_constructor_definitions])[

 
   // stack_symbol_type.
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()
 
   // stack_symbol_type.
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()


@@ -969,9 +1044,11 @@ b4_percent_code_get[]dnl
   {
   }
 
   {
   }
 

-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s,
-                           const semantic_type& v, const location_type& l)
-    : super_type (v, l)
+  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_args(
+                 [state_type s],
+                 [const semantic_type& v],
+                 b4_locations_if([const location_type& l]))[)
+    : super_type (v]b4_locations_if([, l])[)

     , state (s)
   {
   }
     , state (s)
   {
   }


@@ -1013,8 +1090,8 @@ b4_percent_code_get[]dnl
   {
     int yytype = yysym.type_get ();
     yyo << (yytype < yyntokens_ ? "token" : "nterm")
   {
     int yytype = yysym.type_get ();
     yyo << (yytype < yyntokens_ ? "token" : "nterm")

-        << ' ' << yytname_[yytype] << " ("
-        << yysym.location << ": ";
+        << ' ' << yytname_[yytype] << " ("]b4_locations_if([
+        << yysym.location << ": "])[;

     switch (yytype)
       {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))[
     switch (yytype)
       {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))[


@@ -1032,10 +1109,16 @@ b4_percent_code_get[]dnl
     if (m)
       YY_SYMBOL_PRINT (m, sym);
 ]b4_variant_if(
     if (m)
       YY_SYMBOL_PRINT (m, sym);
 ]b4_variant_if(

-[[    yystack_.push (stack_symbol_type (s, semantic_type(), sym.location));
+[[    yystack_.push (stack_symbol_type (]b4_args(
+                    [s],
+                    [semantic_type()],
+                    b4_locations_if([sym.location]))[));

     ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]],
                        [build], [sym.value])],
     ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]],
                        [build], [sym.value])],

-[    yystack_.push (stack_symbol_type (s, sym.value, sym.location));])[
+[[    yystack_.push (stack_symbol_type (]b4_args(
+                      [s],
+                      [sym.value],
+                      b4_locations_if([sym.location]))[));]])[

   }
 
   void
   }
 
   void


@@ -1044,7 +1127,10 @@ b4_percent_code_get[]dnl
     if (m)
       YY_SYMBOL_PRINT (m, s);
 ]b4_variant_if(
     if (m)
       YY_SYMBOL_PRINT (m, s);
 ]b4_variant_if(

-[[    yystack_.push (stack_symbol_type (s.state, semantic_type(), s.location));
+[[    yystack_.push (stack_symbol_type (]b4_args(
+                       [s.state],
+                       [semantic_type()],
+                       b4_locations_if([s.location]))[));

     ]b4_symbol_variant([[yystos_[s.state]]], [[yystack_[0].value]],
                        [build], [s.value])],
 [    yystack_.push (s);])[
     ]b4_symbol_variant([[yystos_[s.state]]], [[yystack_[0].value]],
                        [build], [s.value])],
 [    yystack_.push (s);])[


@@ -1099,10 +1185,10 @@ b4_percent_code_get[]dnl
     int yyerrstatus_ = 0;
 
     /// The lookahead symbol.
     int yyerrstatus_ = 0;
 
     /// The lookahead symbol.

-    symbol_type yyla;
+    symbol_type yyla;]b4_locations_if([[

 
     /// The locations where the error started and ended.
 
     /// The locations where the error started and ended.

-    stack_symbol_type yyerror_range[2];
+    stack_symbol_type yyerror_range[2];]])[

 
     /// $$ and @@$.
     stack_symbol_type yylhs;
 
     /// $$ and @@$.
     stack_symbol_type yylhs;


@@ -1152,7 +1238,8 @@ m4_popdef([b4_at_dollar])])dnl
       {
         YYCDEBUG << "Reading a token: ";
 ]b4_lex_symbol_if(
       {
         YYCDEBUG << "Reading a token: ";
 ]b4_lex_symbol_if(

-[        yyla = yylex();],
+[        yyla = b4_c_function_call([yylex], [symbol_type],
+                                   m4_ifdef([b4_lex_param], b4_lex_param));],

 [        yyla.type = yytranslate_ (b4_c_function_call([yylex], [int],
                                     [[YYSTYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl
 [        yyla.type = yytranslate_ (b4_c_function_call([yylex], [int],
                                     [[YYSTYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl


@@ -1218,12 +1305,13 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
       yylhs.value = yystack_@{yylen - 1@}.value;
     else
       yylhs.value = yystack_@{0@}.value;])[
       yylhs.value = yystack_@{yylen - 1@}.value;
     else
       yylhs.value = yystack_@{0@}.value;])[

-
+]b4_locations_if([dnl
+[

     // Compute the default @@$.
     {
       slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
       YYLLOC_DEFAULT (yylhs.location, slice, yylen);
     // Compute the default @@$.
     {
       slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
       YYLLOC_DEFAULT (yylhs.location, slice, yylen);

-    }
+    }]])[

 
     // Perform the reduction.
     YY_REDUCE_PRINT (yyn);
 
     // Perform the reduction.
     YY_REDUCE_PRINT (yyn);


@@ -1272,10 +1360,12 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     if (!yyerrstatus_)
       {
        ++yynerrs_;
     if (!yyerrstatus_)
       {
        ++yynerrs_;

-       error (yyla.location, yysyntax_error_ (yystate, yyla.type));
+       error (]b4_args(b4_locations_if([yyla.location]),
+                        [yysyntax_error_ (yystate, yyla.type)])[);

       }
 
       }
 

-    yyerror_range[0].location = yyla.location;
+]b4_locations_if([[
+    yyerror_range[0].location = yyla.location;]])[

     if (yyerrstatus_ == 3)
       {
        /* If just tried and failed to reuse lookahead token after an
     if (yyerrstatus_ == 3)
       {
        /* If just tried and failed to reuse lookahead token after an


@@ -1307,7 +1397,8 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     if (false)
       goto yyerrorlab;
 
     if (false)
       goto yyerrorlab;
 

-    yyerror_range[0].location = yystack_[yylen - 1].location;
+]b4_locations_if([[
+    yyerror_range[0].location = yystack_[yylen - 1].location;]])[

     /* Do not reclaim the symbols of the rule which action triggered
        this YYERROR.  */
     yypop_ (yylen);
     /* Do not reclaim the symbols of the rule which action triggered
        this YYERROR.  */
     yypop_ (yylen);


@@ -1339,16 +1430,16 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
           // Pop the current state because it cannot handle the error token.
           if (yystack_.size () == 1)
             YYABORT;
           // Pop the current state because it cannot handle the error token.
           if (yystack_.size () == 1)
             YYABORT;

-
-          yyerror_range[0].location = yystack_[0].location;
+]b4_locations_if([[
+          yyerror_range[0].location = yystack_[0].location;]])[

           yy_destroy_ ("Error: popping", yystack_[0]);
           yypop_ ();
           yystate = yystack_[0].state;
           YY_STACK_PRINT ();
         }
           yy_destroy_ ("Error: popping", yystack_[0]);
           yypop_ ();
           yystate = yystack_[0].state;
           YY_STACK_PRINT ();
         }

-
+]b4_locations_if([[

       yyerror_range[1].location = yyla.location;
       yyerror_range[1].location = yyla.location;

-      YYLLOC_DEFAULT (error_token.location, (yyerror_range - 1), 2);
+      YYLLOC_DEFAULT (error_token.location, (yyerror_range - 1), 2);]])[

 
       /* Shift the error token.  */
       error_token.state = yystate = yyn;
 
       /* Shift the error token.  */
       error_token.state = yystate = yyn;


@@ -1384,12 +1475,11 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
 
   // Generate an error message.
   std::string
 
   // Generate an error message.
   std::string

-  ]b4_parser_class_name[::yysyntax_error_ (int yystate, int]dnl
-b4_error_verbose_if([ yytoken])[)
+  ]b4_parser_class_name[::yysyntax_error_ (]dnl
+b4_error_verbose_if([int yystate, int yytoken],
+                    [int, int])[)

   {
   {

-    std::string yyres;
-    YYUSE (yystate);
-#if YYERROR_VERBOSE
+    std::string yyres;]b4_error_verbose_if([[

     int yyn = yypact_[yystate];
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {
     int yyn = yypact_[yystate];
     if (yypact_ninf_ < yyn && yyn <= yylast_)
       {


@@ -1446,8 +1536,8 @@ b4_error_verbose_if([ yytoken])[)
             yyres += *yyp;
       }
     else
             yyres += *yyp;
       }
     else

-#endif
-      yyres = YY_("syntax error");
+  ]])dnl
+[    yyres = YY_("syntax error");

     return yyres;
   }
 
     return yyres;
   }
 


@@ -1481,12 +1571,6 @@ b4_error_verbose_if([ yytoken])[)
      symbol of state STATE-NUM.  */
   ]b4_table_define([stos], [b4_stos])[;
 
      symbol of state STATE-NUM.  */
   ]b4_table_define([stos], [b4_stos])[;
 

-#if YYDEBUG
-  /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
-     to YYLEX-NUM.  */
-  ]b4_table_define([token_number], [b4_toknum])[;
-#endif
-

   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
   ]b4_table_define([r1], [b4_r1])[;
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
   ]b4_table_define([r1], [b4_r1])[;
 


@@ -1536,27 +1620,7 @@ b4_error_verbose_if([ yytoken])[)
   }
 #endif // YYDEBUG
 
   }
 #endif // YYDEBUG
 

-  /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-  ]b4_parser_class_name[::token_number_type
-  ]b4_parser_class_name[::yytranslate_ (int t)
-  {
-    static
-    const token_number_type
-    translate_table[] =
-    {
-]b4_translate[
-    };
-    const unsigned int user_token_number_max_ = ]b4_user_token_number_max[;
-    const token_number_type undef_token_ = ]b4_undef_token_number[;
-
-    if (t <= yyeof_)
-      return yyeof_;
-    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
-      return translate_table[t];
-    else
-      return undef_token_;
-  }
-
+]b4_lex_symbol_if([], [b4_yytranslate_definition])[

 ]b4_namespace_close[
 
 ]b4_epilogue[]dnl
 ]b4_namespace_close[
 
 ]b4_epilogue[]dnl