Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++: clean up the handling of empty symbols

Browse Source 
* data/c++.m4, data/lalr1.cc (yyempty_): Remove, replaced by...
(empty_symbol, by_state::empty_state): these.
(basic_symbol::empty): New.
This commit is contained in:
Akim Demaille
2015-01-08 10:04:53 +01:00
parent 8a4ec3595b
commit 5422471cbb
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/c++.m4
View File

@@ -174,9 +174,12 @@ m4_define([b4_public_types_declare],
/// (External) token type, as returned by yylex.
typedef token::yytokentype token_type;
/// Internal symbol number.
/// Symbol type: an internal symbol number.
typedef int symbol_number_type;
/// The symbol type number to denote an empty symbol.
enum { empty_symbol = -2 };
/// Internal symbol number for tokens (subsumed by symbol_number_type).
typedef ]b4_int_type_for([b4_translate])[ token_number_type;
@@ -212,6 +215,9 @@ m4_define([b4_public_types_declare],
/// Destroy the symbol.
~basic_symbol ();
/// Whether empty.
bool empty () const;
/// Destructive move, \a s is emptied into this.
void move (basic_symbol& s);
@@ -251,12 +257,10 @@ m4_define([b4_public_types_declare],
/// The token.
token_type token () const;
/// The type number used to denote an empty symbol.
enum { empty = 0 };
/// The symbol type.
/// \a empty when empty.
token_number_type type;
/// \a empty_symbol when empty.
/// An int, not token_number_type, to be able to store empty_symbol.
int type;
};
/// "External" symbols: returned by the scanner.
@@ -339,6 +343,14 @@ m4_define([b4_public_types_define],
]b4_symbol_variant([[yytype]], [[value]], [[template destroy]])])[
}
template <typename Base>
inline
bool
]b4_parser_class_name[::basic_symbol<Base>::empty () const
{
return Base::type_get () == empty_symbol;
}
template <typename Base>
inline
void
@@ -354,7 +366,7 @@ m4_define([b4_public_types_define],
// by_type.
inline
]b4_parser_class_name[::by_type::by_type ()
: type (empty)
: type (empty_symbol)
{}
inline
@@ -372,7 +384,7 @@ m4_define([b4_public_types_define],
]b4_parser_class_name[::by_type::move (by_type& that)
{
type = that.type;
that.type = empty;
that.type = empty_symbol;
}
inline