maint: Valgrind on OS X.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 6f55e1878a3cbbd341cbcb9169dd8ed87073a1e9..17a8f22c032ac8fadda107f5bee7bf0aba4e27c3 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -28,6 +28,7 @@ b4_percent_define_ifdef([[location_type]], [],
   [# Backward compatibility.
   m4_define([b4_location_constructors])
   m4_include(b4_pkgdatadir/[location.cc])])
   [# Backward compatibility.
   m4_define([b4_location_constructors])
   m4_include(b4_pkgdatadir/[location.cc])])

+m4_include(b4_pkgdatadir/[stack.hh])

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


@@ -35,13 +36,16 @@ m4_divert_push(0)dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],

-             [2002-2011])
-dnl FIXME: This is wrong, we want computed header guards.
+             [2002-2012])

 [
 [

+/**
+ ** \file ]b4_spec_defines_file[
+ ** Define the ]b4_namespace_ref[::parser class.
+ */
+

 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 

-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
+]b4_cpp_guard_open([b4_spec_defines_file])[

 
 ]b4_percent_code_get([[requires]])[
 
 
 ]b4_percent_code_get([[requires]])[
 


@@ -51,23 +55,7 @@ dnl FIXME: This is wrong, we want computed header guards.
 ]b4_percent_define_ifdef([[location_type]], [],
                          [[#include "location.hh"]])[
 
 ]b4_percent_define_ifdef([[location_type]], [],
                          [[#include "location.hh"]])[
 

-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG ]b4_debug_flag[
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE ]b4_error_verbose_flag[
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE ]b4_token_table[
-#endif
+]b4_YYDEBUG_define[

 
 ]b4_namespace_open[
 
 
 ]b4_namespace_open[
 


@@ -76,7 +64,7 @@ dnl FIXME: This is wrong, we want computed header guards.
   {
   public:
     /// Symbol semantic values.
   {
   public:
     /// Symbol semantic values.

-#ifndef YYSTYPE
+#ifndef ]b4_api_PREFIX[STYPE

 ]m4_ifdef([b4_stype],
 [    union semantic_type
     {
 ]m4_ifdef([b4_stype],
 [    union semantic_type
     {


@@ -84,9 +72,9 @@ b4_user_stype
     };],
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],
     };],
 [m4_if(b4_tag_seen_flag, 0,
 [[    typedef int semantic_type;]],

-[[    typedef YYSTYPE semantic_type;]])])[
+[[    typedef ]b4_api_PREFIX[STYPE semantic_type;]])])[

 #else
 #else

-    typedef YYSTYPE semantic_type;
+    typedef ]b4_api_PREFIX[STYPE semantic_type;

 #endif
     /// Symbol locations.
     typedef ]b4_percent_define_get([[location_type]],
 #endif
     /// Symbol locations.
     typedef ]b4_percent_define_get([[location_type]],


@@ -107,7 +95,7 @@ b4_user_stype
     /// \returns  0 iff parsing succeeded.
     virtual int parse ();
 
     /// \returns  0 iff parsing succeeded.
     virtual int parse ();
 

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

     /// The current debugging stream.
     std::ostream& debug_stream () const;
     /// Set the current debugging stream.
     /// The current debugging stream.
     std::ostream& debug_stream () const;
     /// Set the current debugging stream.


@@ -132,7 +120,7 @@ b4_user_stype
     /// \param tok     the lookahead token.
     virtual std::string yysyntax_error_ (int yystate, int tok);
 
     /// \param tok     the lookahead token.
     virtual std::string yysyntax_error_ (int yystate, int tok);
 

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

     /// \brief Report a symbol value on the debug stream.
     /// \param yytype       The token type.
     /// \param yyvaluep     Its semantic value.
     /// \brief Report a symbol value on the debug stream.
     /// \param yytype       The token type.
     /// \param yyvaluep     Its semantic value.


@@ -205,17 +193,15 @@ b4_user_stype
     /// For a rule, its LHS.
     static const ]b4_int_type_for([b4_r1])[ yyr1_[];
     /// For a rule, its RHS length.
     /// For a rule, its LHS.
     static const ]b4_int_type_for([b4_r1])[ yyr1_[];
     /// For a rule, its RHS length.

-    static const ]b4_int_type_for([b4_r2])[ yyr2_[];
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-    /// For a symbol, its name in clear.
-    static const char* const yytname_[];
-#endif]b4_error_verbose_if([
+    static const ]b4_int_type_for([b4_r2])[ yyr2_[]; ]b4_error_verbose_if([

 
     /// Convert the symbol name \a n to a form suitable for a diagnostic.
     static std::string yytnamerr_ (const char *n);])[
 
 
     /// Convert the symbol name \a n to a form suitable for a diagnostic.
     static std::string yytnamerr_ (const char *n);])[
 

-#if YYDEBUG
+]b4_token_table_if([], [[#if ]b4_api_PREFIX[DEBUG]])[
+    /// For a symbol, its name in clear.
+    static const char* const yytname_[];
+]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[

     /// A type to store symbol numbers and -1.
     typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type;
     /// A `-1'-separated list of the rules' RHS.
     /// A type to store symbol numbers and -1.
     typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type;
     /// A `-1'-separated list of the rules' RHS.


@@ -271,18 +257,17 @@ b4_user_stype
 ]b4_percent_define_flag_if([[global_tokens_and_yystype]],
 [b4_token_defines(b4_tokens)
 
 ]b4_percent_define_flag_if([[global_tokens_and_yystype]],
 [b4_token_defines(b4_tokens)
 

-#ifndef YYSTYPE
+#ifndef ]b4_api_PREFIX[STYPE

  /* Redirection for backward compatibility.  */
  /* Redirection for backward compatibility.  */

-# define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type
+# define ]b4_api_PREFIX[STYPE b4_namespace_ref::b4_parser_class_name::semantic_type

 #endif
 #endif

-])
-b4_percent_code_get([[provides]])[]dnl
-
-[#endif /* ! defined PARSER_HEADER_H */]
+])[
+]b4_percent_code_get([[provides]])[
+]b4_cpp_guard_close([b4_spec_defines_file])

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

-             [2002-2011])
+             [2002-2012])

 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 [
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 [


@@ -290,16 +275,18 @@ 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([[
+]b4_defines_if([[

 #include "@basename(]b4_spec_defines_file[@)"]])[
 
 /* User implementation prologue.  */
 #include "@basename(]b4_spec_defines_file[@)"]])[
 
 /* User implementation prologue.  */

-]b4_user_post_prologue
-b4_percent_code_get[]dnl
+]b4_user_post_prologue[
+]b4_percent_code_get[

 
 

-[#ifndef YY_
+]b4_null_define[
+
+#ifndef YY_

 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */


@@ -311,31 +298,14 @@ b4_percent_code_get[]dnl
 # endif
 #endif
 
 # endif
 #endif
 

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

 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])

-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
- do                                                                    \
-   if (N)                                                              \
-     {                                                                 \
-       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
-       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
-     }                                                                 \
-   else                                                                \
-     {                                                                 \
-       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
-     }                                                                 \
- while (false)
-#endif
+]b4_yylloc_default_define[

 
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
 /* Enable debugging if requested.  */
 
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
 /* Enable debugging if requested.  */

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

 
 /* A pseudo ostream that takes yydebug_ into account.  */
 # define YYCDEBUG if (yydebug_) (*yycdebug_)
 
 /* A pseudo ostream that takes yydebug_ into account.  */
 # define YYCDEBUG if (yydebug_) (*yycdebug_)


@@ -362,14 +332,14 @@ do {                                      \
     yystack_print_ ();                 \
 } while (false)
 
     yystack_print_ ();                 \
 } while (false)
 

-#else /* !YYDEBUG */
+#else /* !]b4_api_PREFIX[DEBUG */

 
 # define YYCDEBUG if (false) std::cerr
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()
 
 
 # define YYCDEBUG if (false) std::cerr
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_REDUCE_PRINT(Rule)
 # define YY_STACK_PRINT()
 

-#endif /* !YYDEBUG */
+#endif /* !]b4_api_PREFIX[DEBUG */

 
 #define yyerrok                (yyerrstatus_ = 0)
 #define yyclearin      (yychar = yyempty_)
 
 #define yyerrok                (yyerrstatus_ = 0)
 #define yyclearin      (yychar = yyempty_)


@@ -422,7 +392,7 @@ do {                                        \
   /// 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], [
     :])[

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

     ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),
       yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
 #endif]b4_parse_param_cons[
     ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),
       yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
 #endif]b4_parse_param_cons[


@@ -433,7 +403,7 @@ do {                                        \
   {
   }
 
   {
   }
 

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

   /*--------------------------------.
   | Print this symbol on YYOUTPUT.  |
   `--------------------------------*/
   /*--------------------------------.
   | Print this symbol on YYOUTPUT.  |
   `--------------------------------*/


@@ -444,6 +414,9 @@ do {                                        \
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);

+    std::ostream& yyo = debug_stream ();
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);

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


@@ -491,7 +464,7 @@ do {                                        \
     yylocation_stack_.pop (n);
   }
 
     yylocation_stack_.pop (n);
   }
 

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

   std::ostream&
   ]b4_parser_class_name[::debug_stream () const
   {
   std::ostream&
   ]b4_parser_class_name[::debug_stream () const
   {


@@ -604,7 +577,7 @@ m4_popdef([b4_at_dollar])])dnl
       {
        YYCDEBUG << "Reading a token: ";
        yychar = ]b4_c_function_call([yylex], [int],
       {
        YYCDEBUG << "Reading a token: ";
        yychar = ]b4_c_function_call([yylex], [int],

-                                    [[YYSTYPE*], [&yylval]][]dnl
+                                    [b4_api_PREFIX[STYPE*], [&yylval]][]dnl

 b4_locations_if([, [[location*], [&yylloc]]])dnl
 m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
       }
 b4_locations_if([, [[location*], [&yylloc]]])dnl
 m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
       }


@@ -931,7 +904,7 @@ b4_error_verbose_if([int yystate, int yytoken],
           }
       }
 
           }
       }
 

-    char const* yyformat = 0;
+    char const* yyformat = YY_NULL;

     switch (yycount)
       {
 #define YYCASE_(N, S)                         \
     switch (yycount)
       {
 #define YYCASE_(N, S)                         \


@@ -1019,7 +992,7 @@ b4_error_verbose_if([int yystate, int yytoken],
     ]b4_stos[
   };
 
     ]b4_stos[
   };
 

-#if YYDEBUG
+#if ]b4_api_PREFIX[DEBUG

   /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
      to YYLEX-NUM.  */
   const ]b4_int_type_for([b4_toknum])[
   /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
      to YYLEX-NUM.  */
   const ]b4_int_type_for([b4_toknum])[


@@ -1043,7 +1016,7 @@ b4_error_verbose_if([int yystate, int yytoken],
     ]b4_r2[
   };
 
     ]b4_r2[
   };
 

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+]b4_token_table_if([], [[#if ]b4_api_PREFIX[DEBUG]])[

   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
   const char*
   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
   const char*


@@ -1051,9 +1024,8 @@ b4_error_verbose_if([int yystate, int yytoken],
   {
     ]b4_tname[
   };
   {
     ]b4_tname[
   };

-#endif

 
 

-#if YYDEBUG
+]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[

   /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
   const ]b4_parser_class_name[::rhs_number_type
   ]b4_parser_class_name[::yyrhs_[] =
   /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
   const ]b4_parser_class_name[::rhs_number_type
   ]b4_parser_class_name[::yyrhs_[] =


@@ -1103,7 +1075,7 @@ b4_error_verbose_if([int yystate, int yytoken],
                       &]b4_rhs_value(yynrhs, yyi + 1)[,
                       &]b4_rhs_location(yynrhs, yyi + 1)[);
   }
                       &]b4_rhs_value(yynrhs, yyi + 1)[,
                       &]b4_rhs_location(yynrhs, yyi + 1)[);
   }

-#endif // YYDEBUG
+#endif // ]b4_api_PREFIX[DEBUG

 
   /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
   ]b4_parser_class_name[::token_number_type
 
   /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
   ]b4_parser_class_name[::token_number_type


@@ -1134,106 +1106,5 @@ b4_error_verbose_if([int yystate, int yytoken],
   const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
 
 ]b4_namespace_close[
   const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
 
 ]b4_namespace_close[

-

 ]b4_epilogue
 ]b4_epilogue

