build: fix VPATH issue

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 91f5c27d2aec59a7d2f6792f6337d4c0e6312fe7..178b8fa992e8d7428e4939f50a54c16c96cab011 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -20,7 +20,7 @@ m4_include(b4_pkgdatadir/[c++.m4])
 
 # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
 # --------------------------------------------------------------
 
 # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
 # --------------------------------------------------------------

-# Declare "parser::yy<TABLE-NAME>_" which contents is CONTENT.
+# Declare "parser::yy<TABLE-NAME>_" whose contents is CONTENT.

 m4_define([b4_integral_parser_table_declare],
 [m4_ifval([$3], [b4_comment([$3], [  ])
 ])dnl
 m4_define([b4_integral_parser_table_declare],
 [m4_ifval([$3], [b4_comment([$3], [  ])
 ])dnl


@@ -29,7 +29,7 @@ m4_define([b4_integral_parser_table_declare],
 
 # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
 # -------------------------------------------------------------
 
 # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
 # -------------------------------------------------------------

-# Define "parser::yy<TABLE-NAME>_" which contents is CONTENT.
+# Define "parser::yy<TABLE-NAME>_" whose contents is CONTENT.

 m4_define([b4_integral_parser_table_define],
 [  const b4_int_type_for([$2])
   b4_parser_class_name::yy$1_[[]] =
 m4_define([b4_integral_parser_table_define],
 [  const b4_int_type_for([$2])
   b4_parser_class_name::yy$1_[[]] =


@@ -146,7 +146,8 @@ b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 m4_define([b4_shared_declarations],
 [b4_percent_code_get([[requires]])[
 ]b4_parse_assert_if([# include <cassert>])[
 m4_define([b4_shared_declarations],
 [b4_percent_code_get([[requires]])[
 ]b4_parse_assert_if([# include <cassert>])[

-# include <deque>
+# include <cstdlib>  // abort
+# include <vector>

 # include <iostream>
 # include <stdexcept>
 # include <string>]b4_defines_if([[
 # include <iostream>
 # include <stdexcept>
 # include <string>]b4_defines_if([[


@@ -227,6 +228,9 @@ b4_location_define])])[
     static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;
 
     static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;
 

+    /// Convert a scanner token number \a t to a symbol number.
+    static inline token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
+

     // Tables.
 ]b4_parser_tables_declare[]b4_error_verbose_if([
 
     // Tables.
 ]b4_parser_tables_declare[]b4_error_verbose_if([
 


@@ -238,7 +242,7 @@ b4_location_define])])[
     static const char* const yytname_[];
 ]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[
 ]b4_integral_parser_table_declare([rline], [b4_rline],
     static const char* const yytname_[];
 ]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[
 ]b4_integral_parser_table_declare([rline], [b4_rline],

-     [YYRLINE[YYN] -- Source line where rule number YYN was defined.])[
+     [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[

     /// 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.


@@ -247,50 +251,48 @@ b4_location_define])])[
     // Debugging.
     int yydebug_;
     std::ostream* yycdebug_;
     // Debugging.
     int yydebug_;
     std::ostream* yycdebug_;

-#endif // ]b4_api_PREFIX[DEBUG

 
 

-    /// Convert a scanner token number \a t to a symbol number.
-    static inline token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
-
-#if ]b4_api_PREFIX[DEBUG

     /// \brief Display a symbol type, value and location.
     /// \param yyo    The output stream.
     /// \param yysym  The symbol.
     /// \brief Display a symbol type, value and location.
     /// \param yyo    The output stream.
     /// \param yysym  The symbol.

-    template <typename Exact>
+    template <typename Base>

     void yy_print_ (std::ostream& yyo,
     void yy_print_ (std::ostream& yyo,

-                    const symbol_base_type<Exact>& yysym) const;
+                    const basic_symbol<Base>& yysym) const;

 #endif
 
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg     Why this token is reclaimed.
     ///                  If null, print nothing.
     /// \param s         The symbol.
 #endif
 
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg     Why this token is reclaimed.
     ///                  If null, print nothing.
     /// \param s         The symbol.

-    template <typename Exact>
+    template <typename Base>

     inline void yy_destroy_ (const char* yymsg,
     inline void yy_destroy_ (const char* yymsg,

-                             symbol_base_type<Exact>& yysym) const;
+                             basic_symbol<Base>& yysym) const;

 
   private:
 
   private:

-    /// Element of the stack: a state and its attributes.
-    struct stack_symbol_type : symbol_base_type<stack_symbol_type>
+    /// Type access provider for state based symbols.
+    struct by_state

     {
     {

-      /// The parent class.
-      typedef symbol_base_type<stack_symbol_type> super_type;
-

       /// Default constructor.
       /// Default constructor.

-      inline stack_symbol_type ();
+      inline by_state ();

 
       /// Constructor.
 
       /// Constructor.

-      inline stack_symbol_type (]b4_join([state_type s],
-                                         [const semantic_type& v],
-                                         b4_locations_if([const location_type& l]))[);
+      inline by_state (state_type s);
+
+      /// Copy constructor.
+      inline by_state (const by_state& other);

 
       /// The state.
       state_type state;
 
       /// The type (corresponding to \a state).
 
       /// The state.
       state_type state;
 
       /// The type (corresponding to \a state).

-      inline int type_get_ () const;
+      inline int type_get () const;
+
+      typedef state_type value_type;

     };
 
     };
 

+    /// "Internal" symbol: element of the stack.
+    typedef basic_symbol<by_state> stack_symbol_type;
+

     /// Stack type.
     typedef stack<stack_symbol_type> stack_type;
 
     /// Stack type.
     typedef stack<stack_symbol_type> stack_type;
 


@@ -509,33 +511,29 @@ m4_if(b4_prefix, [yy], [],
 
 ]b4_token_ctor_if([], [b4_public_types_define])[
 
 
 ]b4_token_ctor_if([], [b4_public_types_define])[
 

-  // stack_symbol_type.
-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()
-    : super_type ()
-    , state ()
-  {
-  }
+  // by_state.
+  ]b4_parser_class_name[::by_state::by_state ()
+    : state ()
+  {}

 
 

-  ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (]b4_join(
-                 [state_type s],
-                 [const semantic_type& v],
-                 b4_locations_if([const location_type& l]))[)
-    : super_type (v]b4_locations_if([, l])[)
-    , state (s)
-  {
-  }
+  ]b4_parser_class_name[::by_state::by_state (const by_state& other)
+    : state (other.state)
+  {}
+
+  ]b4_parser_class_name[::by_state::by_state (state_type s)
+    : state (s)
+  {}

 
   int
 
   int

-  ]b4_parser_class_name[::stack_symbol_type::type_get_ () const
+  ]b4_parser_class_name[::by_state::type_get () const

   {
     return yystos_[state];
   }
 
   {
     return yystos_[state];
   }
 

-
-  template <typename Exact>
+  template <typename Base>

   void
   ]b4_parser_class_name[::yy_destroy_ (const char* yymsg,
   void
   ]b4_parser_class_name[::yy_destroy_ (const char* yymsg,

-                                       symbol_base_type<Exact>& yysym) const
+                                       basic_symbol<Base>& yysym) const

   {
     if (yymsg)
       YY_SYMBOL_PRINT (yymsg, yysym);
   {
     if (yymsg)
       YY_SYMBOL_PRINT (yymsg, yysym);


@@ -554,10 +552,10 @@ m4_if(b4_prefix, [yy], [],
   }
 
 #if ]b4_api_PREFIX[DEBUG
   }
 
 #if ]b4_api_PREFIX[DEBUG

-  template <typename Exact>
+  template <typename Base>

   void
   ]b4_parser_class_name[::yy_print_ (std::ostream& yyo,
   void
   ]b4_parser_class_name[::yy_print_ (std::ostream& yyo,

-                                     const symbol_base_type<Exact>& yysym) const
+                                     const basic_symbol<Base>& yysym) const

   {
     std::ostream& yyoutput = yyo;
     YYUSE (yyoutput);
   {
     std::ostream& yyoutput = yyo;
     YYUSE (yyoutput);


@@ -582,16 +580,14 @@ m4_if(b4_prefix, [yy], [],
     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 (]b4_join(
-                    [s],
-                    [semantic_type()],
-                    b4_locations_if([sym.location]))[));
-    ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]],
-                       [build], [sym.value])],
-[[    yystack_.push (stack_symbol_type (]b4_join(
-                      [s],
-                      [sym.value],
-                      b4_locations_if([sym.location]))[));]])[
+[[
+  stack_symbol_type ss (]b4_join([s],
+      [sym.value], b4_locations_if([sym.location]))[);
+  ]b4_symbol_variant([sym.type_get ()], [sym.value], [destroy], [])[;
+  yystack_.push (ss);
+]],
+[[    yystack_.push (stack_symbol_type (]b4_join([s],
+                         [sym.value], b4_locations_if([sym.location]))[));]])[

   }
 
   void
   }
 
   void


@@ -600,12 +596,12 @@ m4_if(b4_prefix, [yy], [],
     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 (]b4_join(
-                       [s.state],
-                       [semantic_type()],
-                       b4_locations_if([s.location]))[));
-    ]b4_symbol_variant([[yystos_[s.state]]], [[yystack_[0].value]],
-                       [build], [s.value])],
+[[
+  stack_symbol_type ss (]b4_join([s.state],
+      [s.value], b4_locations_if([s.location]))[);
+  ]b4_symbol_variant([s.type_get ()], [s.value], [destroy], [])[;
+  yystack_.push (ss);
+]],

 [    yystack_.push (s);])[
   }
 
 [    yystack_.push (s);])[
   }
 


@@ -733,7 +729,7 @@ b4_dollar_popdef])[]dnl
         YYCDEBUG << "Reading a token: ";
         try
           {]b4_token_ctor_if([[
         YYCDEBUG << "Reading a token: ";
         try
           {]b4_token_ctor_if([[

-            symbol_type yylookahead = ]b4_lex[;
+            symbol_type yylookahead (]b4_lex[);

             yyla.move (yylookahead);]], [[
             yyla.type = yytranslate_ (]b4_lex[);]])[
           }
             yyla.move (yylookahead);]], [[
             yyla.type = yytranslate_ (]b4_lex[);]])[
           }


@@ -830,7 +826,7 @@ b4_dollar_popdef])[]dnl
 ]b4_variant_if([[
     // Destroy the rhs symbols.
     for (int i = 0; i < yylen; ++i)
 ]b4_variant_if([[
     // Destroy the rhs symbols.
     for (int i = 0; i < yylen; ++i)

-      // Destroy a variant which value may have been swapped with
+      // Destroy a variant whose value may have been swapped with

       // yylhs.value (for instance if the action was "std::swap($$,
       // $1)").  The value of yylhs.value (hence possibly one of these
       // rhs symbols) depends on the default construction for this
       // yylhs.value (for instance if the action was "std::swap($$,
       // $1)").  The value of yylhs.value (hence possibly one of these
       // rhs symbols) depends on the default construction for this


@@ -897,7 +893,7 @@ b4_dollar_popdef])[]dnl
     yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[
     /* $$ was initialized before running the user action.  */
     yy_destroy_ ("Error: discarding", yylhs);]])[
     yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[
     /* $$ was initialized before running the user action.  */
     yy_destroy_ ("Error: discarding", yylhs);]])[

-    /* Do not reclaim the symbols of the rule which action triggered
+    /* Do not reclaim the symbols of the rule whose action triggered

        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;
        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;


@@ -957,7 +953,7 @@ b4_dollar_popdef])[]dnl
     if (!yyempty)
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
 
     if (!yyempty)
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
 

-    /* Do not reclaim the symbols of the rule which action triggered
+    /* Do not reclaim the symbols of the rule whose action triggered

        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
     while (1 < yystack_.size ())
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
     while (1 < yystack_.size ())