m4_include(b4_pkgdatadir/[c++.m4])
+# api.value.type=variant is valid.
+m4_define([b4_value_type_setup_variant])
# b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
# --------------------------------------------------------------
# b4_symbol_value_template(VAL, [TYPE])
# -------------------------------------
# Same as b4_symbol_value, but used in a template method. It makes
-# a difference when using variants.
+# a difference when using variants. Note that b4_value_type_setup_union
+# overrides b4_symbol_value, so we must override it again.
m4_copy([b4_symbol_value], [b4_symbol_value_template])
-
+m4_append([b4_value_type_setup_union],
+ [m4_copy_force([b4_symbol_value_union], [b4_symbol_value_template])])
# b4_lhs_value([TYPE])
# --------------------
m4_define([b4_shared_declarations],
[b4_percent_code_get([[requires]])[
]b4_parse_assert_if([# include <cassert>])[
-# include <cstdlib> // abort
# include <vector>
# include <iostream>
# include <stdexcept>
/// Generate an error message.
/// \param yystate the state where the error occurred.
- /// \param yytoken the lookahead token.
- virtual std::string yysyntax_error_ (state_type yystate, int yytoken);
+ /// \param yytoken the lookahead token type, or yyempty_.
+ virtual std::string yysyntax_error_ (state_type yystate,
+ symbol_number_type yytoken) const;
/// Compute post-reduction state.
/// \param yystate the current state
/// \param yyvalue the value to check
static bool yy_table_value_is_error_ (int yyvalue);
- /// Internal symbol numbers.
- typedef ]b4_int_type_for([b4_translate])[ token_number_type;
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);
+ static token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
// Tables.
]b4_parser_tables_declare[]b4_error_verbose_if([
/// \param yyo The output stream.
/// \param yysym The symbol.
template <typename Base>
- void yy_print_ (std::ostream& yyo,
- const basic_symbol<Base>& yysym) const;
+ void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
#endif
/// \brief Reclaim the memory associated to a symbol.
/// If null, print nothing.
/// \param s The symbol.
template <typename Base>
- inline void yy_destroy_ (const char* yymsg,
- basic_symbol<Base>& yysym) const;
+ void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
private:
/// Type access provider for state based symbols.
struct by_state
{
/// Default constructor.
- inline by_state ();
+ by_state ();
+
+ /// The symbol type as needed by the constructor.
+ typedef state_type kind_type;
/// Constructor.
- inline by_state (state_type s);
+ by_state (kind_type s);
/// Copy constructor.
- inline by_state (const by_state& other);
+ by_state (const by_state& other);
- void move (by_state& that)
- {
- state = that.state;
- that.state = -1;
- }
+ /// Steal the symbol type from \a that.
+ void move (by_state& that);
- /// The state.
- state_type state;
+ /// The (internal) type number (corresponding to \a state).
+ /// "empty" when empty.
+ symbol_number_type type_get () const;
- /// The type (corresponding to \a state).
- ///
- /// -1 when empty.
- inline int type_get () const;
+ enum { empty = 0 };
- /// The type used to store the symbol type.
- typedef state_type value_type;
+ /// The state.
+ state_type state;
};
/// "Internal" symbol: element of the stack.
stack_symbol_type ();
/// Steal the contents from \a sym to build this.
stack_symbol_type (state_type s, symbol_type& sym);
+ /// Assignment, needed by push_back.
stack_symbol_type& operator= (const stack_symbol_type& that);
};
/// if null, no trace is output.
/// \param s the symbol
/// \warning the contents of \a s.value is stolen.
- inline void yypush_ (const char* m, stack_symbol_type& s);
+ void yypush_ (const char* m, stack_symbol_type& s);
/// Push a new look ahead token on the state on the stack.
/// \param m a debug message to display
/// \param s the state
/// \param sym the symbol (for its value and location).
/// \warning the contents of \a s.value is stolen.
- inline void yypush_ (const char* m, state_type s, symbol_type& sym);
+ void yypush_ (const char* m, state_type s, symbol_type& sym);
/// Pop \a n symbols the three stacks.
- inline void yypop_ (unsigned int n = 1);
+ void yypop_ (unsigned int n = 1);
// Constants.
enum
]b4_token_ctor_if([], [b4_public_types_define])[
// by_state.
+ inline
]b4_parser_class_name[::by_state::by_state ()
- : state (-1)
+ : state (empty)
{}
+ inline
]b4_parser_class_name[::by_state::by_state (const by_state& other)
: state (other.state)
{}
+ inline
+ void
+ ]b4_parser_class_name[::by_state::move (by_state& that)
+ {
+ state = that.state;
+ that.state = empty;
+ }
+
+ inline
]b4_parser_class_name[::by_state::by_state (state_type s)
: state (s)
{}
- int
+ inline
+ ]b4_parser_class_name[::symbol_number_type
]b4_parser_class_name[::by_state::type_get () const
{
- return state == -1 ? -1 : yystos_[state];
+ return state == empty ? 0 : yystos_[state];
}
inline
inline
- ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& sym)
- : super_type (s]b4_locations_if([, sym.location])[)
- {]b4_variant_if([[
- ]b4_symbol_variant([sym.type_get ()], [value], [move], [sym.value])],
- [value = sym.value;])[
- // sym is emptied.
- sym.type = -1;
+ ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
+ : super_type (s]b4_locations_if([, that.location])[)
+ {
+ ]b4_variant_if([b4_symbol_variant([that.type_get ()],
+ [value], [move], [that.value])],
+ [[value = that.value;]])[
+ // that is emptied.
+ that.type = empty;
}
inline
]b4_parser_class_name[::stack_symbol_type&
]b4_parser_class_name[::stack_symbol_type::operator= (const stack_symbol_type& that)
{
- state = that.state;]b4_variant_if([[
- ]b4_symbol_variant([that.type_get ()], [value], [copy], [that.value])],
- [value = that.value;])[]b4_locations_if([
+ state = that.state;
+ ]b4_variant_if([b4_symbol_variant([that.type_get ()],
+ [value], [copy], [that.value])],
+ [[value = that.value;]])[]b4_locations_if([
location = that.location;])[
return *this;
}
template <typename Base>
+ inline
void
]b4_parser_class_name[::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
{
YY_SYMBOL_PRINT (yymsg, yysym);]b4_variant_if([], [
// User destructor.
- int yytype = yysym.type_get ();
+ symbol_number_type yytype = yysym.type_get ();
switch (yytype)
{
]b4_symbol_foreach([b4_symbol_destructor])dnl
{
std::ostream& yyoutput = yyo;
YYUSE (yyoutput);
- int yytype = yysym.type_get ();
+ symbol_number_type yytype = yysym.type_get ();
yyo << (yytype < yyntokens_ ? "token" : "nterm")
<< ' ' << yytname_[yytype] << " ("]b4_locations_if([
<< yysym.location << ": "])[;
}
#endif
+ inline
void
]b4_parser_class_name[::yypush_ (const char* m, state_type s, symbol_type& sym)
{
yypush_ (m, t);
}
+ inline
void
]b4_parser_class_name[::yypush_ (const char* m, stack_symbol_type& s)
{
yystack_.push (s);
}
+ inline
void
]b4_parser_class_name[::yypop_ (unsigned int n)
{
/* If the proper action on seeing token YYLA.TYPE is to reduce or
to detect an error, take that action. */
- yyn += yyla.type;
- if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type)
+ yyn += yyla.type_get ();
+ if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type_get ())
goto yydefault;
// Reduce or error.
variants. */
b4_symbol_variant([[yyr1_@{yyn@}]], [yylhs.value], [build])],[
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'. Otherwise, use the top of the stack.
+ '$$ = $1'. Otherwise, use the top of the stack.
Otherwise, the following line sets YYLHS.VALUE to garbage.
This behavior is undocumented and Bison
++yynerrs_;
error (]b4_join(b4_locations_if([yyla.location]),
[[yysyntax_error_ (yystack_[0].state,
- yyempty ? yyempty_ : yyla.type)]])[);
+ yyempty ? yyempty_ : yyla.type_get ())]])[);
}
]b4_locations_if([[
error, discard it. */
// Return failure if at end of input.
- if (yyla.type == yyeof_)
+ if (yyla.type_get () == yyeof_)
YYABORT;
else if (!yyempty)
{
// Generate an error message.
std::string
]b4_parser_class_name[::yysyntax_error_ (]dnl
-b4_error_verbose_if([state_type yystate, int yytoken],
- [int, int])[)
+b4_error_verbose_if([state_type yystate, symbol_number_type yytoken],
+ [state_type, symbol_number_type])[) const
{]b4_error_verbose_if([[
std::string yyres;
// Number of reported tokens (one for the "unexpected", one per
projects / bison.git / blobdiff