-dnl
-@output(b4_dir_prefix[]stack.hh@)@
-b4_copyright([Stack handling for Bison parsers in C++],
-             [2002-2011])[
-
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
-
-#include <deque>
-
-]b4_namespace_open[
-  template <class T, class S = std::deque<T> >
-  class stack
-  {
-  public:
-
-    // Hide our reversed order.
-    typedef typename S::reverse_iterator iterator;
-    typedef typename S::const_reverse_iterator const_iterator;
-
-    stack () : seq_ ()
-    {
-    }
-
-    stack (unsigned int n) : seq_ (n)
-    {
-    }
-
-    inline
-    T&
-    operator [] (unsigned int i)
-    {
-      return seq_[i];
-    }
-
-    inline
-    const T&
-    operator [] (unsigned int i) const
-    {
-      return seq_[i];
-    }
-
-    inline
-    void
-    push (const T& t)
-    {
-      seq_.push_front (t);
-    }
-
-    inline
-    void
-    pop (unsigned int n = 1)
-    {
-      for (; n; --n)
-       seq_.pop_front ();
-    }
-
-    inline
-    unsigned int
-    height () const
-    {
-      return seq_.size ();
-    }
-
-    inline const_iterator begin () const { return seq_.rbegin (); }
-    inline const_iterator end () const { return seq_.rend (); }
-
-  private:
-
-    S seq_;
-  };
-
-  /// Present a slice of the top of a stack.
-  template <class T, class S = stack<T> >
-  class slice
-  {
-  public:
-
-    slice (const S& stack,
-          unsigned int range) : stack_ (stack),
-                                range_ (range)
-    {
-    }
-
-    inline
-    const T&
-    operator [] (unsigned int i) const
-    {
-      return stack_[range_ - i];
-    }
-
-  private:
-
-    const S& stack_;
-    unsigned int range_;
-  };
-]b4_namespace_close[
-
-#endif // not BISON_STACK_HH[]dnl
-]

 m4_divert_pop(0)
 m4_divert_pop(0)