X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ddc8ede1abfd807faf5ddb0ee6c56cead0db84e3..2935744b3a563ff41d9cc7e6c21ffb4e86767717:/data/lalr1.cc?ds=sidebyside
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 000cd0d1..6a67c5b8 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1,29 +1,152 @@
-m4_divert(-1)
-
# C++ skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
+# along with this program. If not, see .
m4_include(b4_pkgdatadir/[c++.m4])
+# b4_table_define(TABLE-NAME, CONTENT)
+# ------------------------------------
+# Define "parser::yy_" which contents is CONTENT.
+m4_define([b4_table_define],
+[const b4_int_type_for([$2])
+ b4_parser_class_name::yy$1_[[]] =
+ {
+ $2
+ }dnl
+])
+
+# How the semantic value is extracted when using variants.
+b4_variant_if([
+ # b4_symbol_value(VAL, [TYPE])
+ # ----------------------------
+ m4_define([b4_symbol_value],
+ [m4_ifval([$2],
+ [$1.as<$2>()],
+ [$1])])
+]) # b4_variant_if
+
+
+# b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
+# ----------------------------------------------------
+m4_define([b4_assert_if],
+[b4_percent_define_ifdef([[assert]], [$1], [$2])])
+
+
+# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
+# --------------------------------------
+# Expansion of $NUM, where the current rule has RULE-LENGTH
+# symbols on RHS.
+m4_define([b4_rhs_value],
+ [b4_symbol_value([yystack_@{($1) - ($2)@}.value], [$3])])
+
+# b4_rhs_location(RULE-LENGTH, NUM)
+# ---------------------------------
+# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
+# on RHS.
+m4_define([b4_rhs_location],
+[yystack_@{($1) - ($2)@}.location])
+
+
+# b4_symbol_actions(FILENAME, LINENO,
+# SYMBOL-TAG, SYMBOL-NUM,
+# SYMBOL-ACTION, SYMBOL-TYPENAME)
+# -------------------------------------------------
+# Same as in C, but using references instead of pointers.
+m4_define([b4_symbol_actions],
+[m4_pushdef([b4_dollar_dollar],
+ [b4_symbol_value([yyvalue], [$6])])dnl
+m4_pushdef([b4_at_dollar], [yylocation])dnl
+ case $4: // $3
+b4_syncline([$2], [$1])
+ $5;
+b4_syncline([@oline@], [@ofile@])
+ break;
+m4_popdef([b4_at_dollar])dnl
+m4_popdef([b4_dollar_dollar])dnl
+])
+
+
+# b4_symbol_action_(SYMBOL-TAG, SYMBOL-NUM, SYMBOL-TYPENAME)
+# ----------------------------------------------------------
+# Invoke b4_dollar_dollar(SYMBOL_TYPENAME) for each symbol.
+m4_define([b4_symbol_action_],
+[m4_ifval($3,
+[ case $2: // $1
+ b4_dollar_dollar($@);
+ break;
+])])
+
+
+# b4_symbol_variant(YYTYPE, YYVAL, ACTION, [ARGS])
+# ------------------------------------------------
+# Run some ACTION ("build", or "destroy") on YYVAL of symbol type
+# YYTYPE.
+m4_define([b4_symbol_variant],
+[m4_pushdef([b4_dollar_dollar],
+ [$2.$3<$][3>(m4_shift3($@))])dnl
+ switch ($1)
+ {
+m4_map([b4_symbol_action_], m4_defn([b4_type_names]))
+ default:
+ break;
+ }
+m4_popdef([b4_dollar_dollar])dnl
+])
+
+
+# _b4_char_sizeof_counter
+# -----------------------
+# A counter used by _b4_char_sizeof_dummy to create fresh symbols.
+m4_define([_b4_char_sizeof_counter],
+[0])
+
+# _b4_char_sizeof_dummy
+# ---------------------
+# At each call return a new C++ identifier.
+m4_define([_b4_char_sizeof_dummy],
+[m4_define([_b4_char_sizeof_counter], m4_incr(_b4_char_sizeof_counter))dnl
+dummy[]_b4_char_sizeof_counter])
+
+
+# b4_char_sizeof(SYMBOL-TAG, SYMBOL-NUM, SYMBOL-TYPENAME)
+# -------------------------------------------------------
+# To be mapped on the list of type names to produce:
+#
+# char dummy1[sizeof(type_name_1)];
+# 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_ifval($3,
+[
+ char _b4_char_sizeof_dummy@{sizeof($3)@}; // $1])dnl
+])
+
+
+m4_pushdef([b4_copyright_years],
+ [2002, 2003, 2004, 2005, 2006, 2007, 2008])
+
+m4_define([b4_parser_class_name],
+ [b4_percent_define_get([[parser_class_name]])])
+
# The header is mandatory.
b4_defines_if([],
- [m4_fatal(b4_skeleton[: using %defines is mandatory])])
+ [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
# Backward compatibility.
m4_define([b4_location_constructors])
@@ -31,11 +154,10 @@ m4_include(b4_pkgdatadir/[location.cc])
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
+m4_divert_push(0)dnl
b4_defines_if(
-[@output @output_header_name@
-b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
- [2002, 2003, 2004, 2005, 2006])
+[@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.
[
/* C++ LALR(1) parser skeleton written by Akim Demaille. */
@@ -43,22 +165,97 @@ dnl FIXME: This is wrong, we want computed header guards.
#ifndef PARSER_HEADER_H
# define PARSER_HEADER_H
+]b4_percent_code_get([[requires]])[
+
+]b4_assert_if([#include ])[
#include
#include
#include "stack.hh"
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
class position;
class location;
-}
+]b4_variant_if(
+[[
+ /// A char[S] buffer to store and retrieve objects.
+ ///
+ /// Sort of a variant, but does not keep track of the nature
+ /// of the stored data, since that knowledge is available
+ /// via the current state.
+ template
+ struct variant
+ {]b4_assert_if([
+ /// Whether something is contained.
+ bool built;
+
+ /// Initially uninitialized.
+ variant ()
+ : built(false)
+ {}])[
+
+ /// Instantiate a \a T in here.
+ template
+ inline T&
+ build()
+ {]b4_assert_if([
+ assert(!built);
+ built = true;])[
+ return *new (buffer) T;
+ }
+
+ /// Accessor to a built \a T.
+ template
+ inline T&
+ as()
+ {]b4_assert_if([
+ assert(built);])[
+ return reinterpret_cast(buffer);
+ }
-]m4_ifdef([b4_start_header],
-[[/* Copy the %start-header blocks. */
-]b4_user_start_header])[
+ /// Const accessor to a built \a T (for %printer).
+ template
+ inline const T&
+ as() const
+ {]b4_assert_if([
+ assert(built);])[
+ return reinterpret_cast(buffer);
+ }
-]dnl Include location.hh here: it might depend on headers included above.
-[#include "location.hh"
+ /// Swap the content with \a other.
+ template
+ inline void
+ swap(variant& other)
+ {
+ std::swap(as(), other.as());
+ }
+
+ /// Assign the content of \a other to this.
+ /// Destroys \a other.
+ template
+ inline void
+ build(variant& other)
+ {
+ build();
+ swap(other);
+ other.destroy();
+ }
+
+ /// Destroy the stored \a T.
+ template
+ inline void
+ destroy()
+ {
+ as().~T();]b4_assert_if([
+ built = false;])[
+ }
+
+ /// A buffer large enough to store any of the semantic values.
+ char buffer[S];
+ };
+]])[
+]b4_namespace_close[
+
+#include "location.hh"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -83,41 +280,48 @@ namespace ]b4_namespace[
the previous symbol: RHS[0] (always defined). */
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
-do { \
- if (N) \
- { \
- (Current).begin = (Rhs)[1].begin; \
- (Current).end = (Rhs)[N].end; \
- } \
- else \
- { \
- (Current).begin = (Current).end = (Rhs)[0].end; \
- } \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+do { \
+ if (N) \
+ { \
+ (Current).begin = (Rhs)[1].location.begin; \
+ (Current).end = (Rhs)[N].location.end; \
+ } \
+ else \
+ { \
+ (Current).begin = (Current).end = (Rhs)[0].location.end; \
+ } \
} while (false)
#endif
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
/// A Bison parser.
class ]b4_parser_class_name[
{
public:
- /// Symbol semantic values.
#ifndef YYSTYPE
-]m4_ifdef([b4_stype],
+]b4_variant_if(
+[ /// An auxiliary type to compute the largest semantic type.
+ union union_type
+ {]m4_map([b4_char_sizeof], m4_defn([b4_type_names]))[
+ };
+
+ /// Symbol semantic values.
+ typedef variant semantic_type;],
+[ /// Symbol semantic values.
+m4_ifdef([b4_stype],
[ union semantic_type
-b4_user_stype
- ;],
+ {b4_user_stype
+ };],
[m4_if(b4_tag_seen_flag, 0,
[[ typedef int semantic_type;]],
-[[ typedef YYSTYPE semantic_type;]])])[
+[[ typedef YYSTYPE semantic_type;]])])])[
#else
typedef YYSTYPE semantic_type;
#endif
/// Symbol locations.
- typedef ]b4_location_type[ location_type;
+ typedef ]b4_percent_define_get([[location_type]])[ location_type;
/// Tokens.
struct token
{
@@ -134,6 +338,7 @@ b4_user_stype
/// \returns 0 iff parsing succeeded.
virtual int parse ();
+#if YYDEBUG
/// The current debugging stream.
std::ostream& debug_stream () const;
/// Set the current debugging stream.
@@ -145,6 +350,7 @@ b4_user_stype
debug_level_type debug_level () const;
/// Set the current debugging level.
void set_debug_level (debug_level_type l);
+#endif
private:
/// Report a syntax error.
@@ -155,42 +361,27 @@ b4_user_stype
/// Generate an error message.
/// \param state the state where the error occurred.
/// \param tok the lookahead token.
- virtual std::string yysyntax_error_ (int yystate]dnl
-b4_error_verbose_if([, int tok])[);
+ virtual std::string yysyntax_error_ (int yystate, int tok);
#if YYDEBUG
/// \brief Report a symbol value on the debug stream.
/// \param yytype The token type.
- /// \param yyvaluep Its semantic value.
- /// \param yylocationp Its location.
+ /// \param yyvalue Its semantic value.
+ /// \param yylocation Its location.
virtual void yy_symbol_value_print_ (int yytype,
- const semantic_type* yyvaluep,
- const location_type* yylocationp);
+ const semantic_type& yyvalue,
+ const location_type& yylocation);
/// \brief Report a symbol on the debug stream.
/// \param yytype The token type.
- /// \param yyvaluep Its semantic value.
- /// \param yylocationp Its location.
+ /// \param yyvalue Its semantic value.
+ /// \param yylocation Its location.
virtual void yy_symbol_print_ (int yytype,
- const semantic_type* yyvaluep,
- const location_type* yylocationp);
-#endif /* ! YYDEBUG */
-
+ const semantic_type& yyvalue,
+ const location_type& yylocation);
+#endif
/// State numbers.
typedef int state_type;
- /// State stack type.
- typedef stack state_stack_type;
- /// Semantic value stack type.
- typedef stack semantic_stack_type;
- /// location stack type.
- typedef stack location_stack_type;
-
- /// The state stack.
- state_stack_type yystate_stack_;
- /// The semantic value stack.
- semantic_stack_type yysemantic_stack_;
- /// The location stack.
- location_stack_type yylocation_stack_;
/// Internal symbol numbers.
typedef ]b4_int_type_for([b4_translate])[ token_number_type;
@@ -236,10 +427,8 @@ b4_error_verbose_if([, int tok])[);
#endif
#if YYDEBUG
- /// 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.
- static const rhs_number_type yyrhs_[];
+ static const ]b4_int_type_for([b4_rhs])[ yyrhs_[];
/// For each rule, the index of the first RHS symbol in \a yyrhs_.
static const ]b4_int_type_for([b4_prhs])[ yyprhs_[];
/// For each rule, its source line number.
@@ -250,6 +439,10 @@ b4_error_verbose_if([, int tok])[);
virtual void yy_reduce_print_ (int r);
/// Print the state stack on the debug stream.
virtual void yystack_print_ ();
+
+ /* Debugging. */
+ int yydebug_;
+ std::ostream* yycdebug_;
#endif
/// Convert a scanner token number \a t to a symbol number.
@@ -257,13 +450,49 @@ b4_error_verbose_if([, int tok])[);
/// \brief Reclaim the memory associated to a symbol.
/// \param yymsg Why this token is reclaimed.
+ /// If null, nothing is printed at all.
/// \param yytype The symbol type.
- /// \param yyvaluep Its semantic value.
- /// \param yylocationp Its location.
+ /// \param yyvalue Its semantic value.
+ /// \param yylocation Its location.
inline void yydestruct_ (const char* yymsg,
int yytype,
- semantic_type* yyvaluep,
- location_type* yylocationp);
+ semantic_type& yyvalue,
+ location_type& yylocation);
+
+ /// Element of the stack: a state and its attributes.
+ struct data_type
+ {
+ /// Default constructor.
+ data_type ();
+
+ /// Constructor.
+ data_type (state_type s, const semantic_type& v, const location_type& l);
+
+ /// The state.
+ state_type state;
+
+ /// The semantic value.
+ semantic_type value;
+
+ /// The location.
+ location_type location;
+ };
+
+ /// Stack type.
+ typedef stack stack_type;
+
+ /// The stack.
+ stack_type yystack_;
+
+ /// Push a new state on the stack.
+ /// \param m a debug message to display
+ /// if null, no trace is output.
+ /// \param s the state entered
+ /// \param v semantic value
+ /// \param l location
+ /// \warning the contents of \a v is stolen.
+ inline void yypush_ (const char* m, state_type s,
+ semantic_type& v, const location_type& l);
/// Pop \a n symbols the three stacks.
inline void yypop_ (unsigned int n = 1);
@@ -280,47 +509,41 @@ b4_error_verbose_if([, int tok])[);
static const int yyntokens_;
static const unsigned int yyuser_token_number_max_;
static const token_number_type yyundef_token_;
-
- /* Debugging. */
- int yydebug_;
- std::ostream* yycdebug_;
-
]b4_parse_param_vars[
};
-}
+]b4_namespace_close[
-]m4_ifset([b4_global_tokens_and_yystype],
+]b4_percent_define_flag_if([[global_tokens_and_yystype]],
[b4_token_defines(b4_tokens)
#ifndef YYSTYPE
/* Redirection for backward compatibility. */
-# define YYSTYPE b4_namespace::b4_parser_class_name::semantic_type
+# define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type
#endif
])
-m4_ifdef([b4_end_header],
-[[/* Copy the %end-header blocks. */
-]b4_end_header])[]dnl
+b4_percent_code_get([[provides]])[]dnl
[#endif /* ! defined PARSER_HEADER_H */]
])dnl
-@output @output_parser_name@
-b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++],
- [2002, 2003, 2004, 2005, 2006])
+@output(b4_parser_file_name@)@
+b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
+b4_percent_code_get([[top]])[]dnl
m4_if(b4_prefix, [yy], [],
[
// Take the name prefix into account.
#define yylex b4_prefix[]lex])[
/* First part of user declarations. */
-]b4_pre_prologue
+]b4_user_pre_prologue
-b4_defines_if([
-#include @output_header_name@])[
+b4_defines_if([[
+#include "@basename(]b4_spec_defines_file[@)"]])[
/* User implementation prologue. */
-]b4_user_post_prologue[
+]b4_user_post_prologue
+b4_percent_code_get[]dnl
-#ifndef YY_
+[#ifndef YY_
# if YYENABLE_NLS
# if ENABLE_NLS
# include /* FIXME: INFRINGES ON USER NAME SPACE */
@@ -335,50 +558,52 @@ b4_defines_if([
/* Suppress unused-variable warnings by "using" E. */
#define YYUSE(e) ((void) (e))
-/* A pseudo ostream that takes yydebug_ into account. */
-# define YYCDEBUG \
- for (bool yydebugcond_ = yydebug_; yydebugcond_; yydebugcond_ = false) \
- (*yycdebug_)
-
/* Enable debugging if requested. */
#if YYDEBUG
+/* A pseudo ostream that takes yydebug_ into account. */
+# define YYCDEBUG if (yydebug_) (*yycdebug_)
+
# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug_) \
+ do { \
+ if (yydebug_) \
{ \
*yycdebug_ << Title << ' '; \
yy_symbol_print_ ((Type), (Value), (Location)); \
*yycdebug_ << std::endl; \
} \
-} while (false)
+ } while (false)
# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug_) \
- yy_reduce_print_ (Rule); \
-} while (false)
+ do { \
+ if (yydebug_) \
+ yy_reduce_print_ (Rule); \
+ } while (false)
# define YY_STACK_PRINT() \
-do { \
- if (yydebug_) \
- yystack_print_ (); \
-} while (false)
+ do { \
+ if (yydebug_) \
+ yystack_print_ (); \
+ } while (false)
#else /* !YYDEBUG */
-# 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) static_cast(0)
+# define YY_REDUCE_PRINT(Rule) static_cast(0)
+# define YY_STACK_PRINT() static_cast(0)
#endif /* !YYDEBUG */
+#define yyerrok (yyerrstatus_ = 0)
+#define yyclearin (yychar = yyempty_)
+
#define YYACCEPT goto yyacceptlab
#define YYABORT goto yyabortlab
#define YYERROR goto yyerrorlab
+#define YYRECOVERING() (!!yyerrstatus_)
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
#if YYERROR_VERBOSE
/* Return YYSTR after stripping away unnecessary quotes and
@@ -421,9 +646,12 @@ namespace ]b4_namespace[
#endif
/// Build a parser object.
- ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)
- : yydebug_ (false),
- yycdebug_ (&std::cerr)]b4_parse_param_cons[
+ ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
+ :])[
+#if YYDEBUG
+ ]m4_ifset([b4_parse_param], [ ], [ :])[yydebug_ (false),
+ yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+#endif]b4_parse_param_cons[
{
}
@@ -438,10 +666,10 @@ namespace ]b4_namespace[
inline void
]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,
- const semantic_type* yyvaluep, const location_type* yylocationp)
+ const semantic_type& yyvalue, const location_type& yylocation)
{
- YYUSE (yylocationp);
- YYUSE (yyvaluep);
+ YYUSE (yylocation);
+ YYUSE (yyvalue);
switch (yytype)
{
]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
@@ -453,42 +681,73 @@ namespace ]b4_namespace[
void
]b4_parser_class_name[::yy_symbol_print_ (int yytype,
- const semantic_type* yyvaluep, const location_type* yylocationp)
+ const semantic_type& yyvalue, const location_type& yylocation)
{
*yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm")
<< ' ' << yytname_[yytype] << " ("
- << *yylocationp << ": ";
- yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
+ << yylocation << ": ";
+ yy_symbol_value_print_ (yytype, yyvalue, yylocation);
*yycdebug_ << ')';
}
-#endif /* ! YYDEBUG */
+#endif
void
]b4_parser_class_name[::yydestruct_ (const char* yymsg,
- int yytype, semantic_type* yyvaluep, location_type* yylocationp)
+ int yytype, semantic_type& yyvalue, location_type& yylocation)
{
- YYUSE (yylocationp);
YYUSE (yymsg);
- YYUSE (yyvaluep);
+ YYUSE (yyvalue);
+ YYUSE (yylocation);
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ if (yymsg)
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvalue, yylocation);
+ // User destructor.
switch (yytype)
{
]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
default:
break;
- }
+ }]b4_variant_if([
+
+ // Type destructor.
+ b4_symbol_variant([[yytype]], [[yyvalue]], [[destroy]])])[
+ }
+
+ ]b4_parser_class_name[::data_type::data_type ()
+ : state()
+ , value()
+ , location()
+ {
+ }
+
+ ]b4_parser_class_name[::data_type::data_type (state_type s,
+ const semantic_type& v, const location_type& l)
+ : state(s)
+ , value(v)
+ , location(l)
+ {
+ }
+
+ void
+ ]b4_parser_class_name[::yypush_ (const char* m, state_type s,
+ semantic_type& v, const location_type& l)
+ {
+ if (m)
+ YY_SYMBOL_PRINT (m, yystos_[s], v, l);
+]b4_variant_if(
+[[ yystack_.push (data_type (s, semantic_type(), l));
+ ]b4_symbol_variant([[yystos_[s]]], [[yystack_[0].value]], [build], [v])],
+[ yystack_.push (data_type (s, v, l));])[
}
void
]b4_parser_class_name[::yypop_ (unsigned int n)
{
- yystate_stack_.pop (n);
- yysemantic_stack_.pop (n);
- yylocation_stack_.pop (n);
+ yystack_.pop (n);
}
+#if YYDEBUG
std::ostream&
]b4_parser_class_name[::debug_stream () const
{
@@ -513,7 +772,7 @@ namespace ]b4_namespace[
{
yydebug_ = l;
}
-
+#endif
int
]b4_parser_class_name[::parse ()
@@ -536,7 +795,7 @@ namespace ]b4_namespace[
/// Location of the lookahead.
location_type yylloc;
/// The locations where the error started and ended.
- location yyerror_range[2];
+ data_type yyerror_range[2];
/// $$.
semantic_type yyval;
@@ -555,20 +814,23 @@ m4_pushdef([b4_dollar_dollar], [yylval])dnl
m4_popdef([b4_dollar_dollar])dnl
m4_popdef([b4_at_dollar])])dnl
- [ /* Initialize the stacks. The initial state will be pushed in
+ [ /* Initialize the stack. The initial state will be set in
yynewstate, since the latter expects the semantical and the
location values to have been already stored, initialize these
stacks with a primary value. */
- yystate_stack_ = state_stack_type (0);
- yysemantic_stack_ = semantic_stack_type (0);
- yylocation_stack_ = location_stack_type (0);
- yysemantic_stack_.push (yylval);
- yylocation_stack_.push (yylloc);
+ yystack_ = stack_type (0);
+ yypush_ (0, yystate, yylval, yylloc);
- /* New state. */
+ // A new state was pushed on the stack.
+ // Invariant: yystate == yystack_[0].state, i.e.,
+ // yystate was just pushed onto the state stack.
yynewstate:
- yystate_stack_.push (yystate);
YYCDEBUG << "Entering state " << yystate << std::endl;
+
+ /* Accept? */
+ if (yystate == yyfinal_)
+ goto yyacceptlab;
+
goto yybackup;
/* Backup. */
@@ -599,7 +861,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
else
{
yytoken = yytranslate_ (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+ YY_SYMBOL_PRINT ("Next token is", yytoken, yylval, yylloc);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -618,26 +880,17 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
goto yyreduce;
}
- /* Accept? */
- if (yyn == yyfinal_)
- goto yyacceptlab;
-
- /* Shift the lookahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the token being shifted unless it is eof. */
- if (yychar != yyeof_)
- yychar = yyempty_;
-
- yysemantic_stack_.push (yylval);
- yylocation_stack_.push (yylloc);
+ /* Discard the token being shifted. */
+ yychar = yyempty_;
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus_)
--yyerrstatus_;
+ /* Shift the lookahead token. */
yystate = yyn;
+ yypush_ ("Shifting", yystate, yylval, yylloc);
goto yynewstate;
/*-----------------------------------------------------------.
@@ -653,7 +906,11 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
| yyreduce -- Do a reduction. |
`-----------------------------*/
yyreduce:
- yylen = yyr2_[yyn];
+ yylen = yyr2_[yyn];]b4_variant_if([
+ /* Variants are always initialized to an empty instance of the
+ correct type. The default $$=$1 rule is NOT applied when using
+ variants */
+ ]b4_symbol_variant([[yyr1_@{yyn@}]], [yyval], [build])[],[
/* If YYLEN is nonzero, implement the default value of the action:
`$$ = $1'. Otherwise, use the top of the stack.
@@ -661,37 +918,53 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
This behavior is undocumented and Bison
users should not rely upon it. */
if (yylen)
- yyval = yysemantic_stack_[yylen - 1];
+ yyval = yystack_@{yylen - 1@}.value;
else
- yyval = yysemantic_stack_[0];
+ yyval = yystack_@{0@}.value;])[
+ // Compute the default @@$.
{
- slice slice (yylocation_stack_, yylen);
+ slice slice (yystack_, yylen);
YYLLOC_DEFAULT (yyloc, slice, yylen);
}
+
+ // Perform the reduction.
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
]b4_user_actions[
- default: break;
+ default:
+ break;
}
- YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
+ YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], yyval, yyloc);
+]b4_variant_if([[
+ // Destroy the lhs symbols.
+ for (int i = 0; i < yylen; ++i)
+ // Destroy a variant which value may have be swapped with yyval.
+ // The value of yyval (hence maybe one of these lhs symbols)
+ // depends on what does the default contruction for this type.
+ // In the case of pointers for instance, nothing is done, so the
+ // value is junk. Therefore do not try to report the content in
+ // the debug trace, it's junk. Hence yymsg = 0. Besides, that
+ // keeps exactly the same traces as with the other Bison
+ // skeletons.
+ yydestruct_ (0,
+ yystos_[yystack_[i].state],
+ yystack_[i].value, yystack_[i].location);]])[
yypop_ (yylen);
yylen = 0;
YY_STACK_PRINT ();
- yysemantic_stack_.push (yyval);
- yylocation_stack_.push (yyloc);
-
/* Shift the result of the reduction. */
yyn = yyr1_[yyn];
- yystate = yypgoto_[yyn - yyntokens_] + yystate_stack_[0];
+ yystate = yypgoto_[yyn - yyntokens_] + yystack_[0].state;
if (0 <= yystate && yystate <= yylast_
- && yycheck_[yystate] == yystate_stack_[0])
+ && yycheck_[yystate] == yystack_[0].state)
yystate = yytable_[yystate];
else
yystate = yydefgoto_[yyn - yyntokens_];
+ yypush_ (0, yystate, yyval, yyloc);
goto yynewstate;
/*------------------------------------.
@@ -702,11 +975,10 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
if (!yyerrstatus_)
{
++yynerrs_;
- error (yylloc, yysyntax_error_ (yystate]dnl
-b4_error_verbose_if([, yytoken])[));
+ error (yylloc, yysyntax_error_ (yystate, yytoken));
}
- yyerror_range[0] = yylloc;
+ yyerror_range[0].location = yylloc;
if (yyerrstatus_ == 3)
{
/* If just tried and failed to reuse lookahead token after an
@@ -714,13 +986,13 @@ b4_error_verbose_if([, yytoken])[));
if (yychar <= yyeof_)
{
- /* Return failure if at end of input. */
- if (yychar == yyeof_)
- YYABORT;
+ /* Return failure if at end of input. */
+ if (yychar == yyeof_)
+ YYABORT;
}
else
{
- yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
+ yydestruct_ ("Error: discarding", yytoken, yylval, yylloc);
yychar = yyempty_;
}
}
@@ -741,12 +1013,12 @@ b4_error_verbose_if([, yytoken])[));
if (false)
goto yyerrorlab;
- yyerror_range[0] = yylocation_stack_[yylen - 1];
+ yyerror_range[0].location = yystack_[yylen - 1].location;
/* Do not reclaim the symbols of the rule which action triggered
this YYERROR. */
yypop_ (yylen);
yylen = 0;
- yystate = yystate_stack_[0];
+ yystate = yystack_[0].state;
goto yyerrlab1;
/*-------------------------------------------------------------.
@@ -769,34 +1041,27 @@ b4_error_verbose_if([, yytoken])[));
}
}
- /* Pop the current state because it cannot handle the error token. */
- if (yystate_stack_.height () == 1)
- YYABORT;
+ // Pop the current state because it cannot handle the error token.
+ if (yystack_.size () == 1)
+ YYABORT;
- yyerror_range[0] = yylocation_stack_[0];
+ yyerror_range[0].location = yystack_[0].location;
yydestruct_ ("Error: popping",
yystos_[yystate],
- &yysemantic_stack_[0], &yylocation_stack_[0]);
+ yystack_[0].value, yystack_[0].location);
yypop_ ();
- yystate = yystate_stack_[0];
+ yystate = yystack_[0].state;
YY_STACK_PRINT ();
}
- if (yyn == yyfinal_)
- goto yyacceptlab;
-
- yyerror_range[1] = yylloc;
+ yyerror_range[1].location = yylloc;
// Using YYLLOC is tempting, but would change the location of
// the lookahead. YYLOC is available though.
YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
- yysemantic_stack_.push (yylval);
- yylocation_stack_.push (yyloc);
/* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystos_[yyn],
- &yysemantic_stack_[0], &yylocation_stack_[0]);
-
yystate = yyn;
+ yypush_ ("Shifting", yystate, yylval, yyloc);
goto yynewstate;
/* Accept. */
@@ -810,18 +1075,17 @@ b4_error_verbose_if([, yytoken])[));
goto yyreturn;
yyreturn:
- if (yychar != yyeof_ && yychar != yyempty_)
- yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);
+ if (yychar != yyempty_)
+ yydestruct_ ("Cleanup: discarding lookahead", yytoken, yylval, yylloc);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
yypop_ (yylen);
- while (yystate_stack_.height () != 1)
+ while (yystack_.size () != 1)
{
yydestruct_ ("Cleanup: popping",
- yystos_[yystate_stack_[0]],
- &yysemantic_stack_[0],
- &yylocation_stack_[0]);
+ yystos_[yystack_[0].state],
+ yystack_[0].value, yystack_[0].location);
yypop_ ();
}
@@ -830,8 +1094,8 @@ b4_error_verbose_if([, yytoken])[));
// Generate an error message.
std::string
- ]b4_parser_class_name[::yysyntax_error_ (int yystate]dnl
-b4_error_verbose_if([, int tok])[)
+ ]b4_parser_class_name[::yysyntax_error_ (int yystate, int]dnl
+b4_error_verbose_if([ tok])[)
{
std::string res;
YYUSE (yystate);
@@ -882,83 +1146,43 @@ b4_error_verbose_if([, int tok])[)
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) b4_parser_class_name::yypact_ninf_ = b4_pact_ninf[;
- const ]b4_int_type_for([b4_pact])[
- ]b4_parser_class_name[::yypact_[] =
- {
- ]b4_pact[
- };
+ ]b4_table_define([pact], [b4_pact])[;
/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
doesn't specify something else to do. Zero means the default is an
error. */
- const ]b4_int_type_for([b4_defact])[
- ]b4_parser_class_name[::yydefact_[] =
- {
- ]b4_defact[
- };
+ ]b4_table_define([defact], [b4_defact])[;
/* YYPGOTO[NTERM-NUM]. */
- const ]b4_int_type_for([b4_pgoto])[
- ]b4_parser_class_name[::yypgoto_[] =
- {
- ]b4_pgoto[
- };
+ ]b4_table_define([pgoto], [b4_pgoto])[;
/* YYDEFGOTO[NTERM-NUM]. */
- const ]b4_int_type_for([b4_defgoto])[
- ]b4_parser_class_name[::yydefgoto_[] =
- {
- ]b4_defgoto[
- };
+ ]b4_table_define([defgoto], [b4_defgoto])[;
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says. */
const ]b4_int_type(b4_table_ninf, b4_table_ninf) b4_parser_class_name::yytable_ninf_ = b4_table_ninf[;
- const ]b4_int_type_for([b4_table])[
- ]b4_parser_class_name[::yytable_[] =
- {
- ]b4_table[
- };
+ ]b4_table_define([table], [b4_table])[;
/* YYCHECK. */
- const ]b4_int_type_for([b4_check])[
- ]b4_parser_class_name[::yycheck_[] =
- {
- ]b4_check[
- };
+ ]b4_table_define([check], [b4_check])[;
/* STOS_[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
- const ]b4_int_type_for([b4_stos])[
- ]b4_parser_class_name[::yystos_[] =
- {
- ]b4_stos[
- };
+ ]b4_table_define([stos], [b4_stos])[;
#if YYDEBUG
/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
to YYLEX-NUM. */
- const ]b4_int_type_for([b4_toknum])[
- ]b4_parser_class_name[::yytoken_number_[] =
- {
- ]b4_toknum[
- };
+ ]b4_table_define([token_number], [b4_toknum])[;
#endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
- const ]b4_int_type_for([b4_r1])[
- ]b4_parser_class_name[::yyr1_[] =
- {
- ]b4_r1[
- };
+ ]b4_table_define([r1], [b4_r1])[;
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
- const ]b4_int_type_for([b4_r2])[
- ]b4_parser_class_name[::yyr2_[] =
- {
- ]b4_r2[
- };
+ ]b4_table_define([r2], [b4_r2])[;
#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
@@ -966,41 +1190,31 @@ b4_error_verbose_if([, int tok])[)
const char*
const ]b4_parser_class_name[::yytname_[] =
{
- ]b4_tname[
+ ]b4_tname[
};
#endif
#if YYDEBUG
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
- const ]b4_parser_class_name[::rhs_number_type
- ]b4_parser_class_name[::yyrhs_[] =
- {
- ]b4_rhs[
- };
+ ]b4_table_define([rhs], [b4_rhs])[;
/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
YYRHS. */
- const ]b4_int_type_for([b4_prhs])[
- ]b4_parser_class_name[::yyprhs_[] =
- {
- ]b4_prhs[
- };
+ ]b4_table_define([prhs], [b4_prhs])[;
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
- const ]b4_int_type_for([b4_rline])[
- ]b4_parser_class_name[::yyrline_[] =
- {
- ]b4_rline[
- };
+ ]b4_table_define([rline], [b4_rline])[;
// Print the state stack on the debug stream.
void
]b4_parser_class_name[::yystack_print_ ()
{
*yycdebug_ << "Stack now";
- for (state_stack_type::const_iterator i = yystate_stack_.begin ();
- i != yystate_stack_.end (); ++i)
- *yycdebug_ << ' ' << *i;
+ for (stack_type::const_iterator
+ i = yystack_.begin (),
+ i_end = yystack_.end ();
+ i != i_end; ++i)
+ *yycdebug_ << ' ' << i->state;
*yycdebug_ << std::endl;
}
@@ -1012,13 +1226,13 @@ b4_error_verbose_if([, int tok])[)
int yynrhs = yyr2_[yyrule];
/* Print the symbols being reduced, and their result. */
*yycdebug_ << "Reducing stack by rule " << yyrule - 1
- << " (line " << yylno << "), ";
+ << " (line " << yylno << "):" << std::endl;
/* The symbols being reduced. */
for (int yyi = 0; yyi < yynrhs; yyi++)
YY_SYMBOL_PRINT (" $" << yyi + 1 << " =",
yyrhs_[yyprhs_[yyrule] + yyi],
- &]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
@@ -1030,7 +1244,7 @@ b4_error_verbose_if([, int tok])[)
const token_number_type
translate_table[] =
{
- ]b4_translate[
+ ]b4_translate[
};
if ((unsigned int) t <= yyuser_token_number_max_)
return translate_table[t];
@@ -1050,21 +1264,18 @@ b4_error_verbose_if([, int tok])[)
const unsigned int ]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;
const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
-} // namespace ]b4_namespace[
+]b4_namespace_close[
-]b4_epilogue
-dnl
-@output b4_dir_prefix[]stack.hh
-b4_copyright([Stack handling for Bison parsers in C++],
- [2002, 2003, 2004, 2005, 2006])[
+]b4_epilogue[]dnl
+@output(b4_dir_prefix[]stack.hh@)@
+b4_copyright([Stack handling for Bison parsers in C++])[
#ifndef BISON_STACK_HH
# define BISON_STACK_HH
#include
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
template >
class stack
{
@@ -1112,17 +1323,17 @@ namespace ]b4_namespace[
}
inline
- unsigned int
- height () const
+ typename S::size_type
+ size () const
{
return seq_.size ();
}
inline const_iterator begin () const { return seq_.rbegin (); }
- inline const_iterator end () const { return seq_.rend (); }
+ inline const_iterator end () const { return seq_.rend (); }
private:
-
+ /// The wrapped container.
S seq_;
};
@@ -1150,7 +1361,9 @@ namespace ]b4_namespace[
const S& stack_;
unsigned int range_;
};
-}
+]b4_namespace_close[
-#endif // not BISON_STACK_HH]
-m4_divert(-1)
+#endif // not BISON_STACK_HH[]dnl
+]
+m4_divert_pop(0)
+m4_popdef([b4_copyright_years])dnl