Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 17:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++: better inline expansion

Browse Source 
Many 'inline' keywords were in the declarations.  They rather belong in
definitions, so move them.

* data/c++.m4 (basic_symbol, by_type): Many inlines here.
* data/lalr1.cc (yytranslate_, yy_destroy_, by_state, yypush_, yypop_): Inline
these as well.
(move): Move the definition outside the struct, where it belongs.
This commit is contained in:
Theophile Ranquet
2013-01-28 17:41:31 +01:00
parent dc8e535c37
commit b20e797a71
2 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
data/c++.m4
View File

@@ -170,24 +170,24 @@ m4_define([b4_public_types_declare],
typedef Base super_type; typedef Base super_type;
/// Default constructor. /// Default constructor.
inline basic_symbol (); basic_symbol ();
/// Copy constructor. /// Copy constructor.
inline basic_symbol (const basic_symbol& other); basic_symbol (const basic_symbol& other);
/// Constructor for valueless symbols. /// Constructor for valueless symbols.
inline basic_symbol (typename Base::value_type t]b4_locations_if([, basic_symbol (typename Base::value_type t]b4_locations_if([,
const location_type& l])[); const location_type& l])[);
/// Constructor for symbols with semantic value. /// Constructor for symbols with semantic value.
inline basic_symbol (typename Base::value_type t, basic_symbol (typename Base::value_type t,
const semantic_type& v]b4_locations_if([, const semantic_type& v]b4_locations_if([,
const location_type& l])[); const location_type& l])[);
~basic_symbol (); ~basic_symbol ();
/// Destructive move, \a s is emptied into this. /// Destructive move, \a s is emptied into this.
inline void move (basic_symbol& s); void move (basic_symbol& s);
/// The semantic value. /// The semantic value.
semantic_type value;]b4_locations_if([ semantic_type value;]b4_locations_if([
@@ -204,13 +204,14 @@ m4_define([b4_public_types_declare],
struct by_type struct by_type
{ {
/// Default constructor. /// Default constructor.
inline by_type (); by_type ();
/// Copy constructor. /// Copy constructor.
inline by_type (const by_type& other); by_type (const by_type& other);
/// Constructor. /// Constructor.
inline by_type (token_type t); ///
by_type (token_type t);
/// Steal the type of \a that. /// Steal the type of \a that.
void move (by_type& that); void move (by_type& that);
@@ -221,12 +222,11 @@ m4_define([b4_public_types_declare],
int type; int type;
/// The type (corresponding to \a type). /// The type (corresponding to \a type).
///
/// -1 when this symbol is empty. /// -1 when this symbol is empty.
inline int type_get () const; int type_get () const;
/// The token. /// The token.
inline token_type token () const; token_type token () const;
/// The type used to store the symbol type. /// The type used to store the symbol type.
typedef token_type value_type; typedef token_type value_type;
@@ -250,11 +250,13 @@ m4_define([b4_public_types_define],
// basic_symbol. // basic_symbol.
template <typename Base> template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol () ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol ()
: value () : value ()
{} {}
template <typename Base> template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (const basic_symbol& other) ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
: Base (other) : Base (other)
, value ()]b4_locations_if([ , value ()]b4_locations_if([
@@ -267,6 +269,7 @@ m4_define([b4_public_types_define],
template <typename Base> template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join( ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
[typename Base::value_type t], [typename Base::value_type t],
[const semantic_type& v], [const semantic_type& v],
@@ -279,6 +282,7 @@ m4_define([b4_public_types_define],
]b4_symbol_variant([this->type_get ()], [value], [copy], [v])])[} ]b4_symbol_variant([this->type_get ()], [value], [copy], [v])])[}
template <typename Base> template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join( ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
[typename Base::value_type t], [typename Base::value_type t],
b4_locations_if([const location_type& l]))[) b4_locations_if([const location_type& l]))[)
@@ -305,6 +309,7 @@ m4_define([b4_public_types_define],
} }
template <typename Base> template <typename Base>
inline
void void
]b4_parser_class_name[::basic_symbol<Base>::move (basic_symbol& s) ]b4_parser_class_name[::basic_symbol<Base>::move (basic_symbol& s)
{ {
@@ -316,14 +321,17 @@ m4_define([b4_public_types_define],
} }
// by_type. // by_type.
inline
]b4_parser_class_name[::by_type::by_type () ]b4_parser_class_name[::by_type::by_type ()
: type (-1) : type (-1)
{} {}
inline
]b4_parser_class_name[::by_type::by_type (const by_type& other) ]b4_parser_class_name[::by_type::by_type (const by_type& other)
: type (other.type) : type (other.type)
{} {}
inline
]b4_parser_class_name[::by_type::by_type (token_type t) ]b4_parser_class_name[::by_type::by_type (token_type t)
: type (yytranslate_ (t)) : type (yytranslate_ (t))
{} {}
@@ -336,12 +344,14 @@ m4_define([b4_public_types_define],
that.type = -1; that.type = -1;
} }
inline
int int
]b4_parser_class_name[::by_type::type_get () const ]b4_parser_class_name[::by_type::type_get () const
{ {
return type; return type;
} }
]b4_token_ctor_if([[ ]b4_token_ctor_if([[
inline
]b4_parser_class_name[::token_type ]b4_parser_class_name[::token_type
]b4_parser_class_name[::by_type::token () const ]b4_parser_class_name[::by_type::token () const
{ {
@@ -374,6 +384,7 @@ m4_define([b4_symbol_constructor_define], [])
# sometimes in the cc file. # sometimes in the cc file.
m4_define([b4_yytranslate_define], m4_define([b4_yytranslate_define],
[[ // Symbol number corresponding to token number t. [[ // Symbol number corresponding to token number t.
inline
]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::token_number_type
]b4_parser_class_name[::yytranslate_ (]b4_token_ctor_if([token_type], ]b4_parser_class_name[::yytranslate_ (]b4_token_ctor_if([token_type],
[int])[ t) [int])[ t)

42
data/lalr1.cc
View File

@@ -228,7 +228,7 @@ b4_location_define])])[
static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_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. /// 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. // Tables.
]b4_parser_tables_declare[]b4_error_verbose_if([ ]b4_parser_tables_declare[]b4_error_verbose_if([
@@ -264,35 +264,29 @@ b4_location_define])])[
/// If null, print nothing. /// If null, print nothing.
/// \param s The symbol. /// \param s The symbol.
template <typename Base> template <typename Base>
inline void yy_destroy_ (const char* yymsg, void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
basic_symbol<Base>& yysym) const;
private: private:
/// Type access provider for state based symbols. /// Type access provider for state based symbols.
struct by_state struct by_state
{ {
/// Default constructor. /// Default constructor.
inline by_state (); by_state ();
/// Constructor. /// Constructor.
inline by_state (state_type s); by_state (state_type s);
/// Copy constructor. /// Copy constructor.
inline by_state (const by_state& other); by_state (const by_state& other);
void move (by_state& that) void move (by_state& that);
{
state = that.state;
that.state = -1;
}
/// The state. /// The state.
state_type state; state_type state;
/// The type (corresponding to \a state). /// The type (corresponding to \a state).
///
/// -1 when empty. /// -1 when empty.
inline int type_get () const; int type_get () const;
/// The type used to store the symbol type. /// The type used to store the symbol type.
typedef state_type value_type; typedef state_type value_type;
@@ -322,7 +316,7 @@ b4_location_define])])[
/// if null, no trace is output. /// if null, no trace is output.
/// \param s the symbol /// \param s the symbol
/// \warning the contents of \a s.value is stolen. /// \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. /// Push a new look ahead token on the state on the stack.
/// \param m a debug message to display /// \param m a debug message to display
@@ -330,10 +324,10 @@ b4_location_define])])[
/// \param s the state /// \param s the state
/// \param sym the symbol (for its value and location). /// \param sym the symbol (for its value and location).
/// \warning the contents of \a s.value is stolen. /// \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. /// Pop \a n symbols the three stacks.
inline void yypop_ (unsigned int n = 1); void yypop_ (unsigned int n = 1);
// Constants. // Constants.
enum enum
@@ -528,18 +522,30 @@ m4_if(b4_prefix, [yy], [],
]b4_token_ctor_if([], [b4_public_types_define])[ ]b4_token_ctor_if([], [b4_public_types_define])[
// by_state. // by_state.
inline
]b4_parser_class_name[::by_state::by_state () ]b4_parser_class_name[::by_state::by_state ()
: state (-1) : state (-1)
{} {}
inline
]b4_parser_class_name[::by_state::by_state (const by_state& other) ]b4_parser_class_name[::by_state::by_state (const by_state& other)
: state (other.state) : state (other.state)
{} {}
inline
void
]b4_parser_class_name[::by_state::move (by_state& that)
{
state = that.state;
that.state = -1;
}
inline
]b4_parser_class_name[::by_state::by_state (state_type s) ]b4_parser_class_name[::by_state::by_state (state_type s)
: state (s) : state (s)
{} {}
inline
int int
]b4_parser_class_name[::by_state::type_get () const ]b4_parser_class_name[::by_state::type_get () const
{ {
@@ -574,6 +580,7 @@ m4_if(b4_prefix, [yy], [],
template <typename Base> template <typename Base>
inline
void void
]b4_parser_class_name[::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const ]b4_parser_class_name[::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
{ {
@@ -612,6 +619,7 @@ m4_if(b4_prefix, [yy], [],
} }
#endif #endif
inline
void void
]b4_parser_class_name[::yypush_ (const char* m, state_type s, symbol_type& sym) ]b4_parser_class_name[::yypush_ (const char* m, state_type s, symbol_type& sym)
{ {
@@ -619,6 +627,7 @@ m4_if(b4_prefix, [yy], [],
yypush_ (m, t); yypush_ (m, t);
} }
inline
void void
]b4_parser_class_name[::yypush_ (const char* m, stack_symbol_type& s) ]b4_parser_class_name[::yypush_ (const char* m, stack_symbol_type& s)
{ {
@@ -627,6 +636,7 @@ m4_if(b4_prefix, [yy], [],
yystack_.push (s); yystack_.push (s);
} }
inline
void void
]b4_parser_class_name[::yypop_ (unsigned int n) ]b4_parser_class_name[::yypop_ (unsigned int n)
{ {